Merge pull request #1243 from blattms/write-initial-oip

Write the initial OIP values if requested.
This commit is contained in:
Atgeirr Flø Rasmussen
2017-08-01 16:15:46 +02:00
committed by GitHub
5 changed files with 19 additions and 3 deletions

View File

@@ -196,7 +196,7 @@ namespace Opm
const data::Solution& simProps,
const std::map<std::string, double>& miscSummaryData,
const std::map<std::string, std::vector<double>>& extraRestartData,
bool substep )
bool substep)
: writer_( writer ),
timer_( timer.clone() ),
state_( state ),
@@ -338,6 +338,11 @@ namespace Opm
if (initConfig.restartRequested() && ((initConfig.getRestartStep()) == (timer.currentStepNum()))) {
std::cout << "Skipping restart write in start of step " << timer.currentStepNum() << std::endl;
} else {
if ( timer.initialStep() )
{
// Set the initial OIP
eclIO_->overwriteInitialOIP(simProps);
}
// ... insert "extra" data (KR, VISC, ...)
eclIO_->writeTimeStep(timer.reportStepNum(),
substep,

View File

@@ -272,7 +272,7 @@ namespace Opm
const data::Solution& simProps,
const std::map<std::string, double>& miscSummaryData,
const std::map<std::string, std::vector<double>>& extraRestartData,
bool substep);
bool substep );
/** \brief return output directory */
const std::string& outputDirectory() const { return outputDir_; }