From f9b64b988eb2b4b78ce9110ba677bf9c28a10979 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Thu, 5 Apr 2018 11:41:09 +0200
Subject: [PATCH] [fluidsystems] Rename GasPhase to OnePGas
---
dumux/freeflow/navierstokesnc/model.hh | 2 +-
dumux/material/fluidsystems/{gasphase.hh => 1pgas.hh} | 8 ++++----
dumux/material/fluidsystems/2pimmiscible.hh | 8 ++++----
dumux/material/fluidsystems/2pliquidvapor.hh | 2 +-
dumux/material/fluidsystems/CMakeLists.txt | 2 +-
test/freeflow/rans/pipelauferproblem.hh | 4 ++--
test/material/fluidsystems/checkfluidsystem.hh | 2 +-
test/material/fluidsystems/test_fluidsystems.cc | 6 +++---
test/porousmediumflow/2p/sequential/test_3d2pproblem.hh | 2 +-
9 files changed, 18 insertions(+), 18 deletions(-)
rename dumux/material/fluidsystems/{gasphase.hh => 1pgas.hh} (98%)
diff --git a/dumux/freeflow/navierstokesnc/model.hh b/dumux/freeflow/navierstokesnc/model.hh
index cfb250ad44..0677dd3891 100644
--- a/dumux/freeflow/navierstokesnc/model.hh
+++ b/dumux/freeflow/navierstokesnc/model.hh
@@ -63,7 +63,7 @@
#include "vtkoutputfields.hh"
#include <dumux/assembly/staggeredlocalresidual.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/material/fluidstates/compositional.hh>
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/1pgas.hh
similarity index 98%
rename from dumux/material/fluidsystems/gasphase.hh
rename to dumux/material/fluidsystems/1pgas.hh
index a7d41e9833..d854137bab 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/1pgas.hh
@@ -19,7 +19,7 @@
/*!
* \file
* \ingroup Fluidsystems
- * \brief @copybrief Dumux::FluidSystems::GasPhase
+ * \brief @copybrief Dumux::FluidSystems::OnePGas
*/
#ifndef DUMUX_GAS_PHASE_HH
#define DUMUX_GAS_PHASE_HH
@@ -42,10 +42,10 @@ namespace FluidSystems
* \brief A gaseous phase consisting of a single component
*/
template <class Scalar, class ComponentT>
-class GasPhase
-: public BaseFluidSystem<Scalar, GasPhase<Scalar, ComponentT> >
+class OnePGas
+: public BaseFluidSystem<Scalar, OnePGas<Scalar, ComponentT> >
{
- using ThisType = GasPhase<Scalar, ComponentT>;
+ using ThisType = OnePGas<Scalar, ComponentT>;
using Base = BaseFluidSystem<Scalar, ThisType>;
public:
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index 3af642db5b..410f9d3b44 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -30,7 +30,7 @@
#include <dune/common/exceptions.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/fluidstates/immiscible.hh>
#include "base.hh"
@@ -47,11 +47,11 @@ namespace FluidSystems {
* constituting components.
* The wetting and the non-wetting phase can be defined individually
* via FluidSystem::OnePLiquid<Component> and
- * FluidSystem::GasPhase<Component>. These phases consist of one pure
+ * FluidSystem::OnePGas<Component>. These phases consist of one pure
* component.
* \tparam Scalar the scalar type
- * \tparam WettingPhase the wetting phase fluid system (use FluidSystem::OnePLiquid<Component> / FluidSystem::GasPhase<Component>)
- * \tparam NonwettingPhase the wetting phase fluid system (use FluidSystem::OnePLiquid<Component> / FluidSystem::GasPhase<Component>)
+ * \tparam WettingPhase the wetting phase fluid system (use FluidSystem::OnePLiquid<Component> / FluidSystem::OnePGas<Component>)
+ * \tparam NonwettingPhase the wetting phase fluid system (use FluidSystem::OnePLiquid<Component> / FluidSystem::OnePGas<Component>)
*/
template <class Scalar, class WettingPhase, class NonwettingPhase>
class TwoPImmiscible
diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh
index 34f2b6dc8e..d27ae7c2db 100644
--- a/dumux/material/fluidsystems/2pliquidvapor.hh
+++ b/dumux/material/fluidsystems/2pliquidvapor.hh
@@ -31,7 +31,7 @@
#include <dune/common/exceptions.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/fluidstates/compositional.hh>
#include "base.hh"
diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 11610e7161..9226fb7542 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -4,7 +4,7 @@ install(FILES
base.hh
brineair.hh
brineco2.hh
- gasphase.hh
+ 1pgas.hh
h2oair.hh
h2oairmesitylene.hh
h2oairxylene.hh
diff --git a/test/freeflow/rans/pipelauferproblem.hh b/test/freeflow/rans/pipelauferproblem.hh
index 55da37fa23..9db008aba9 100644
--- a/test/freeflow/rans/pipelauferproblem.hh
+++ b/test/freeflow/rans/pipelauferproblem.hh
@@ -27,7 +27,7 @@
#ifndef DUMUX_PIPE_LAUFER_PROBLEM_HH
#define DUMUX_PIPE_LAUFER_PROBLEM_HH
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/components/air.hh>
#include <dumux/freeflow/rans/zeroeq/model.hh>
@@ -51,7 +51,7 @@ NEW_TYPE_TAG(PipeLauferProblem, INHERITS_FROM(StaggeredFreeFlowModel, ZeroEq));
SET_PROP(PipeLauferProblem, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using type = FluidSystems::GasPhase<Scalar, Air<Scalar> >;
+ using type = FluidSystems::OnePGas<Scalar, Air<Scalar> >;
};
// Set the grid type
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 52208a03a2..2914a7b75e 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -35,7 +35,7 @@
#include <dumux/material/fluidsystems/base.hh>
#include <dumux/material/fluidsystems/brineair.hh>
#include <dumux/material/fluidsystems/brineco2.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
#include <dumux/material/fluidsystems/h2oairxylene.hh>
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index b1c045bf1a..4446f64f42 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -31,7 +31,7 @@
#include <dumux/material/fluidsystems/base.hh>
#include <dumux/material/fluidsystems/brineair.hh>
#include <dumux/material/fluidsystems/brineco2.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
#include <dumux/material/fluidsystems/h2oairxylene.hh>
@@ -63,7 +63,7 @@ int main()
using N2 = Components::N2<Scalar>;
using Liquid = FluidSystems::OnePLiquid<Scalar, H2O>;
- using Gas = FluidSystems::GasPhase<Scalar, N2>;
+ using Gas = FluidSystems::OnePGas<Scalar, N2>;
int success = 0;
std::vector<std::string> collectedExceptions;
@@ -169,7 +169,7 @@ int main()
success += checkFluidSystem<Scalar, FluidSystem>(); }
// gas phase
- { using FluidSystem = FluidSystems::GasPhase<Scalar, H2O>;
+ { using FluidSystem = FluidSystems::OnePGas<Scalar, H2O>;
success += checkFluidSystem<Scalar, FluidSystem>(); }
// H2O -- Air -- Mesitylene
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index dd323af56f..89d66ba9ad 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -26,7 +26,7 @@
#include <dumux/material/fluidsystems/1pliquid.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureproperties.hh>
--
GitLab