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

Merge pull request #433 from andlaus/conditional_temperature

Browse Source 
ebos: only write out temperature in thermal runs
This commit is contained in:
Tor Harald Sandve 2018-12-21 12:48:54 +01:00 committed by GitHub
commit 625a4cd303
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ebos/ecloutputblackoilmodule.hh
View File

@ -91,6 +91,7 @@ class EclOutputBlackOilModule
enum { waterPhaseIdx = FluidSystem::waterPhaseIdx }; enum { waterPhaseIdx = FluidSystem::waterPhaseIdx };
enum { gasCompIdx = FluidSystem::gasCompIdx }; enum { gasCompIdx = FluidSystem::gasCompIdx };
enum { oilCompIdx = FluidSystem::oilCompIdx }; enum { oilCompIdx = FluidSystem::oilCompIdx };
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
typedef std::vector<Scalar> ScalarBuffer; typedef std::vector<Scalar> ScalarBuffer;
@ -216,6 +217,9 @@ public:
} }
} }
// always allocate memory for temperature
temperature_.resize(bufferSize, 0.0);
// Only provide restart on restart steps // Only provide restart on restart steps
if (!restartConfig.getWriteRestartFile(reportStepNum, log) || substep) if (!restartConfig.getWriteRestartFile(reportStepNum, log) || substep)
return; return;
@ -229,7 +233,6 @@ public:
} }
// and oil pressure // and oil pressure
oilPressure_.resize(bufferSize, 0.0); oilPressure_.resize(bufferSize, 0.0);
temperature_.resize(bufferSize, 0.0);
if (FluidSystem::enableDissolvedGas()) if (FluidSystem::enableDissolvedGas())
rs_.resize(bufferSize, 0.0); rs_.resize(bufferSize, 0.0);
@ -384,7 +387,7 @@ public:
Opm::Valgrind::CheckDefined(oilPressure_[globalDofIdx]); Opm::Valgrind::CheckDefined(oilPressure_[globalDofIdx]);
} }
if (temperature_.size() > 0) { if (enableEnergy) {
temperature_[globalDofIdx] = Opm::getValue(fs.temperature(oilPhaseIdx)); temperature_[globalDofIdx] = Opm::getValue(fs.temperature(oilPhaseIdx));
Opm::Valgrind::CheckDefined(temperature_[globalDofIdx]); Opm::Valgrind::CheckDefined(temperature_[globalDofIdx]);
} }
@ -732,7 +735,7 @@ public:
sol.insert("PRESSURE", Opm::UnitSystem::measure::pressure, std::move(oilPressure_), Opm::data::TargetType::RESTART_SOLUTION); sol.insert("PRESSURE", Opm::UnitSystem::measure::pressure, std::move(oilPressure_), Opm::data::TargetType::RESTART_SOLUTION);
} }
if (temperature_.size() > 0) { if (enableEnergy) {
sol.insert("TEMP", Opm::UnitSystem::measure::temperature, std::move(temperature_), Opm::data::TargetType::RESTART_SOLUTION); sol.insert("TEMP", Opm::UnitSystem::measure::temperature, std::move(temperature_), Opm::data::TargetType::RESTART_SOLUTION);
} }
@ -960,7 +963,7 @@ public:
if (oilPressure_.size() > 0 && sol.has("PRESSURE")) if (oilPressure_.size() > 0 && sol.has("PRESSURE"))
oilPressure_[elemIdx] = sol.data("PRESSURE")[globalDofIndex]; oilPressure_[elemIdx] = sol.data("PRESSURE")[globalDofIndex];
if (temperature_.size() > 0 && sol.has("TEMP")) if (enableEnergy && sol.has("TEMP"))
temperature_[elemIdx] = sol.data("TEMP")[globalDofIndex]; temperature_[elemIdx] = sol.data("TEMP")[globalDofIndex];
if (rs_.size() > 0 && sol.has("RS")) if (rs_.size() > 0 && sol.has("RS"))
rs_[elemIdx] = sol.data("RS")[globalDofIndex]; rs_[elemIdx] = sol.data("RS")[globalDofIndex];
@ -1018,7 +1021,7 @@ public:
} }
} }
if (temperature_.size() > 0) if (enableEnergy)
fs.setTemperature(temperature_[elemIdx]); fs.setTemperature(temperature_[elemIdx]);
if (rs_.size() > 0) if (rs_.size() > 0)
fs.setRs(rs_[elemIdx]); fs.setRs(rs_[elemIdx]);

4
ebos/eclwriter.hh
View File

@ -96,6 +96,8 @@ class EclWriter
typedef std::vector<Scalar> ScalarBuffer; typedef std::vector<Scalar> ScalarBuffer;
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
public: public:
static void registerParameters() static void registerParameters()
{ {
@ -324,7 +326,7 @@ public:
{"PRESSURE" , Opm::UnitSystem::measure::pressure}, {"PRESSURE" , Opm::UnitSystem::measure::pressure},
{"SWAT" , Opm::UnitSystem::measure::identity, static_cast<bool>(FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx))}, {"SWAT" , Opm::UnitSystem::measure::identity, static_cast<bool>(FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx))},
{"SGAS" , Opm::UnitSystem::measure::identity, static_cast<bool>(FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx))}, {"SGAS" , Opm::UnitSystem::measure::identity, static_cast<bool>(FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx))},
{"TEMP" , Opm::UnitSystem::measure::temperature}, // always required for now {"TEMP" , Opm::UnitSystem::measure::temperature, enableEnergy},
{"RS" , Opm::UnitSystem::measure::gas_oil_ratio, FluidSystem::enableDissolvedGas()}, {"RS" , Opm::UnitSystem::measure::gas_oil_ratio, FluidSystem::enableDissolvedGas()},
{"RV" , Opm::UnitSystem::measure::oil_gas_ratio, FluidSystem::enableVaporizedOil()}, {"RV" , Opm::UnitSystem::measure::oil_gas_ratio, FluidSystem::enableVaporizedOil()},
{"SOMAX", Opm::UnitSystem::measure::identity, simulator_.problem().vapparsActive()}, {"SOMAX", Opm::UnitSystem::measure::identity, simulator_.problem().vapparsActive()},