Merge pull request #1550 from andlaus/generic_output_dir

adapt to the rename of the EclOutputDir parameter to OutputDir in eWoms
This commit is contained in:
Atgeirr Flø Rasmussen 2018-08-15 21:34:18 +02:00 committed by GitHub
commit 279d1950dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -69,7 +69,7 @@
namespace Ewoms {
namespace Properties {
NEW_TYPE_TAG(EclFlowProblem, INHERITS_FROM(BlackOilModel, EclBaseProblem));
SET_STRING_PROP(EclFlowProblem, EclOutputDir, "");
SET_STRING_PROP(EclFlowProblem, OutputDir, "");
SET_BOOL_PROP(EclFlowProblem, DisableWells, true);
SET_BOOL_PROP(EclFlowProblem, EnableDebuggingChecks, false);
// default in flow is to formulate the equations in surface volumes

View File

@ -394,7 +394,7 @@ namespace Opm
deckFileParam += deckFileName;
argv.push_back(deckFileParam.c_str());
std::string outputDirParam("--ecl-output-dir=");
std::string outputDirParam("--output-dir=");
if (param_.has("output_dir")) {
const std::string& output_dir = param_.get<std::string>("output_dir");
outputDirParam += output_dir;