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

Load the THPRES values from the restart file

Browse Source
This commit is contained in:
Joakim Hove 2018-05-31 11:58:27 +02:00
parent 3a9b7dc7b5
commit 3b5e746702
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ebos/eclproblem.hh
View File

@ -399,7 +399,8 @@ public:
// create the ECL writer // create the ECL writer
eclWriter_.reset(new EclWriterType(simulator)); eclWriter_.reset(new EclWriterType(simulator));
// Hack to compute the initial thpressure values for restarts // Loading the solution from a restart file is done recursively, we need this
// bool variable to signal the stop condition.
restartApplied = false; restartApplied = false;
} }
@ -847,9 +848,11 @@ public:
{ return thresholdPressures_.thresholdPressure(elem1Idx, elem2Idx); } { return thresholdPressures_.thresholdPressure(elem1Idx, elem2Idx); }
const EclThresholdPressure<TypeTag>& thresholdPressure() const { const EclThresholdPressure<TypeTag>& thresholdPressure() const
return thresholdPressures_; { return thresholdPressures_; }
}
EclThresholdPressure<TypeTag>& thresholdPressure()
{ return thresholdPressures_; }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::porosity * \copydoc FvBaseMultiPhaseProblem::porosity
@ -1178,8 +1181,7 @@ public:
wellManager_.init(this->simulator().vanguard().eclState(), this->simulator().vanguard().schedule()); wellManager_.init(this->simulator().vanguard().eclState(), this->simulator().vanguard().schedule());
} }
// the initialSolutionApplied is called recursively by readEclRestartSolution_() // The initialSolutionApplied is called recursively by readEclRestartSolution_().
// in order to setup the inital threshold pressures correctly
if (restartApplied) if (restartApplied)
return; return;

15
ebos/eclthresholdpressure.hh
View File

@ -86,6 +86,10 @@ public:
enableThresholdPressure_ = false; enableThresholdPressure_ = false;
} }
void setFromRestart(const std::vector<Scalar>& values)
{ thpres_ = values; }
/*! /*!
* \brief Actually compute the threshold pressures over a face as a pre-compute step. * \brief Actually compute the threshold pressures over a face as a pre-compute step.
*/ */
@ -105,10 +109,19 @@ public:
const auto& eclState = vanguard.eclState(); const auto& eclState = vanguard.eclState();
const auto& simConfig = eclState.getSimulationConfig(); const auto& simConfig = eclState.getSimulationConfig();
enableThresholdPressure_ = simConfig.hasThresholdPressure(); enableThresholdPressure_ = simConfig.useThresholdPressure();
if (!enableThresholdPressure_) if (!enableThresholdPressure_)
return; return;
/*
If this is a restart run the ThresholdPressure object will be active,
but it will *not* be properly initialized with numerical values. The
values must instead come from the THPRES vector in the restart file.
*/
if (simConfig.getThresholdPressure().restart())
return;
numEquilRegions_ = eclState.getTableManager().getEqldims().getNumEquilRegions(); numEquilRegions_ = eclState.getTableManager().getEqldims().getNumEquilRegions();
if (numEquilRegions_ > 0xff) { if (numEquilRegions_ > 0xff) {
// make sure that the index of an equilibration region can be stored in a // make sure that the index of an equilibration region can be stored in a

13
ebos/eclwriter.hh
View File

@ -210,7 +210,7 @@ public:
if (!isSubStep) if (!isSubStep)
restartValue.addExtra("OPMEXTRA", std::vector<double>(1, nextStepSize)); restartValue.addExtra("OPMEXTRA", std::vector<double>(1, nextStepSize));
if (simConfig.hasThresholdPressure()) if (simConfig.useThresholdPressure())
restartValue.addExtra("THPRES", Opm::UnitSystem::measure::pressure, simulator_.problem().thresholdPressure().data()); restartValue.addExtra("THPRES", Opm::UnitSystem::measure::pressure, simulator_.problem().thresholdPressure().data());
// first, create a tasklet to write the data for the current time step to disk // first, create a tasklet to write the data for the current time step to disk
@ -255,10 +255,17 @@ public:
unsigned numElements = gridView.size(/*codim=*/0); unsigned numElements = gridView.size(/*codim=*/0);
eclOutputModule_.allocBuffers(numElements, episodeIdx, /*isSubStep=*/false, /*log=*/false); eclOutputModule_.allocBuffers(numElements, episodeIdx, /*isSubStep=*/false, /*log=*/false);
auto restart_values = eclIO_->loadRestart(solution_keys, extra_keys); auto restartValues = eclIO_->loadRestart(solution_keys, extra_keys);
for (unsigned elemIdx = 0; elemIdx < numElements; ++elemIdx) { for (unsigned elemIdx = 0; elemIdx < numElements; ++elemIdx) {
unsigned globalIdx = collectToIORank_.localIdxToGlobalIdx(elemIdx); unsigned globalIdx = collectToIORank_.localIdxToGlobalIdx(elemIdx);
eclOutputModule_.setRestart(restart_values.solution, elemIdx, globalIdx); eclOutputModule_.setRestart(restartValues.solution, elemIdx, globalIdx);
}
const auto& inputThpres = eclState().getSimulationConfig().getThresholdPressure();
if (inputThpres.active()) {
Simulator& mutableSimulator = const_cast<Simulator&>(simulator_);
auto& thpres = mutableSimulator.problem().thresholdPressure();
const auto& thpresValues = restartValues.getExtra("THPRES");
thpres.setFromRestart(thpresValues);
} }
} }