some clean up

This commit is contained in:
Paul Egberts
2022-03-06 20:51:57 +01:00
parent 797fdc278b
commit d89672e4a3
5 changed files with 3 additions and 6 deletions

View File

@@ -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)

View File

@@ -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_},

View File

@@ -2733,8 +2733,6 @@ private:
if (FluidSystem::enableVaporizedWater())
dofFluidState.setRvw(rvwData[dofIdx]);
else if (Indices::gasEnabled && Indices::waterEnabled)
dofFluidState.setRvw(0.0);
//////
// set invB_