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

Write the initial OIP values if requested.

Browse Source 
This is when writing the first time step as is this is
the first step when OIP is available.
This commit is contained in:
Markus Blatt
2017-07-19 22:06:08 +02:00
parent 44c02a262e
commit 1939453adb
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp
View File

@@ -188,6 +188,7 @@ namespace Opm
std::map<std::string, double> miscSummaryData_;
std::map<std::string, std::vector<double>> extraRestartData_;
const bool substep_;
const bool writeInitial_;
explicit WriterCall( BlackoilOutputWriter& writer,
const SimulatorTimerInterface& timer,
@@ -196,7 +197,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, bool writeInitial)
: writer_( writer ),
timer_( timer.clone() ),
state_( state ),
@@ -204,7 +205,8 @@ namespace Opm
simProps_( simProps ),
miscSummaryData_( miscSummaryData ),
extraRestartData_( extraRestartData ),
substep_( substep )
substep_( substep ),
writeInitial_( writeInitial )
{
}
@@ -212,7 +214,7 @@ namespace Opm
void run ()
{
// write data
writer_.writeTimeStepSerial( *timer_, state_, wellState_, simProps_, miscSummaryData_, extraRestartData_, substep_ );
writer_.writeTimeStepSerial( *timer_, state_, wellState_, simProps_, miscSummaryData_, extraRestartData_, substep_, writeInitial_ );
}
};
}
@@ -252,7 +254,7 @@ namespace Opm
const WellStateFullyImplicitBlackoil& localWellState,
const std::map<std::string, double>& miscSummaryData,
const std::map<std::string, std::vector<double>>& extraRestartData,
bool substep)
bool substep, bool writeInitial)
{
// VTK output (is parallel if grid is parallel)
if( vtkWriter_ ) {
@@ -287,12 +289,12 @@ namespace Opm
{
if( asyncOutput_ ) {
// dispatch the write call to the extra thread
asyncOutput_->dispatch( detail::WriterCall( *this, timer, state, wellState, cellData, miscSummaryData, extraRestartData, substep ) );
asyncOutput_->dispatch( detail::WriterCall( *this, timer, state, wellState, cellData, miscSummaryData, extraRestartData, substep, writeInitial ) );
}
else {
// just write the data to disk
try {
writeTimeStepSerial( timer, state, wellState, cellData, miscSummaryData, extraRestartData, substep );
writeTimeStepSerial( timer, state, wellState, cellData, miscSummaryData, extraRestartData, substep, writeInitial );
} catch (std::runtime_error& msg) {
err = 1;
emsg = msg.what();
@@ -324,7 +326,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, bool initialWrite)
{
// Matlab output
if( matlabWriter_ ) {
@@ -338,6 +340,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 ( initialWrite )
{
// Set the initial OIP
eclIO_->overwriteInitialOIP(simProps);
}
// ... insert "extra" data (KR, VISC, ...)
eclIO_->writeTimeStep(timer.reportStepNum(),
substep,