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

flow: let core ebos handle the output directory for the result files

Browse Source 
this adds a new parameter --ecl-output-dir=$FOO to the "virtual"
command line arguments of the ebos simulator.
This commit is contained in:
Andreas Lauser 2018-01-15 10:14:13 +01:00 committed by Tor Harald Sandve
parent 137ff53ae7
commit 386ade39f4
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
opm/autodiff/FlowMainEbos.hpp
View File

@ -26,9 +26,7 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include <opm/simulators/ParallelFileMerger.hpp> #include <opm/simulators/ParallelFileMerger.hpp>
#include <opm/simulators/ensureDirectoryExists.hpp>
#include <opm/autodiff/BlackoilModelEbos.hpp> #include <opm/autodiff/BlackoilModelEbos.hpp>
#include <opm/autodiff/NewtonIterationBlackoilSimple.hpp> #include <opm/autodiff/NewtonIterationBlackoilSimple.hpp>
@ -257,23 +255,7 @@ namespace Opm
<< std::endl; << std::endl;
} }
output_to_files_ = output_cout_ && output_ > OUTPUT_NONE; output_to_files_ = output_cout_ && (output_ != OUTPUT_NONE);
// Setup output directory.
auto& ioConfig = eclState().getIOConfig();
// Default output directory is the directory where the deck is found.
const std::string default_output_dir = ioConfig.getOutputDir();
output_dir_ = param_.getDefault("output_dir", default_output_dir);
// Override output directory if user specified.
ioConfig.setOutputDir(output_dir_);
// Write parameters used for later reference. (only if rank is zero)
if (output_to_files_) {
// Create output directory if needed.
ensureDirectoryExists(output_dir_);
// Write simulation parameters.
param_.writeParam(output_dir_ + "/simulation.param");
}
} }
// Setup OpmLog backend with output_dir. // Setup OpmLog backend with output_dir.
@ -413,9 +395,17 @@ namespace Opm
argv.push_back("flow_ebos"); argv.push_back("flow_ebos");
std::string deckFileParam("--ecl-deck-file-name="); std::string deckFileParam("--ecl-deck-file-name=");
deckFileParam += param_.get<std::string>("deck_filename"); const std::string& deckFileName = param_.get<std::string>("deck_filename");
deckFileParam += deckFileName;
argv.push_back(deckFileParam.c_str()); argv.push_back(deckFileParam.c_str());
const std::string default_output_dir = boost::filesystem::basename(deckFileName);
output_dir_ = param_.getDefault("output_dir", default_output_dir);
std::string outputDirParam("--ecl-output-dir=");
outputDirParam += output_dir_;
argv.push_back(outputDirParam.c_str());
#if defined(_OPENMP) #if defined(_OPENMP)
std::string numThreadsParam("--threads-per-process="); std::string numThreadsParam("--threads-per-process=");
int numThreads = omp_get_max_threads(); int numThreads = omp_get_max_threads();