biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .tpa, .tpb, .tpx, .trj files. Part of #1500.
[alexxy/gromacs.git]
/
src
/
gromacs
/
gmxana
/
gmx_energy.c
diff --git
a/src/gromacs/gmxana/gmx_energy.c
b/src/gromacs/gmxana/gmx_energy.c
index cc3958fda13017f1e1d6090a92f0e8c55eba1c05..96a153cf0c08ff075463eb33b7060555a2f060a6 100644
(file)
--- a/
src/gromacs/gmxana/gmx_energy.c
+++ b/
src/gromacs/gmxana/gmx_energy.c
@@
-2027,7
+2027,7
@@
int gmx_energy(int argc, char *argv[])
t_filenm fnm[] = {
{ efEDR, "-f", NULL, ffREAD },
{ efEDR, "-f2", NULL, ffOPTRD },
t_filenm fnm[] = {
{ efEDR, "-f", NULL, ffREAD },
{ efEDR, "-f2", NULL, ffOPTRD },
- { efTP
X
, "-s", NULL, ffOPTRD },
+ { efTP
R
, "-s", NULL, ffOPTRD },
{ efXVG, "-o", "energy", ffWRITE },
{ efXVG, "-viol", "violaver", ffOPTWR },
{ efXVG, "-pairs", "pairs", ffOPTWR },
{ efXVG, "-o", "energy", ffWRITE },
{ efXVG, "-viol", "violaver", ffOPTWR },
{ efXVG, "-pairs", "pairs", ffOPTWR },
@@
-2172,7
+2172,7
@@
int gmx_energy(int argc, char *argv[])
if (bORIRE || bOTEN)
{
if (bORIRE || bOTEN)
{
- get_orires_parms(ftp2fn(efTP
X
, NFILE, fnm), &nor, &nex, &or_label, &oobs);
+ get_orires_parms(ftp2fn(efTP
R
, NFILE, fnm), &nor, &nex, &or_label, &oobs);
}
if (bORIRE)
}
if (bORIRE)
@@
-2297,7
+2297,7
@@
int gmx_energy(int argc, char *argv[])
}
else if (bDisRe)
{
}
else if (bDisRe)
{
- nbounds = get_bounds(ftp2fn(efTP
X
, NFILE, fnm), &bounds, &index, &pair, &npairs,
+ nbounds = get_bounds(ftp2fn(efTP
R
, NFILE, fnm), &bounds, &index, &pair, &npairs,
&mtop, &top, &ir);
snew(violaver, npairs);
out = xvgropen(opt2fn("-o", NFILE, fnm), "Sum of Violations",
&mtop, &top, &ir);
snew(violaver, npairs);
out = xvgropen(opt2fn("-o", NFILE, fnm), "Sum of Violations",
@@
-2316,7
+2316,7
@@
int gmx_energy(int argc, char *argv[])
}
else if (bDHDL)
{
}
else if (bDHDL)
{
- get_dhdl_parms(ftp2fn(efTP
X
, NFILE, fnm), &ir);
+ get_dhdl_parms(ftp2fn(efTP
R
, NFILE, fnm), &ir);
}
/* Initiate energies and set them to zero */
}
/* Initiate energies and set them to zero */