From c219585cf80fcac1b4e5df48bfe8bb6187df757d Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 8 May 2014 16:53:53 +0200
Subject: [PATCH] 1p/2p fluid systems: rename them to more sensfull class names

they were totally inconsistent with the remaining fluid systems
because their file names stated with a number and "P" was used instead
of "Phase"...
---
 ...FluidSystem.hpp => SinglePhaseFluidSystem.hpp} | 15 +++++++--------
 ...stem.hpp => TwoPhaseImmiscibleFluidSystem.hpp} | 14 +++++++-------
 tests/checkFluidSystem.hpp                        |  4 ++--
 tests/test_fluidmatrixinteractions.cpp            |  4 ++--
 tests/test_fluidsystems.cpp                       | 14 +++++++-------
 5 files changed, 25 insertions(+), 26 deletions(-)
 rename opm/material/fluidsystems/{1pFluidSystem.hpp => SinglePhaseFluidSystem.hpp} (96%)
 rename opm/material/fluidsystems/{2pImmiscibleFluidSystem.hpp => TwoPhaseImmiscibleFluidSystem.hpp} (96%)

diff --git a/opm/material/fluidsystems/1pFluidSystem.hpp b/opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
similarity index 96%
rename from opm/material/fluidsystems/1pFluidSystem.hpp
rename to opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
index 861477f60..2bb806176 100644
--- a/opm/material/fluidsystems/1pFluidSystem.hpp
+++ b/opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
@@ -19,10 +19,10 @@
 */
 /*!
  * \file
- * \copydoc Opm::FluidSystems::OneP
+ * \copydoc Opm::FluidSystems::SinglePhase
  */
-#ifndef OPM_1P_FLUIDSYSTEM_HPP
-#define OPM_1P_FLUIDSYSTEM_HPP
+#ifndef OPM_SINGLE_PHASE_FLUIDSYSTEM_HPP
+#define OPM_SINGLE_PHASE_FLUIDSYSTEM_HPP
 
 #include "BaseFluidSystem.hpp"
 #include "NullParameterCache.hpp"
@@ -50,10 +50,10 @@ namespace FluidSystems {
  * Opm::GasPhase<Component> may be used.
  */
 template <class Scalar, class Fluid>
-class OneP
-    : public BaseFluidSystem<Scalar, OneP<Scalar, Fluid> >
+class SinglePhase
+    : public BaseFluidSystem<Scalar, SinglePhase<Scalar, Fluid> >
 {
-    typedef OneP<Scalar, Fluid> ThisType;
+    typedef SinglePhase<Scalar, Fluid> ThisType;
     typedef BaseFluidSystem<Scalar, ThisType> Base;
 
 public:
@@ -262,7 +262,6 @@ public:
     }
 };
 
-} // namespace FluidSystems
-} // namespace Opm
+}} // namespace Opm, FluidSystems
 
 #endif
diff --git a/opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp b/opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
similarity index 96%
rename from opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp
rename to opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
index a54cfbd39..bc331e168 100644
--- a/opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp
+++ b/opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
@@ -19,10 +19,10 @@
 */
 /*!
  * \file
- * \copydoc Opm::FluidSystems::TwoPImmiscible
+ * \copydoc Opm::FluidSystems::TwoPhaseImmiscible
  */
-#ifndef OPM_2P_IMMISCIBLE_FLUID_SYSTEM_HPP
-#define OPM_2P_IMMISCIBLE_FLUID_SYSTEM_HPP
+#ifndef OPM_TWO_PHASE_IMMISCIBLE_FLUID_SYSTEM_HPP
+#define OPM_TWO_PHASE_IMMISCIBLE_FLUID_SYSTEM_HPP
 
 #include <limits>
 #include <cassert>
@@ -51,14 +51,14 @@ namespace FluidSystems {
  * systems without compositional effects.
  */
 template <class Scalar, class WettingPhase, class NonwettingPhase>
-class TwoPImmiscible
-: public BaseFluidSystem<Scalar, TwoPImmiscible<Scalar, WettingPhase, NonwettingPhase> >
+class TwoPhaseImmiscible
+: public BaseFluidSystem<Scalar, TwoPhaseImmiscible<Scalar, WettingPhase, NonwettingPhase> >
 {
     // 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;
 public:
     //! \copydoc BaseFluidSystem::ParameterCache
diff --git a/tests/checkFluidSystem.hpp b/tests/checkFluidSystem.hpp
index 6ca56721b..b98bb1db9 100644
--- a/tests/checkFluidSystem.hpp
+++ b/tests/checkFluidSystem.hpp
@@ -24,8 +24,8 @@
 #define OPM_CHECK_FLUIDSYSTEM_HPP
 
 // include all fluid systems in opm-material
-#include <opm/material/fluidsystems/1pFluidSystem.hpp>
-#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp>
+#include <opm/material/fluidsystems/SinglePhaseFluidSystem.hpp>
+#include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
 #include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
 #include <opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp>
 #include <opm/material/fluidsystems/H2OAirFluidSystem.hpp>
diff --git a/tests/test_fluidmatrixinteractions.cpp b/tests/test_fluidmatrixinteractions.cpp
index 6da9c52d0..bc4709386 100644
--- a/tests/test_fluidmatrixinteractions.cpp
+++ b/tests/test_fluidmatrixinteractions.cpp
@@ -46,7 +46,7 @@
 #include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
 
 // include some fluid systems
-#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp>
+#include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
 // include some components
@@ -252,7 +252,7 @@ int main(int argc, char **argv)
     typedef Opm::LiquidPhase<Scalar, H2O> Liquid;
     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::TwoPhaseMaterialTraits<Scalar,
diff --git a/tests/test_fluidsystems.cpp b/tests/test_fluidsystems.cpp
index 41a83a27a..6b2195595 100644
--- a/tests/test_fluidsystems.cpp
+++ b/tests/test_fluidsystems.cpp
@@ -27,8 +27,8 @@
 #include "checkFluidSystem.hpp"
 
 // include all fluid systems in opm-material
-#include <opm/material/fluidsystems/1pFluidSystem.hpp>
-#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp>
+#include <opm/material/fluidsystems/SinglePhaseFluidSystem.hpp>
+#include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 #include <opm/material/fluidsystems/BrineCO2FluidSystem.hpp>
 #include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
@@ -172,20 +172,20 @@ int main(int argc, char **argv)
         checkFluidSystem<Scalar, FluidSystem>(); }
 
     // 2p-immiscible
-    {   typedef Opm::FluidSystems::TwoPImmiscible<Scalar, Liquid, Liquid> FluidSystem;
+    {   typedef Opm::FluidSystems::TwoPhaseImmiscible<Scalar, Liquid, Liquid> FluidSystem;
         checkFluidSystem<Scalar, FluidSystem>(); }
 
-    {   typedef Opm::FluidSystems::TwoPImmiscible<Scalar, Liquid, Gas> FluidSystem;
+    {   typedef Opm::FluidSystems::TwoPhaseImmiscible<Scalar, Liquid, Gas> FluidSystem;
         checkFluidSystem<Scalar, FluidSystem>(); }
 
-    {  typedef Opm::FluidSystems::TwoPImmiscible<Scalar, Gas, Liquid> FluidSystem;
+    {  typedef Opm::FluidSystems::TwoPhaseImmiscible<Scalar, Gas, Liquid> FluidSystem;
         checkFluidSystem<Scalar, FluidSystem>(); }
 
     // 1p
-    {   typedef Opm::FluidSystems::OneP<Scalar, Liquid> FluidSystem;
+    {   typedef Opm::FluidSystems::SinglePhase<Scalar, Liquid> FluidSystem;
         checkFluidSystem<Scalar, FluidSystem>(); }
 
-    {   typedef Opm::FluidSystems::OneP<Scalar, Gas> FluidSystem;
+    {   typedef Opm::FluidSystems::SinglePhase<Scalar, Gas> FluidSystem;
         checkFluidSystem<Scalar, FluidSystem>(); }
 
     return 0;