OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

clean up the determination of the directory for output

Browse Source 
this should be done by the vanguard, not by the problem!
This commit is contained in:
Andreas Lauser 2018-03-12 15:17:07 +01:00
parent 5f8fdb2324
commit 7b56e9e9df
3 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ebos/eclbasevanguard.hh
View File

@ -60,8 +60,10 @@ NEW_PROP_TAG(Grid);
NEW_PROP_TAG(EquilGrid);
NEW_PROP_TAG(Scalar);
NEW_PROP_TAG(EclDeckFileName);
NEW_PROP_TAG(EclOutputDir);
SET_STRING_PROP(EclBaseVanguard, EclDeckFileName, "ECLDECK.DATA");
SET_STRING_PROP(EclBaseVanguard, EclOutputDir, ".");
} // namespace Properties
/*!
@ -92,6 +94,8 @@ public:
{
EWOMS_REGISTER_PARAM(TypeTag, std::string, EclDeckFileName,
"The name of the file which contains the ECL deck to be simulated");
EWOMS_REGISTER_PARAM(TypeTag, std::string, EclOutputDir,
"The directory to which the ECL result files are written");
}
/*!
@ -193,6 +197,31 @@ public:
summaryConfig_ = externalSummaryConfig_;
}
// retrieve the location set by the user
std::string outputDir = EWOMS_GET_PARAM(TypeTag, std::string, EclOutputDir);
// update the location for output
auto& ioConfig = eclState_->getIOConfig();
if (outputDir == "")
// If no output directory parameter is specified, use the output directory
// which Opm::IOConfig thinks that should be used. Normally this is the
// directory in which the input files are located.
outputDir = ioConfig.getOutputDir();
// ensure that the output directory exists and that it is a directory
if (!boost::filesystem::is_directory(outputDir)) {
try {
boost::filesystem::create_directories(outputDir);
}
catch (...) {
throw std::runtime_error("Creation of output directory '"+outputDir+"' failed\n");
}
}
// specify the directory output. This is not a very nice mechanism because
// the eclState is supposed to be immutable here, IMO.
ioConfig.setOutputDir(outputDir);
asImp_().createGrids_();
asImp_().filterCompletions_();
asImp_().finalizeInit_();

40
ebos/eclproblem.hh
View File

@ -112,9 +112,6 @@ NEW_PROP_TAG(EnableWriteAllSolutions);
// The number of time steps skipped between writing two consequtive restart files
NEW_PROP_TAG(RestartWritingInterval);
// The default location for the ECL output files
NEW_PROP_TAG(EclOutputDir);
// Disable well treatment (for users which do this externally)
NEW_PROP_TAG(DisableWells);
@ -316,6 +313,7 @@ public:
static void registerParameters()
{
ParentType::registerParameters();
EclWriterType::registerParameters();
EWOMS_REGISTER_PARAM(TypeTag, bool, EnableWriteAllSolutions,
"Write all solutions to disk instead of only the ones for the "
@ -323,8 +321,6 @@ public:
EWOMS_REGISTER_PARAM(TypeTag, bool, EnableEclOutput,
"Write binary output which is compatible with the commercial "
"Eclipse simulator");
EWOMS_REGISTER_PARAM(TypeTag, std::string, EclOutputDir,
"The directory to which the ECL result files are written");
EWOMS_REGISTER_PARAM(TypeTag, bool, EclOutputDoublePrecision,
"Tell the output writer to use double precision. Useful for 'perfect' restarts");
EWOMS_REGISTER_PARAM(TypeTag, unsigned, RestartWritingInterval,
@ -341,42 +337,14 @@ public:
, wellManager_(simulator)
, pffDofData_(simulator.gridView(), this->elementMapper())
{
// Tell the extra modules to initialize its internal data structures
// Tell the black-oil extensions to initialize their internal data structures
const auto& vanguard = simulator.vanguard();
SolventModule::initFromDeck(vanguard.deck(), vanguard.eclState());
PolymerModule::initFromDeck(vanguard.deck(), vanguard.eclState());
if (EWOMS_GET_PARAM(TypeTag, bool, EnableEclOutput)) {
// retrieve the location set by the user
std::string outputDir = EWOMS_GET_PARAM(TypeTag, std::string, EclOutputDir);
auto& eclState = this->simulator().vanguard().eclState();
auto& ioConfig = eclState.getIOConfig();
if (outputDir == ".") {
// Default output directory is the directory where the deck is found.
const std::string default_output_dir = ioConfig.getOutputDir();
outputDir = default_output_dir;
}
// ensure that the output directory exists and that it is a directory
if (outputDir != ".") { // Do not try to create the current directory.
if (!boost::filesystem::is_directory(outputDir)) {
try {
boost::filesystem::create_directories(outputDir);
}
catch (...) {
throw std::runtime_error("Creation of output directory '"+outputDir+"' failed\n");
}
}
}
// specify the directory output. This is not a very nice mechanism because
// the eclState is supposed to be immutable here, IMO.
ioConfig.setOutputDir(outputDir);
// create the actual ECL writer
if (EWOMS_GET_PARAM(TypeTag, bool, EnableEclOutput))
// create the ECL writer
eclWriter_.reset(new EclWriterType(simulator));
}
// Hack to compute the initial thpressure values for restarts
restartApplied = false;

2
tests/test_ecl_output.cc
View File

@ -112,7 +112,7 @@ void test_summary()
{
typedef typename TTAG(TestEclOutputTypeTag) TypeTag;
const std::string filename = "data/SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA";
const std::string casename = "data/SUMMARY_DECK_NON_CONSTANT_POROSITY";
const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY";
auto simulator = initSimulator<TypeTag>(filename.data());
typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;