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

some clean up

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -388,6 +388,7 @@ add_dependencies(moduleVersion opmsimulators)
set(FLOW_MODELS blackoil brine energy extbo foam gasoil gaswater set(FLOW_MODELS blackoil brine energy extbo foam gasoil gaswater
oilwater oilwater_brine gaswater_brine oilwater_polymer oilwater oilwater_brine gaswater_brine oilwater_polymer
oilwater_polymer_injectivity micp polymer solvent oilwater_polymer_injectivity micp polymer solvent
gasoil_energy brine_saltprecipitation gaswater_saltprec_vapwat)
set(FLOW_VARIANT_MODELS brine_energy onephase onephase_energy) set(FLOW_VARIANT_MODELS brine_energy onephase onephase_energy)
set(FLOW_TGTS) set(FLOW_TGTS)

3
ebos/eclequilinitializer.hh
View File

@ -136,9 +136,6 @@ public:
if (FluidSystem::enableVaporizedWater()) if (FluidSystem::enableVaporizedWater())
fluidState.setRvw(initialState.rvw()[elemIdx]); fluidState.setRvw(initialState.rvw()[elemIdx]);
else if (Indices::gasEnabled)
fluidState.setRvw(0.0);
// set the temperature. // set the temperature.
if (enableTemperature || enableEnergy) if (enableTemperature || enableEnergy)

2
ebos/eclgenericoutputblackoilmodule.cc
View File

@ -681,7 +681,7 @@ assignToSolution(data::Solution& sol)
{"RSSAT", UnitSystem::measure::gas_oil_ratio, data::TargetType::RESTART_AUXILIARY, gasDissolutionFactor_}, {"RSSAT", UnitSystem::measure::gas_oil_ratio, data::TargetType::RESTART_AUXILIARY, gasDissolutionFactor_},
{"RV", UnitSystem::measure::oil_gas_ratio, data::TargetType::RESTART_SOLUTION, rv_}, {"RV", UnitSystem::measure::oil_gas_ratio, data::TargetType::RESTART_SOLUTION, rv_},
{"RVSAT", UnitSystem::measure::oil_gas_ratio, data::TargetType::RESTART_AUXILIARY, oilVaporizationFactor_}, {"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_}, {"SALT", UnitSystem::measure::salinity, data::TargetType::RESTART_SOLUTION, cSalt_},
{"SALTP", UnitSystem::measure::identity, data::TargetType::RESTART_AUXILIARY, pSalt_}, {"SALTP", UnitSystem::measure::identity, data::TargetType::RESTART_AUXILIARY, pSalt_},
{"PERMFACT", UnitSystem::measure::identity, data::TargetType::RESTART_AUXILIARY, permFact_}, {"PERMFACT", UnitSystem::measure::identity, data::TargetType::RESTART_AUXILIARY, permFact_},

2
ebos/eclproblem.hh
View File

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

1
flow/flow_ebos_gaswater.cpp
View File

@ -34,6 +34,7 @@ namespace TTag {
struct EclFlowGasWaterProblem { struct EclFlowGasWaterProblem {
using InheritsFrom = std::tuple<EclFlowProblem>; using InheritsFrom = std::tuple<EclFlowProblem>;
}; };
}
//! The indices required by the model //! The indices required by the model
template<class TypeTag> template<class TypeTag>