mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-10-26 07:30:08 -05:00
Merge pull request #6441 from akva2/eclmateriallawmanager_restructure
Eclmateriallawmanager: Adjust to restructure
This commit is contained in:
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) \
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in new issue
Block a user