mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-10-25 23:20:12 -05:00
Adapt to upstream addition of traits for hyst and eps.
This commit is contained in:
1 parent
00d6bf213c
commit
ce81e1c4d9
9 files changed
+34
-8
No files matched your search
@@ -131,7 +131,9 @@ private:
|
||||
using Traits = Opm::ThreePhaseMaterialTraits<Scalar,
|
||||
/*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
|
||||
/*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx,
|
||||
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
|
||||
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
|
||||
/* hysteresis */ false,
|
||||
/* endpointscaling */ false>;
|
||||
|
||||
// define the material law which is parameterized by effective saturation
|
||||
using EffMaterialLaw = Opm::NullMaterial<Traits>;
|
||||
|
||||
@@ -88,7 +88,9 @@ private:
|
||||
Scalar,
|
||||
/*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
|
||||
/*nonWettingPhaseIdx=*/FluidSystem::naplPhaseIdx,
|
||||
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
|
||||
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
|
||||
/* hysteresis */ false,
|
||||
/* endpointscaling */ false>;
|
||||
|
||||
public:
|
||||
using type = Opm::ThreePhaseParkerVanGenuchten<Traits>;
|
||||
|
||||
@@ -86,7 +86,9 @@ private:
|
||||
Scalar,
|
||||
/*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
|
||||
/*nonWettingPhaseIdx=*/FluidSystem::naplPhaseIdx,
|
||||
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
|
||||
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
|
||||
/* hysteresis */ false,
|
||||
/* endpointscaling */ false>;
|
||||
|
||||
public:
|
||||
using type = Opm::ThreePhaseParkerVanGenuchten<Traits>;
|
||||
|
||||
@@ -93,7 +93,9 @@ private:
|
||||
ThreePhaseMaterialTraits<Scalar,
|
||||
/*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
|
||||
/*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx,
|
||||
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
|
||||
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx,
|
||||
/* hysteresis */ false,
|
||||
/* endpointscaling */ false>;
|
||||
|
||||
public:
|
||||
using type = Opm::LinearMaterial<Traits>;
|
||||
|
||||
Reference in new issue
Block a user