rename TTag::EclFlowGasWaterSolventProblem to TTag::FlowGasWaterSolventProblem

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

View File

@ -31,19 +31,19 @@
namespace Opm {
namespace Properties {
namespace TTag {
struct EclFlowGasWaterSolventProblem {
struct FlowGasWaterSolventProblem {
using InheritsFrom = std::tuple<FlowProblem>;
};
}
template<class TypeTag>
struct EnableSolvent<TypeTag, TTag::EclFlowGasWaterSolventProblem> {
struct EnableSolvent<TypeTag, TTag::FlowGasWaterSolventProblem> {
static constexpr bool value = true;
};
//! The indices required by the model
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowGasWaterSolventProblem>
struct Indices<TypeTag, TTag::FlowGasWaterSolventProblem>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads
@ -53,15 +53,15 @@ private:
using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public:
typedef BlackOilTwoPhaseIndices<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,
/*disabledCompIdx=*/FluidSystem::oilCompIdx,
getPropValue<TypeTag, Properties::EnableMICP>()> type;
using type = BlackOilTwoPhaseIndices<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,
/*disabledCompIdx=*/FluidSystem::oilCompIdx,
getPropValue<TypeTag, Properties::EnableMICP>()>;
};
}}
@ -75,14 +75,14 @@ int flowEbosGasWaterSolventMain(int argc, char** argv, bool outputCout, bool out
// with incorrect locale settings.
resetLocale();
FlowMain<Properties::TTag::EclFlowGasWaterSolventProblem>
FlowMain<Properties::TTag::FlowGasWaterSolventProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}
int flowEbosGasWaterSolventMainStandalone(int argc, char** argv)
{
using TypeTag = Properties::TTag::EclFlowGasWaterSolventProblem;
using TypeTag = Properties::TTag::FlowGasWaterSolventProblem;
auto mainObject = std::make_unique<Opm::Main>(argc, argv);
auto ret = mainObject->runStatic<TypeTag>();
// Destruct mainObject as the destructor calls MPI_Finalize!