Retag TEMP Array as OPM_EXTENDED When Needed

The AUXILIARY category is deprecated and will be removed at some
point.  As of right now, the OPM_EXTENDED category fills the same
role but with a more descriptive name.
This commit is contained in:
Bård Skaflestad 2023-03-15 17:52:11 +01:00
parent 54fc98bfb7
commit 359079dae9

View File

@ -811,15 +811,15 @@ assignToSolution(data::Solution& sol)
for (const auto& entry : data) for (const auto& entry : data)
doInsert(entry); doInsert(entry);
if (!temperature_.empty()) { if ((this->enableEnergy_ || this->enableTemperature_) &&
if (enableEnergy_) ! this->temperature_.empty())
sol.insert("TEMP", UnitSystem::measure::temperature, std::move(temperature_), data::TargetType::RESTART_SOLUTION); {
else { const auto tag = this->enableEnergy_
// Flow allows for initializing of non-constant initial temperature. ? data::TargetType::RESTART_SOLUTION
// For output of this temperature for visualization and restart set --enable-opm-restart=true : data::TargetType::RESTART_OPM_EXTENDED;
assert(enableTemperature_);
sol.insert("TEMP", UnitSystem::measure::temperature, std::move(temperature_), data::TargetType::RESTART_AUXILIARY); sol.insert("TEMP", UnitSystem::measure::temperature,
} std::move(this->temperature_), tag);
} }
if (FluidSystem::phaseIsActive(waterPhaseIdx) && if (FluidSystem::phaseIsActive(waterPhaseIdx) &&