Merge pull request #6441 from akva2/eclmateriallawmanager_restructure

Eclmateriallawmanager: Adjust to restructure
This commit is contained in:
Bård Skaflestad authored and GitHub committed 2025-09-02 09:37:15 +02:00
commit 45e0f45d64
4 files changed
+4 -4

No files matched your search

@@ -85,7 +85,7 @@ private:
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
public:
using EclMaterialLawManager = ::Opm::EclMaterialLawManager<Traits>;
using EclMaterialLawManager = ::Opm::EclMaterialLaw::Manager<Traits>;
using type = typename EclMaterialLawManager::MaterialLaw;
};
@@ -75,7 +75,7 @@ private:
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
public:
using EclMaterialLawManager = ::Opm::EclMaterialLawManager<Traits>;
using EclMaterialLawManager = ::Opm::EclMaterialLaw::Manager<Traits>;
using type = typename EclMaterialLawManager::MaterialLaw;
};
@@ -28,7 +28,7 @@ namespace Opm {
namespace EQUIL {
template<class Scalar>
using MatLaw = EclMaterialLawManager<ThreePhaseMaterialTraits<Scalar,0,1,2>>;
using MatLaw = EclMaterialLaw::Manager<ThreePhaseMaterialTraits<Scalar,0,1,2>>;
template<class Scalar> using FS = BlackOilFluidSystem<Scalar>;
#define INSTANTIATE_TYPE(T) \
+1 -1
View File
@@ -35,7 +35,7 @@
namespace Opm {
template<class Scalar>
using MatLaw = EclMaterialLawManager<ThreePhaseMaterialTraits<Scalar,0,1,2>>;
using MatLaw = EclMaterialLaw::Manager<ThreePhaseMaterialTraits<Scalar,0,1,2>>;
namespace EQUIL {
namespace DeckDependent {