*
* Copyright (c) 1991-2000, University of Groningen, The Netherlands.
* Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by
* Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
* and including many others, as listed in the AUTHORS file in the
* top-level source directory and at http://www.gromacs.org.
* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
-#include "oenv.h"
+#include "gmxpre.h"
-#include "gromacs/utility/smalloc.h"
+#include "gromacs/legacyheaders/oenv.h"
-#include "gromacs/utility/programcontext.h"
#include "gromacs/utility/exceptions.h"
+#include "gromacs/utility/programcontext.h"
+#include "gromacs/utility/smalloc.h"
struct output_env
{
- explicit output_env(const gmx::ProgramContextInterface &context)
+ explicit output_env(const gmx::IProgramContext &context)
: programContext(context)
{
time_unit = time_ps;
view = FALSE;
xvg_format = exvgNONE;
verbosity = 0;
- debug_level = 0;
}
- const gmx::ProgramContextInterface &programContext;
+ const gmx::IProgramContext &programContext;
/* the time unit, enum defined in oenv.h */
time_unit_t time_unit;
xvg_format_t xvg_format;
/* The level of verbosity for this program */
int verbosity;
- /* the debug level */
- int debug_level;
};
/* The source code in this file should be thread-safe.
/***** OUTPUT_ENV MEMBER FUNCTIONS ******/
void output_env_init(output_env_t *oenvp,
- const gmx::ProgramContextInterface &context,
+ const gmx::IProgramContext &context,
time_unit_t tmu, gmx_bool view, xvg_format_t xvg_format,
- int verbosity, int debug_level)
+ int verbosity)
{
try
{
oenv->view = view;
oenv->xvg_format = xvg_format;
oenv->verbosity = verbosity;
- oenv->debug_level = debug_level;
}
GMX_CATCH_ALL_AND_EXIT_WITH_FATAL_ERROR;
}
return oenv->verbosity;
}
-int output_env_get_debug_level(const output_env_t oenv)
-{
- return oenv->debug_level;
-}
-
const char *output_env_get_time_unit(const output_env_t oenv)
{
return time_units_str[oenv->time_unit];
return oenv->xvg_format;
}
-const char *output_env_get_program_name(const output_env_t oenv)
-{
- const char *programName = NULL;
-
- try
- {
- programName = oenv->programContext.fullBinaryPath();
- }
- GMX_CATCH_ALL_AND_EXIT_WITH_FATAL_ERROR;
-
- return programName;
-}
-
-const char *output_env_get_short_program_name(const output_env_t oenv)
+const char *output_env_get_program_display_name(const output_env_t oenv)
{
- const char *programName = NULL;
+ const char *displayName = NULL;
try
{
- // TODO: Use the display name once it doesn't break anything.
- programName = oenv->programContext.programName();
+ displayName = oenv->programContext.displayName();
}
GMX_CATCH_ALL_AND_EXIT_WITH_FATAL_ERROR;
- return programName;
+ return displayName;
}
-const char *output_env_get_cmd_line(const output_env_t oenv)
+const gmx::IProgramContext &
+output_env_get_program_context(const output_env_t oenv)
{
- const char *commandLine = NULL;
-
- try
- {
- commandLine = oenv->programContext.commandLine();
- }
- GMX_CATCH_ALL_AND_EXIT_WITH_FATAL_ERROR;
-
- return commandLine;
+ return oenv->programContext;
}