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

Put the ebosSimulator start and end methods were it belongs

Browse Source 
Move the beginEpisode/endEpisode call to ebos to beginReportStep/
endReportStep and beginTimeStep/endTimeStep call to ebos to prepareStep/
afterStep
This commit is contained in:
Tor Harald Sandve 2017-11-24 10:49:23 +01:00
parent 796f6cd13c
commit 9edb351d34
1 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -164,7 +164,6 @@ namespace Opm {
, terminal_output_ (terminal_output) , terminal_output_ (terminal_output)
, current_relaxation_(1.0) , current_relaxation_(1.0)
, dx_old_(AutoDiffGrid::numCells(grid_)) , dx_old_(AutoDiffGrid::numCells(grid_))
, isBeginReportStep_(false)
{ {
// compute global sum of number of cells // compute global sum of number of cells
global_nc_ = detail::countGlobalCells(grid_); global_nc_ = detail::countGlobalCells(grid_);
@ -201,11 +200,25 @@ namespace Opm {
ebosSimulator_.model().solution( 1 /* timeIdx */ ) = ebosSimulator_.model().solution( 0 /* timeIdx */ ); ebosSimulator_.model().solution( 1 /* timeIdx */ ) = ebosSimulator_.model().solution( 0 /* timeIdx */ );
} }
// set the timestep size and index in ebos explicitly
// we use our own time stepper.
ebosSimulator_.startNextEpisode( timer.currentStepLength() );
ebosSimulator_.setEpisodeIndex( timer.reportStepNum() );
ebosSimulator_.setTimeStepSize( timer.currentStepLength() );
ebosSimulator_.setTimeStepIndex( timer.reportStepNum() );
ebosSimulator_.problem().beginTimeStep();
unsigned numDof = ebosSimulator_.model().numGridDof(); unsigned numDof = ebosSimulator_.model().numGridDof();
wasSwitched_.resize(numDof); wasSwitched_.resize(numDof);
std::fill(wasSwitched_.begin(), wasSwitched_.end(), false); std::fill(wasSwitched_.begin(), wasSwitched_.end(), false);
wellModel().beginTimeStep(); wellModel().beginTimeStep();
if (param_.update_equations_scaling_) {
std::cout << "equation scaling not suported yet" << std::endl;
//updateEquationsScaling();
}
} }
@ -345,6 +358,7 @@ namespace Opm {
DUNE_UNUSED_PARAMETER(well_state); DUNE_UNUSED_PARAMETER(well_state);
wellModel().timeStepSucceeded(); wellModel().timeStepSucceeded();
ebosSimulator_.problem().endTimeStep();
} }
@ -356,7 +370,10 @@ namespace Opm {
const int iterationIdx) const int iterationIdx)
{ {
// -------- Mass balance equations -------- // -------- Mass balance equations --------
assembleMassBalanceEq(timer, iterationIdx); ebosSimulator_.model().newtonMethod().setIterationIndex(iterationIdx);
ebosSimulator_.problem().beginIteration();
ebosSimulator_.model().linearizer().linearize();
ebosSimulator_.problem().endIteration();
// -------- Well equations ---------- // -------- Well equations ----------
double dt = timer.currentStepLength(); double dt = timer.currentStepLength();
@ -1525,7 +1542,7 @@ namespace Opm {
void beginReportStep() void beginReportStep()
{ {
isBeginReportStep_ = true; ebosSimulator_.problem().beginEpisode();
} }
void endReportStep() void endReportStep()
@ -1534,48 +1551,6 @@ namespace Opm {
} }
private: private:
void assembleMassBalanceEq(const SimulatorTimerInterface& timer,
const int iterationIdx)
{
ebosSimulator_.startNextEpisode( timer.currentStepLength() );
ebosSimulator_.setEpisodeIndex( timer.reportStepNum() );
ebosSimulator_.setTimeStepIndex( timer.reportStepNum() );
ebosSimulator_.model().newtonMethod().setIterationIndex(iterationIdx);
static int prevEpisodeIdx = 10000;
// notify ebos about the end of the previous episode and time step if applicable
if (isBeginReportStep_) {
isBeginReportStep_ = false;
ebosSimulator_.problem().beginEpisode();
}
// doing the notifactions here is conceptually wrong and also causes the
// endTimeStep() and endEpisode() methods to be not called for the
// simulation's last time step and episode.
if (ebosSimulator_.model().newtonMethod().numIterations() == 0
&& prevEpisodeIdx < timer.reportStepNum())
{
ebosSimulator_.problem().endTimeStep();
}
ebosSimulator_.setTimeStepSize( timer.currentStepLength() );
if (ebosSimulator_.model().newtonMethod().numIterations() == 0)
{
ebosSimulator_.problem().beginTimeStep();
}
ebosSimulator_.problem().beginIteration();
ebosSimulator_.model().linearizer().linearize();
ebosSimulator_.problem().endIteration();
prevEpisodeIdx = ebosSimulator_.episodeIndex();
if (param_.update_equations_scaling_) {
std::cout << "equation scaling not suported yet" << std::endl;
//updateEquationsScaling();
}
}
double dpMaxRel() const { return param_.dp_max_rel_; } double dpMaxRel() const { return param_.dp_max_rel_; }
double dsMax() const { return param_.ds_max_; } double dsMax() const { return param_.ds_max_; }
@ -1583,7 +1558,6 @@ namespace Opm {
double maxResidualAllowed() const { return param_.max_residual_allowed_; } double maxResidualAllowed() const { return param_.max_residual_allowed_; }
public: public:
bool isBeginReportStep_;
std::vector<bool> wasSwitched_; std::vector<bool> wasSwitched_;
}; };
} // namespace Opm } // namespace Opm