mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
rename TTag::EclFlowGasWaterEnergyProblem to TTag::FlowGasWaterEnergyProblem
This commit is contained in:
parent
192fbdb239
commit
e0474238e1
@ -34,41 +34,41 @@
|
|||||||
namespace Opm {
|
namespace Opm {
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
namespace TTag {
|
namespace TTag {
|
||||||
struct EclFlowGasWaterEnergyProblem {
|
struct FlowGasWaterEnergyProblem {
|
||||||
using InheritsFrom = std::tuple<FlowProblem>;
|
using InheritsFrom = std::tuple<FlowProblem>;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct Linearizer<TypeTag, TTag::EclFlowGasWaterEnergyProblem> { using type = TpfaLinearizer<TypeTag>; };
|
struct Linearizer<TypeTag, TTag::FlowGasWaterEnergyProblem> { using type = TpfaLinearizer<TypeTag>; };
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct LocalResidual<TypeTag, TTag::EclFlowGasWaterEnergyProblem> { using type = BlackOilLocalResidualTPFA<TypeTag>; };
|
struct LocalResidual<TypeTag, TTag::FlowGasWaterEnergyProblem> { using type = BlackOilLocalResidualTPFA<TypeTag>; };
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EnableDiffusion<TypeTag, TTag::EclFlowGasWaterEnergyProblem> { static constexpr bool value = true; };
|
struct EnableDiffusion<TypeTag, TTag::FlowGasWaterEnergyProblem> { static constexpr bool value = true; };
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EnableDispersion<TypeTag, TTag::EclFlowGasWaterEnergyProblem> { static constexpr bool value = true; };
|
struct EnableDispersion<TypeTag, TTag::FlowGasWaterEnergyProblem> { static constexpr bool value = true; };
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EnableEnergy<TypeTag, TTag::EclFlowGasWaterEnergyProblem> {
|
struct EnableEnergy<TypeTag, TTag::FlowGasWaterEnergyProblem> {
|
||||||
static constexpr bool value = true;
|
static constexpr bool value = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterEnergyProblem> {
|
struct EnableDisgasInWater<TypeTag, TTag::FlowGasWaterEnergyProblem> {
|
||||||
static constexpr bool value = true;
|
static constexpr bool value = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EnableVapwat<TypeTag, TTag::EclFlowGasWaterEnergyProblem> {
|
struct EnableVapwat<TypeTag, TTag::FlowGasWaterEnergyProblem> {
|
||||||
static constexpr bool value = true;
|
static constexpr bool value = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
//! The indices required by the model
|
//! The indices required by the model
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct Indices<TypeTag, TTag::EclFlowGasWaterEnergyProblem>
|
struct Indices<TypeTag, TTag::FlowGasWaterEnergyProblem>
|
||||||
{
|
{
|
||||||
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
|
||||||
@ -78,15 +78,15 @@ 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>(),
|
||||||
getPropValue<TypeTag, Properties::EnableFoam>(),
|
getPropValue<TypeTag, Properties::EnableFoam>(),
|
||||||
getPropValue<TypeTag, Properties::EnableBrine>(),
|
getPropValue<TypeTag, Properties::EnableBrine>(),
|
||||||
/*PVOffset=*/0,
|
/*PVOffset=*/0,
|
||||||
/*disabledCompIdx=*/FluidSystem::oilCompIdx,
|
/*disabledCompIdx=*/FluidSystem::oilCompIdx,
|
||||||
getPropValue<TypeTag, Properties::EnableMICP>()> type;
|
getPropValue<TypeTag, Properties::EnableMICP>()>;
|
||||||
};
|
};
|
||||||
}}
|
}}
|
||||||
|
|
||||||
@ -100,14 +100,14 @@ int flowEbosGasWaterEnergyMain(int argc, char** argv, bool outputCout, bool outp
|
|||||||
// with incorrect locale settings.
|
// with incorrect locale settings.
|
||||||
resetLocale();
|
resetLocale();
|
||||||
|
|
||||||
FlowMain<Properties::TTag::EclFlowGasWaterEnergyProblem>
|
FlowMain<Properties::TTag::FlowGasWaterEnergyProblem>
|
||||||
mainfunc {argc, argv, outputCout, outputFiles} ;
|
mainfunc {argc, argv, outputCout, outputFiles} ;
|
||||||
return mainfunc.execute();
|
return mainfunc.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
int flowEbosGasWaterEnergyMainStandalone(int argc, char** argv)
|
int flowEbosGasWaterEnergyMainStandalone(int argc, char** argv)
|
||||||
{
|
{
|
||||||
using TypeTag = Properties::TTag::EclFlowGasWaterEnergyProblem;
|
using TypeTag = Properties::TTag::FlowGasWaterEnergyProblem;
|
||||||
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!
|
||||||
|
Loading…
Reference in New Issue
Block a user