mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
some clean up
This commit is contained in:
@@ -136,9 +136,6 @@ public:
|
||||
|
||||
if (FluidSystem::enableVaporizedWater())
|
||||
fluidState.setRvw(initialState.rvw()[elemIdx]);
|
||||
else if (Indices::gasEnabled)
|
||||
fluidState.setRvw(0.0);
|
||||
|
||||
|
||||
// set the temperature.
|
||||
if (enableTemperature || enableEnergy)
|
||||
|
||||
@@ -681,7 +681,7 @@ assignToSolution(data::Solution& sol)
|
||||
{"RSSAT", UnitSystem::measure::gas_oil_ratio, data::TargetType::RESTART_AUXILIARY, gasDissolutionFactor_},
|
||||
{"RV", UnitSystem::measure::oil_gas_ratio, data::TargetType::RESTART_SOLUTION, rv_},
|
||||
{"RVSAT", UnitSystem::measure::oil_gas_ratio, data::TargetType::RESTART_AUXILIARY, oilVaporizationFactor_},
|
||||
{"RVW", UnitSystem::measure::oil_gas_ratio, data::TargetType::RESTART_AUXILIARY, rvw_}, //PJPE check units + add water vap factor
|
||||
{"RVW", UnitSystem::measure::oil_gas_ratio, data::TargetType::RESTART_AUXILIARY, rvw_},
|
||||
{"SALT", UnitSystem::measure::salinity, data::TargetType::RESTART_SOLUTION, cSalt_},
|
||||
{"SALTP", UnitSystem::measure::identity, data::TargetType::RESTART_AUXILIARY, pSalt_},
|
||||
{"PERMFACT", UnitSystem::measure::identity, data::TargetType::RESTART_AUXILIARY, permFact_},
|
||||
|
||||
@@ -2733,8 +2733,6 @@ private:
|
||||
|
||||
if (FluidSystem::enableVaporizedWater())
|
||||
dofFluidState.setRvw(rvwData[dofIdx]);
|
||||
else if (Indices::gasEnabled && Indices::waterEnabled)
|
||||
dofFluidState.setRvw(0.0);
|
||||
|
||||
//////
|
||||
// set invB_
|
||||
|
||||
Reference in New Issue
Block a user