Merge pull request #1029 from totto82/bugfix_swatinit

BUGFIX Pass solution from flowEbos to ebos initially
This commit is contained in:
Andreas Lauser 2017-01-20 15:02:50 +01:00 committed by GitHub
commit 7d5c5f8acc
2 changed files with 2 additions and 7 deletions

View File

@ -1473,8 +1473,8 @@ namespace Opm {
ebosSimulator_.problem().beginTimeStep();
}
// if the last time step failed we need to update the solution varables in ebos
// and recalculate the IntesiveQuantities.
if ( timer.lastStepFailed() && iterationIdx == 0 ) {
// and recalculate the IntesiveQuantities. Also pass the solution initially.
if ( (timer.lastStepFailed() || timer.reportStepNum()==0) && iterationIdx == 0 ) {
convertInput( iterationIdx, reservoirState, ebosSimulator_ );
ebosSimulator_.model().invalidateIntensiveQuantitiesCache(/*timeIdx=*/0);
}

View File

@ -256,11 +256,6 @@ public:
auto solver = createSolver(well_model);
// make sure that the ebos side of the model is consistent with the reservoir
// state object.
solver->model().convertInput(/*iterationIdx=*/0, state, ebosSimulator_);
ebosSimulator_.model().invalidateIntensiveQuantitiesCache(/*timeIdx=*/0);
// Compute orignal FIP;
if (!ooip_computed) {
OOIP = solver->computeFluidInPlace(fipnum);