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

rename TTag::EclFlowOilWaterProblem to TTag::FlowOilWaterProblem

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-06 14:47:31 +01:00
parent 7b6021050d
commit cc8dd22b9a
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flow/flow_ebos_oilwater.cpp
View File

@ -31,26 +31,24 @@
namespace Opm { namespace Opm {
namespace Properties { namespace Properties {
namespace TTag { namespace TTag {
struct EclFlowOilWaterProblem { struct FlowOilWaterProblem {
using InheritsFrom = std::tuple<FlowProblem>; using InheritsFrom = std::tuple<FlowProblem>;
}; };
} }
template<class TypeTag>
struct Linearizer<TypeTag, TTag::FlowOilWaterProblem> { using type = TpfaLinearizer<TypeTag>; };
template<class TypeTag> template<class TypeTag>
struct Linearizer<TypeTag, TTag::EclFlowOilWaterProblem> { using type = TpfaLinearizer<TypeTag>; }; struct LocalResidual<TypeTag, TTag::FlowOilWaterProblem> { using type = BlackOilLocalResidualTPFA<TypeTag>; };
template<class TypeTag> template<class TypeTag>
struct LocalResidual<TypeTag, TTag::EclFlowOilWaterProblem> { using type = BlackOilLocalResidualTPFA<TypeTag>; }; struct EnableDiffusion<TypeTag, TTag::FlowOilWaterProblem> { static constexpr bool value = false; };
template<class TypeTag>
struct EnableDiffusion<TypeTag, TTag::EclFlowOilWaterProblem> { static constexpr bool value = false; };
//! The indices required by the model //! The indices required by the model
template<class TypeTag> template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowOilWaterProblem> struct Indices<TypeTag, TTag::FlowOilWaterProblem>
{ {
private: private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
@ -60,7 +58,7 @@ private:
using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef BlackOilTwoPhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(), using type = BlackOilTwoPhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
getPropValue<TypeTag, Properties::EnableExtbo>(), getPropValue<TypeTag, Properties::EnableExtbo>(),
getPropValue<TypeTag, Properties::EnablePolymer>(), getPropValue<TypeTag, Properties::EnablePolymer>(),
getPropValue<TypeTag, Properties::EnableEnergy>(), getPropValue<TypeTag, Properties::EnableEnergy>(),
@ -68,7 +66,7 @@ public:
getPropValue<TypeTag, Properties::EnableBrine>(), getPropValue<TypeTag, Properties::EnableBrine>(),
/*PVOffset=*/0, /*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx, /*disabledCompIdx=*/FluidSystem::gasCompIdx,
getPropValue<TypeTag, Properties::EnableMICP>()> type; getPropValue<TypeTag, Properties::EnableMICP>()>;
}; };
}} }}
@ -81,14 +79,14 @@ int flowEbosOilWaterMain(int argc, char** argv, bool outputCout, bool outputFile
// with incorrect locale settings. // with incorrect locale settings.
resetLocale(); resetLocale();
FlowMain<Properties::TTag::EclFlowOilWaterProblem> FlowMain<Properties::TTag::FlowOilWaterProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }
int flowEbosOilWaterMainStandalone(int argc, char** argv) int flowEbosOilWaterMainStandalone(int argc, char** argv)
{ {
using TypeTag = Properties::TTag::EclFlowOilWaterProblem; using TypeTag = Properties::TTag::FlowOilWaterProblem;
auto mainObject = std::make_unique<Opm::Main>(argc, argv); auto mainObject = std::make_unique<Opm::Main>(argc, argv);
auto ret = mainObject->runStatic<TypeTag>(); auto ret = mainObject->runStatic<TypeTag>();
// Destruct mainObject as the destructor calls MPI_Finalize! // Destruct mainObject as the destructor calls MPI_Finalize!