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

1p/2p fluid systems: rename them to more sensfull class names

Browse Source 
they were totally inconsistent with the remaining fluid systems
because their file names stated with a number and "P" was used instead
of "Phase"...
This commit is contained in:
Andreas Lauser
2014-05-08 16:53:53 +02:00
parent e93e9018b1
commit c219585cf8
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opm/material/fluidsystems/1pFluidSystem.hpp → opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
View File

@@ -19,10 +19,10 @@
*/ */
/*! /*!
* \file * \file
* \copydoc Opm::FluidSystems::OneP * \copydoc Opm::FluidSystems::SinglePhase
*/ */
#ifndef OPM_1P_FLUIDSYSTEM_HPP #ifndef OPM_SINGLE_PHASE_FLUIDSYSTEM_HPP
#define OPM_1P_FLUIDSYSTEM_HPP #define OPM_SINGLE_PHASE_FLUIDSYSTEM_HPP
#include "BaseFluidSystem.hpp" #include "BaseFluidSystem.hpp"
#include "NullParameterCache.hpp" #include "NullParameterCache.hpp"
@@ -50,10 +50,10 @@ namespace FluidSystems {
* Opm::GasPhase<Component> may be used. * Opm::GasPhase<Component> may be used.
*/ */
template <class Scalar, class Fluid> template <class Scalar, class Fluid>
class OneP class SinglePhase
: public BaseFluidSystem<Scalar, OneP<Scalar, Fluid> > : public BaseFluidSystem<Scalar, SinglePhase<Scalar, Fluid> >
{ {
typedef OneP<Scalar, Fluid> ThisType; typedef SinglePhase<Scalar, Fluid> ThisType;
typedef BaseFluidSystem<Scalar, ThisType> Base; typedef BaseFluidSystem<Scalar, ThisType> Base;
public: public:
@@ -262,7 +262,6 @@ public:
} }
}; };
} // namespace FluidSystems }} // namespace Opm, FluidSystems
} // namespace Opm
#endif #endif

14
opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp → opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
View File

@@ -19,10 +19,10 @@
*/ */
/*! /*!
* \file * \file
* \copydoc Opm::FluidSystems::TwoPImmiscible * \copydoc Opm::FluidSystems::TwoPhaseImmiscible
*/ */
#ifndef OPM_2P_IMMISCIBLE_FLUID_SYSTEM_HPP #ifndef OPM_TWO_PHASE_IMMISCIBLE_FLUID_SYSTEM_HPP
#define OPM_2P_IMMISCIBLE_FLUID_SYSTEM_HPP #define OPM_TWO_PHASE_IMMISCIBLE_FLUID_SYSTEM_HPP
#include <limits> #include <limits>
#include <cassert> #include <cassert>
@@ -51,14 +51,14 @@ namespace FluidSystems {
* systems without compositional effects. * systems without compositional effects.
*/ */
template <class Scalar, class WettingPhase, class NonwettingPhase> template <class Scalar, class WettingPhase, class NonwettingPhase>
class TwoPImmiscible class TwoPhaseImmiscible
: public BaseFluidSystem<Scalar, TwoPImmiscible<Scalar, WettingPhase, NonwettingPhase> > : public BaseFluidSystem<Scalar, TwoPhaseImmiscible<Scalar, WettingPhase, NonwettingPhase> >
{ {
// do not try to instanciate this class, it has only static members! // do not try to instanciate this class, it has only static members!
TwoPImmiscible() TwoPhaseImmiscible()
{} {}
typedef TwoPImmiscible<Scalar, WettingPhase, NonwettingPhase> ThisType; typedef TwoPhaseImmiscible<Scalar, WettingPhase, NonwettingPhase> ThisType;
typedef BaseFluidSystem<Scalar, ThisType> Base; typedef BaseFluidSystem<Scalar, ThisType> Base;
public: public:
//! \copydoc BaseFluidSystem::ParameterCache //! \copydoc BaseFluidSystem::ParameterCache

4
tests/checkFluidSystem.hpp
View File

@@ -24,8 +24,8 @@
#define OPM_CHECK_FLUIDSYSTEM_HPP #define OPM_CHECK_FLUIDSYSTEM_HPP
// include all fluid systems in opm-material // include all fluid systems in opm-material
#include <opm/material/fluidsystems/1pFluidSystem.hpp> #include <opm/material/fluidsystems/SinglePhaseFluidSystem.hpp>
#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp> #include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/fluidsystems/H2ON2FluidSystem.hpp> #include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
#include <opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp> #include <opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp>
#include <opm/material/fluidsystems/H2OAirFluidSystem.hpp> #include <opm/material/fluidsystems/H2OAirFluidSystem.hpp>

4
tests/test_fluidmatrixinteractions.cpp
View File

@@ -46,7 +46,7 @@
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp> #include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
// include some fluid systems // include some fluid systems
#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp> #include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp> #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
// include some components // include some components
@@ -252,7 +252,7 @@ int main(int argc, char **argv)
typedef Opm::LiquidPhase<Scalar, H2O> Liquid; typedef Opm::LiquidPhase<Scalar, H2O> Liquid;
typedef Opm::GasPhase<Scalar, N2> Gas; typedef Opm::GasPhase<Scalar, N2> Gas;
typedef Opm::FluidSystems::TwoPImmiscible<Scalar, Liquid, Gas> TwoPFluidSystem; typedef Opm::FluidSystems::TwoPhaseImmiscible<Scalar, Liquid, Gas> TwoPFluidSystem;
typedef Opm::FluidSystems::BlackOil<Scalar> ThreePFluidSystem; typedef Opm::FluidSystems::BlackOil<Scalar> ThreePFluidSystem;
typedef Opm::TwoPhaseMaterialTraits<Scalar, typedef Opm::TwoPhaseMaterialTraits<Scalar,

14
tests/test_fluidsystems.cpp
View File

@@ -27,8 +27,8 @@
#include "checkFluidSystem.hpp" #include "checkFluidSystem.hpp"
// include all fluid systems in opm-material // include all fluid systems in opm-material
#include <opm/material/fluidsystems/1pFluidSystem.hpp> #include <opm/material/fluidsystems/SinglePhaseFluidSystem.hpp>
#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp> #include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp> #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
#include <opm/material/fluidsystems/BrineCO2FluidSystem.hpp> #include <opm/material/fluidsystems/BrineCO2FluidSystem.hpp>
#include <opm/material/fluidsystems/H2ON2FluidSystem.hpp> #include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
@@ -172,20 +172,20 @@ int main(int argc, char **argv)
checkFluidSystem<Scalar, FluidSystem>(); } checkFluidSystem<Scalar, FluidSystem>(); }
// 2p-immiscible // 2p-immiscible
{ typedef Opm::FluidSystems::TwoPImmiscible<Scalar, Liquid, Liquid> FluidSystem; { typedef Opm::FluidSystems::TwoPhaseImmiscible<Scalar, Liquid, Liquid> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); } checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Opm::FluidSystems::TwoPImmiscible<Scalar, Liquid, Gas> FluidSystem; { typedef Opm::FluidSystems::TwoPhaseImmiscible<Scalar, Liquid, Gas> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); } checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Opm::FluidSystems::TwoPImmiscible<Scalar, Gas, Liquid> FluidSystem; { typedef Opm::FluidSystems::TwoPhaseImmiscible<Scalar, Gas, Liquid> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); } checkFluidSystem<Scalar, FluidSystem>(); }
// 1p // 1p
{ typedef Opm::FluidSystems::OneP<Scalar, Liquid> FluidSystem; { typedef Opm::FluidSystems::SinglePhase<Scalar, Liquid> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); } checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Opm::FluidSystems::OneP<Scalar, Gas> FluidSystem; { typedef Opm::FluidSystems::SinglePhase<Scalar, Gas> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); } checkFluidSystem<Scalar, FluidSystem>(); }
return 0; return 0;