rename TTag::EclFlowOilWaterBrineProblem to TTag::FlowOilWaterBrineProblem

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

View File

@@ -28,17 +28,17 @@
namespace Opm {
namespace Properties {
namespace TTag {
struct EclFlowOilWaterBrineProblem {
struct FlowOilWaterBrineProblem {
using InheritsFrom = std::tuple<FlowProblem>;
};
}
template<class TypeTag>
struct EnableBrine<TypeTag, TTag::EclFlowOilWaterBrineProblem> {
struct EnableBrine<TypeTag, TTag::FlowOilWaterBrineProblem> {
static constexpr bool value = true;
};
//! The indices required by the model
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowOilWaterBrineProblem>
struct Indices<TypeTag, TTag::FlowOilWaterBrineProblem>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads
@@ -48,15 +48,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::gasCompIdx,
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::gasCompIdx,
getPropValue<TypeTag, Properties::EnableMICP>()>;
};
}}
@@ -69,14 +69,14 @@ int flowEbosOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outpu
// with incorrect locale settings.
resetLocale();
FlowMain<Properties::TTag::EclFlowOilWaterBrineProblem>
FlowMain<Properties::TTag::FlowOilWaterBrineProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}
int flowEbosOilWaterBrineMainStandalone(int argc, char** argv)
{
using TypeTag = Properties::TTag::EclFlowOilWaterBrineProblem;
using TypeTag = Properties::TTag::FlowOilWaterBrineProblem;
auto mainObject = std::make_unique<Opm::Main>(argc, argv);
auto ret = mainObject->runStatic<TypeTag>();
// Destruct mainObject as the destructor calls MPI_Finalize!