rename TTag::EclFlowProblemWaterOnlyEnergy to TTag::FlowWaterOnlyEnergyProblem

This commit is contained in:
Arne Morten Kvarving 2024-02-06 14:47:31 +01:00
parent fc90700010
commit 41341a9753

View File

@ -30,17 +30,17 @@ namespace Opm {
namespace Properties {
namespace TTag {
struct EclFlowProblemWaterOnlyEnergy {
struct FlowWaterOnlyEnergyProblem {
using InheritsFrom = std::tuple<FlowProblem>;
};
}
template<class TypeTag>
struct EnableEnergy<TypeTag, TTag::EclFlowProblemWaterOnlyEnergy> {
struct EnableEnergy<TypeTag, TTag::FlowWaterOnlyEnergyProblem> {
static constexpr bool value = true;
};
//! The indices required by the model
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowProblemWaterOnlyEnergy>
struct Indices<TypeTag, TTag::FlowWaterOnlyEnergyProblem>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads
@ -50,16 +50,15 @@ private:
using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public:
typedef Opm::BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
getPropValue<TypeTag, Properties::EnableExtbo>(),
getPropValue<TypeTag, Properties::EnablePolymer>(),
getPropValue<TypeTag, Properties::EnableEnergy>(),
getPropValue<TypeTag, Properties::EnableFoam>(),
getPropValue<TypeTag, Properties::EnableBrine>(),
/*PVOffset=*/0,
/*enebledCompIdx=*/FluidSystem::waterCompIdx,
getPropValue<TypeTag, Properties::EnableMICP>()>
type;
using type = Opm::BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
getPropValue<TypeTag, Properties::EnableExtbo>(),
getPropValue<TypeTag, Properties::EnablePolymer>(),
getPropValue<TypeTag, Properties::EnableEnergy>(),
getPropValue<TypeTag, Properties::EnableFoam>(),
getPropValue<TypeTag, Properties::EnableBrine>(),
/*PVOffset=*/0,
/*enebledCompIdx=*/FluidSystem::waterCompIdx,
getPropValue<TypeTag, Properties::EnableMICP>()>;
};
} // namespace Opm::Properties
@ -71,14 +70,14 @@ int flowEbosWaterOnlyEnergyMain(int argc, char** argv, bool outputCout, bool out
// with incorrect locale settings.
resetLocale();
FlowMain<Properties::TTag::EclFlowProblemWaterOnlyEnergy>
FlowMain<Properties::TTag::FlowWaterOnlyEnergyProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}
int flowEbosWaterOnlyEnergyMainStandalone(int argc, char** argv)
{
using TypeTag = Opm::Properties::TTag::EclFlowProblemWaterOnlyEnergy;
using TypeTag = Opm::Properties::TTag::FlowWaterOnlyEnergyProblem;
auto mainObject = std::make_unique<Opm::Main>(argc, argv);
auto ret = mainObject->runStatic<TypeTag>();
// Destruct mainObject as the destructor calls MPI_Finalize!