Merge remote-tracking branch 'upstream/master' into PR/EclipseWriter-revision-to-write-substeps

This commit is contained in:
Robert K 2015-01-12 12:35:22 +01:00
commit 7fd9895a12

View File

@ -613,8 +613,12 @@ namespace {
const int po = pu.phase_pos[ Oil ];
const int pg = pu.phase_pos[ Gas ];
// Temporary copy to avoid contribution of dissolved gas in the vaporized oil
// when both dissolved gas and vaporized oil are present.
const ADB accum_gas_copy =rq_[pg].accum[aix];
rq_[pg].accum[aix] += state.rs * rq_[po].accum[aix];
rq_[po].accum[aix] += state.rv * rq_[pg].accum[aix];
rq_[po].accum[aix] += state.rv * accum_gas_copy;
//DUMP(rq_[pg].accum[aix]);
}
}