OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 04:26:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1077 from babrodtk/fix_gipg_error_norne

Browse Source 
Moved computation of FIP before output to summary
This commit is contained in:
Atgeirr Flø Rasmussen 2017-02-24 11:38:02 +01:00 committed by GitHub
commit 882d243df8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -245,6 +245,17 @@ public:
auto solver = createSolver(well_model); auto solver = createSolver(well_model);
// Compute orignal fluid in place if this has not been done yet
if (originalFluidInPlace.empty()) {
solver->model().convertInput(/*iterationIdx=*/0, state, ebosSimulator_ );
ebosSimulator_.model().invalidateIntensiveQuantitiesCache(/*timeIdx=*/0);
originalFluidInPlace = solver->computeFluidInPlace(fipnum);
originalFluidInPlaceTotals = FIPTotals(originalFluidInPlace, state);
FIPUnitConvert(eclState().getUnits(), originalFluidInPlace);
FIPUnitConvert(eclState().getUnits(), originalFluidInPlaceTotals);
}
// write the inital state at the report stage // write the inital state at the report stage
if (timer.initialStep()) { if (timer.initialStep()) {
Dune::Timer perfTimer; Dune::Timer perfTimer;
@ -257,17 +268,6 @@ public:
report.output_write_time += perfTimer.stop(); report.output_write_time += perfTimer.stop();
} }
// Compute orignal fluid in place if this has not been done yet
if (originalFluidInPlace.empty()) {
solver->model().convertInput(/*iterationIdx=*/0, state, ebosSimulator_ );
ebosSimulator_.model().invalidateIntensiveQuantitiesCache(/*timeIdx=*/0);
originalFluidInPlace = solver->computeFluidInPlace(fipnum);
originalFluidInPlaceTotals = FIPTotals(originalFluidInPlace, state);
FIPUnitConvert(eclState().getUnits(), originalFluidInPlace);
FIPUnitConvert(eclState().getUnits(), originalFluidInPlaceTotals);
}
if( terminal_output_ ) if( terminal_output_ )
{ {
std::ostringstream step_msg; std::ostringstream step_msg;