OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-22 09:16:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #354 from andlaus/remove_FluidSystems_namespace

Browse Source 
adapt to the fluid system naming convention change in opm-material
This commit is contained in:
Bård Skaflestad 2018-07-27 21:05:58 +02:00 committed by GitHub
commit fde580dd20
8 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/problems/co2injectionproblem.hh
View File

@ -99,8 +99,8 @@ private:
typedef Ewoms::Co2Injection::CO2Tables CO2Tables;
public:
typedef Opm::FluidSystems::BrineCO2<Scalar, CO2Tables> type;
//typedef Opm::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
typedef Opm::BrineCO2FluidSystem<Scalar, CO2Tables> type;
//typedef Opm::H2ON2FluidSystem<Scalar, /*useComplexRelations=*/false> type;
};
// Set the material Law

2
examples/problems/cuvetteproblem.hh
View File

@ -71,7 +71,7 @@ SET_TYPE_PROP(CuvetteBaseProblem, Problem, Ewoms::CuvetteProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(
CuvetteBaseProblem, FluidSystem,
Opm::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
Opm::H2OAirMesityleneFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Enable gravity
SET_BOOL_PROP(CuvetteBaseProblem, EnableGravity, true);

5
examples/problems/diffusionproblem.hh
View File

@ -72,7 +72,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Opm::FluidSystems::H2ON2<Scalar> type;
typedef Opm::H2ON2FluidSystem<Scalar> type;
};
// Set the material Law
@ -88,8 +88,7 @@ private:
typedef Opm::TwoPhaseMaterialTraits<Scalar,
/*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
/*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx>
Traits;
/*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits;
public:
typedef Opm::LinearMaterial<Traits> type;

2
examples/problems/infiltrationproblem.hh
View File

@ -66,7 +66,7 @@ SET_TYPE_PROP(InfiltrationBaseProblem, Problem,
// Set the fluid system
SET_TYPE_PROP(
InfiltrationBaseProblem, FluidSystem,
Opm::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
Opm::H2OAirMesityleneFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Enable gravity?
SET_BOOL_PROP(InfiltrationBaseProblem, EnableGravity, true);

2
examples/problems/obstacleproblem.hh
View File

@ -69,7 +69,7 @@ SET_TYPE_PROP(ObstacleBaseProblem, Problem, Ewoms::ObstacleProblem<TypeTag>);
// Set fluid configuration
SET_TYPE_PROP(ObstacleBaseProblem, FluidSystem,
Opm::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar)>);
Opm::H2ON2FluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Set the material Law
SET_PROP(ObstacleBaseProblem, MaterialLaw)

2
examples/problems/outflowproblem.hh
View File

@ -63,7 +63,7 @@ private:
public:
// Two-component single phase fluid system
typedef Opm::FluidSystems::H2ON2LiquidPhase<Scalar> type;
typedef Opm::H2ON2LiquidPhaseFluidSystem<Scalar> type;
};
// Disable gravity

2
examples/problems/reservoirproblem.hh
View File

@ -130,7 +130,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Opm::FluidSystems::BlackOil<Scalar> type;
typedef Opm::BlackOilFluidSystem<Scalar> type;
};
// The default DGF file to load

2
examples/problems/waterairproblem.hh
View File

@ -107,7 +107,7 @@ SET_TYPE_PROP(WaterAirBaseProblem, SolidEnergyLaw,
// Set the fluid system. in this case, we use the one which describes
// air and water
SET_TYPE_PROP(WaterAirBaseProblem, FluidSystem,
Opm::FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
Opm::H2OAirFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Enable gravity
SET_BOOL_PROP(WaterAirBaseProblem, EnableGravity, true);