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

changed: move the FingerProblem parameters to Opm::Parameters

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-07-01 14:13:14 +02:00
parent 6c901f516d
commit 6bb7d600d0
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
examples/problems/fingerproblem.hh
View File

@@ -79,10 +79,6 @@ struct Grid<TypeTag, TTag::FingerBaseProblem>
Dune::nonconforming>; }; Dune::nonconforming>; };
#endif #endif
// declare the properties used by the finger problem
template<class TypeTag, class MyTypeTag>
struct InitialWaterSaturation { using type = UndefinedProperty; };
// Set the problem property // Set the problem property
template<class TypeTag> template<class TypeTag>
struct Problem<TypeTag, TTag::FingerBaseProblem> { using type = Opm::FingerProblem<TypeTag>; }; struct Problem<TypeTag, TTag::FingerBaseProblem> { using type = Opm::FingerProblem<TypeTag>; };
@@ -128,17 +124,13 @@ struct MaterialLaw<TypeTag, TTag::FingerBaseProblem>
template<class TypeTag> template<class TypeTag>
struct EnableConstraints<TypeTag, TTag::FingerBaseProblem> { static constexpr int value = true; }; struct EnableConstraints<TypeTag, TTag::FingerBaseProblem> { static constexpr int value = true; };
template<class TypeTag>
struct InitialWaterSaturation<TypeTag, TTag::FingerBaseProblem>
{
using type = GetPropType<TypeTag, Scalar>;
static constexpr type value = 0.01;
};
} // namespace Opm::Properties } // namespace Opm::Properties
namespace Opm::Parameters { namespace Opm::Parameters {
template<class TypeTag, class MyTypeTag>
struct InitialWaterSaturation { using type = Properties::UndefinedProperty; };
template<class TypeTag> template<class TypeTag>
struct CellsX<TypeTag, Properties::TTag::FingerBaseProblem> struct CellsX<TypeTag, Properties::TTag::FingerBaseProblem>
{ static constexpr unsigned value = 20; }; { static constexpr unsigned value = 20; };
@@ -194,6 +186,13 @@ struct InitialTimeStepSize<TypeTag, Properties::TTag::FingerBaseProblem>
static constexpr type value = 10; static constexpr type value = 10;
}; };
template<class TypeTag>
struct InitialWaterSaturation<TypeTag, Properties::TTag::FingerBaseProblem>
{
using type = GetPropType<TypeTag, Properties::Scalar>;
static constexpr type value = 0.01;
};
// Write the solutions of individual newton iterations? // Write the solutions of individual newton iterations?
template<class TypeTag> template<class TypeTag>
struct NewtonWriteConvergence<TypeTag, Properties::TTag::FingerBaseProblem> struct NewtonWriteConvergence<TypeTag, Properties::TTag::FingerBaseProblem>
@@ -319,7 +318,7 @@ public:
{ {
ParentType::registerParameters(); ParentType::registerParameters();
Parameters::registerParam<TypeTag, Properties::InitialWaterSaturation> Parameters::registerParam<TypeTag, Parameters::InitialWaterSaturation>
("The initial saturation in the domain [] of the wetting phase"); ("The initial saturation in the domain [] of the wetting phase");
} }
@@ -572,7 +571,7 @@ private:
auto& fs = initialFluidState_; auto& fs = initialFluidState_;
fs.setPressure(wettingPhaseIdx, /*pressure=*/1e5); fs.setPressure(wettingPhaseIdx, /*pressure=*/1e5);
Scalar Sw = Parameters::get<TypeTag, Properties::InitialWaterSaturation>(); Scalar Sw = Parameters::get<TypeTag, Parameters::InitialWaterSaturation>();
fs.setSaturation(wettingPhaseIdx, Sw); fs.setSaturation(wettingPhaseIdx, Sw);
fs.setSaturation(nonWettingPhaseIdx, 1 - Sw); fs.setSaturation(nonWettingPhaseIdx, 1 - Sw);