* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
#include <ctype.h>
#include <math.h>
#include <string.h>
#include "gromacs/utility/cstringutil.h"
-#include "typedefs.h"
-#include "macros.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/macros.h"
#include "gstat.h"
#include "gromacs/pbcutil/pbc.h"
#include "gromacs/utility/futil.h"
#include "binsearch.h"
#include "powerspect.h"
#include "gmx_ana.h"
-#include "copyrite.h"
+#include "gromacs/legacyheaders/copyrite.h"
#include "gromacs/commandline/pargs.h"
#include "gromacs/fileio/matio.h"
#include "gromacs/pbcutil/rmpbc.h"
#include "gromacs/utility/exceptions.h"
#include "gromacs/utility/fatalerror.h"
-#include "gromacs/utility/programcontext.h"
#include "gromacs/utility/smalloc.h"
#ifdef GMX_DOUBLE
sfree(yticks);
}
-static void writeraw(t_interf ***int1, t_interf ***int2, int tblocks, int xbins, int ybins, char **fnms)
+static void writeraw(t_interf ***int1, t_interf ***int2, int tblocks,
+ int xbins, int ybins, char **fnms,
+ const output_env_t oenv)
{
FILE *raw1, *raw2;
int i, j, n;
gmx::BinaryInformationSettings settings;
settings.generatedByHeader(true);
settings.linePrefix("# ");
- gmx::printBinaryInformation(raw1, gmx::getProgramContext(), settings);
- gmx::printBinaryInformation(raw2, gmx::getProgramContext(), settings);
+ gmx::printBinaryInformation(raw1, output_env_get_program_context(oenv),
+ settings);
+ gmx::printBinaryInformation(raw2, output_env_get_program_context(oenv),
+ settings);
}
GMX_CATCH_ALL_AND_EXIT_WITH_FATAL_ERROR;
fprintf(raw1, "# Legend: nt nx ny\n# Xbin Ybin Z t\n");
t_filenm fnm[] = {
- { efTPX, "-s", NULL, ffREAD }, /* this is for the topology */
+ { efTPR, "-s", NULL, ffREAD }, /* this is for the topology */
{ efTRX, "-f", NULL, ffREAD }, /* and this for the trajectory */
{ efNDX, "-n", NULL, ffREAD}, /* this is to select groups */
{ efDAT, "-o", "Density4D", ffOPTWR}, /* This is for outputting the entire 4D densityfield in binary format */
bRawOut = opt2bSet("-or", NFILE, fnm);
bGraph = opt2bSet("-og", NFILE, fnm);
bOut = opt2bSet("-o", NFILE, fnm);
- top = read_top(ftp2fn(efTPX, NFILE, fnm), &ePBC);
+ top = read_top(ftp2fn(efTPR, NFILE, fnm), &ePBC);
snew(grpname, 1);
snew(index, 1);
snew(ngx, 1);
{
gmx_fatal(FARGS, "No or not correct number (2) of output-files: %d", nfxpm);
}
- writeraw(surf1, surf2, tblock, xslices, yslices, rawfiles);
+ writeraw(surf1, surf2, tblock, xslices, yslices, rawfiles, oenv);
}