From 19571ab982bd0c67eddb7f2003f88e466f5f7fbf Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 31 Oct 2018 15:47:27 +0100
Subject: [PATCH] [io] adapt names "liquid", ... to "liquidPhase", ...
---
dumux/io/name.hh | 16 ++++++++--------
dumux/material/fluidsystems/1pgas.hh | 2 +-
dumux/material/fluidsystems/1pliquid.hh | 2 +-
dumux/material/fluidsystems/2p1c.hh | 4 ++--
dumux/material/fluidsystems/2pimmiscible.hh | 8 ++++----
dumux/material/fluidsystems/3pimmiscible.hh | 6 +++---
dumux/material/fluidsystems/brine.hh | 2 +-
dumux/material/fluidsystems/brineair.hh | 4 ++--
dumux/material/fluidsystems/brineco2.hh | 4 ++--
dumux/material/fluidsystems/h2oair.hh | 4 ++--
dumux/material/fluidsystems/h2oairmesitylene.hh | 6 +++---
dumux/material/fluidsystems/h2oairxylene.hh | 6 +++---
dumux/material/fluidsystems/h2oheavyoil.hh | 6 +++---
dumux/material/fluidsystems/h2on2.hh | 4 ++--
dumux/material/fluidsystems/h2on2o2.hh | 4 ++--
dumux/material/fluidsystems/liquidphase2c.hh | 2 +-
dumux/material/fluidsystems/spe5.hh | 6 +++---
dumux/porousmediumflow/richardsnc/iofields.hh | 14 +++++++-------
18 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/dumux/io/name.hh b/dumux/io/name.hh
index e44c7019ae..340adf2612 100644
--- a/dumux/io/name.hh
+++ b/dumux/io/name.hh
@@ -115,20 +115,20 @@ template<class FluidSystem>
std::string massFraction(int phaseIdx, int compIdx) noexcept
{ return "X^" + FluidSystem::componentName(compIdx) + "_" + FluidSystem::phaseName(phaseIdx); }
-//! I/O name of liquid
-std::string liquid() noexcept
+//! I/O name of liquid phase
+std::string liquidPhase() noexcept
{ return "liq"; }
-//! I/O name of gaseous
-std::string gaseous() noexcept
+//! I/O name of gaseous phase
+std::string gaseousPhase() noexcept
{ return "gas"; }
-//! I/O name of aqueous
-std::string aqueous() noexcept
+//! I/O name of aqueous phase
+std::string aqueousPhase() noexcept
{ return "aq"; }
-//! I/O name of napl
-std::string napl() noexcept
+//! I/O name of napl phase
+std::string naplPhase() noexcept
{ return "napl"; }
//! I/O name of capillary pressure
diff --git a/dumux/material/fluidsystems/1pgas.hh b/dumux/material/fluidsystems/1pgas.hh
index e5fa4dc2a2..ef8a86ac5e 100644
--- a/dumux/material/fluidsystems/1pgas.hh
+++ b/dumux/material/fluidsystems/1pgas.hh
@@ -74,7 +74,7 @@ public:
* \param phaseIdx The index of the fluid phase to consider
*/
static std::string phaseName(int phaseIdx = 0)
- { return IOName::gaseous(); }
+ { return IOName::gaseousPhase(); }
/*!
* \brief A human readable name for the component.
diff --git a/dumux/material/fluidsystems/1pliquid.hh b/dumux/material/fluidsystems/1pliquid.hh
index d7f4bbf30e..a4b818749d 100644
--- a/dumux/material/fluidsystems/1pliquid.hh
+++ b/dumux/material/fluidsystems/1pliquid.hh
@@ -74,7 +74,7 @@ public:
* \param phaseIdx The index of the fluid phase to consider
*/
static std::string phaseName(int phaseIdx = 0)
- { return IOName::liquid(); }
+ { return IOName::liquidPhase(); }
/*!
* \brief A human readable name for the component.
diff --git a/dumux/material/fluidsystems/2p1c.hh b/dumux/material/fluidsystems/2p1c.hh
index 4bfe614d72..c2ccdfe78f 100644
--- a/dumux/material/fluidsystems/2p1c.hh
+++ b/dumux/material/fluidsystems/2p1c.hh
@@ -70,8 +70,8 @@ public:
static std::string phaseName(int phaseIdx)
{
static std::string name[] = {
- std::string(IOName::liquid()),
- std::string(IOName::gaseous()),
+ std::string(IOName::liquidPhase()),
+ std::string(IOName::gaseousPhase()),
};
assert(0 <= phaseIdx && phaseIdx < numPhases);
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index f6cc03cf97..43e96ecea9 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -90,16 +90,16 @@ public:
if (!Fluid0::isGas() && !Fluid1::isGas())
{
if (phaseIdx == phase0Idx)
- return Components::IsAqueous<typename Fluid0::Component>::value ? IOName::aqueous() : IOName::napl();
+ return Components::IsAqueous<typename Fluid0::Component>::value ? IOName::aqueousPhase() : IOName::naplPhase();
else
- return Components::IsAqueous<typename Fluid1::Component>::value ? IOName::aqueous() : IOName::napl();
+ return Components::IsAqueous<typename Fluid1::Component>::value ? IOName::aqueousPhase() : IOName::naplPhase();
}
else
{
if (phaseIdx == phase0Idx)
- return Fluid0::isGas() ? IOName::gaseous() : IOName::liquid();
+ return Fluid0::isGas() ? IOName::gaseousPhase() : IOName::liquidPhase();
else
- return Fluid1::isGas() ? IOName::gaseous() : IOName::liquid();
+ return Fluid1::isGas() ? IOName::gaseousPhase() : IOName::liquidPhase();
}
}
diff --git a/dumux/material/fluidsystems/3pimmiscible.hh b/dumux/material/fluidsystems/3pimmiscible.hh
index 88d9eb94c6..885f34022d 100644
--- a/dumux/material/fluidsystems/3pimmiscible.hh
+++ b/dumux/material/fluidsystems/3pimmiscible.hh
@@ -94,10 +94,10 @@ public:
switch (phaseIdx)
{
case wPhaseIdx: return Components::IsAqueous<typename WettingFluid::Component>::value
- ? IOName::aqueous() : IOName::napl();
+ ? IOName::aqueousPhase() : IOName::naplPhase();
case nPhaseIdx: return Components::IsAqueous<typename NonwettingFluid::Component>::value
- ? IOName::aqueous() : IOName::napl();
- case gPhaseIdx: return IOName::gaseous();
+ ? IOName::aqueousPhase() : IOName::naplPhase();
+ case gPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/brine.hh b/dumux/material/fluidsystems/brine.hh
index c1d04a7d5f..67685a187e 100644
--- a/dumux/material/fluidsystems/brine.hh
+++ b/dumux/material/fluidsystems/brine.hh
@@ -71,7 +71,7 @@ public:
static const std::string phaseName(int phaseIdx = liquidPhaseIdx)
{
assert(phaseIdx == liquidPhaseIdx);
- return IOName::liquid();
+ return IOName::liquidPhase();
}
/*!
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index 24cda87536..65f96a9dbc 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -150,8 +150,8 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
switch (phaseIdx)
{
- case liquidPhaseIdx: return IOName::liquid();
- case gasPhaseIdx: return IOName::gaseous();
+ case liquidPhaseIdx: return IOName::liquidPhase();
+ case gasPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 489c384c46..17b5e215e3 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -197,8 +197,8 @@ public:
{
switch (phaseIdx)
{
- case liquidPhaseIdx: return IOName::liquid();
- case gasPhaseIdx: return IOName::gaseous();
+ case liquidPhaseIdx: return IOName::liquidPhase();
+ case gasPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 9cc3091bb9..438eb7f2d5 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -106,8 +106,8 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
switch (phaseIdx)
{
- case liquidPhaseIdx: return IOName::liquid();
- case gasPhaseIdx: return IOName::gaseous();
+ case liquidPhaseIdx: return IOName::liquidPhase();
+ case gasPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh
index 9c8a74049a..d5dafd18bf 100644
--- a/dumux/material/fluidsystems/h2oairmesitylene.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylene.hh
@@ -199,9 +199,9 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
switch (phaseIdx)
{
- case wPhaseIdx: return IOName::aqueous();
- case nPhaseIdx: return IOName::napl();
- case gPhaseIdx: return IOName::gaseous();
+ case wPhaseIdx: return IOName::aqueousPhase();
+ case nPhaseIdx: return IOName::naplPhase();
+ case gPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index f9832c0b18..9fd072be01 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -200,9 +200,9 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
switch (phaseIdx)
{
- case wPhaseIdx: return IOName::aqueous();
- case nPhaseIdx: return IOName::napl();
- case gPhaseIdx: return IOName::gaseous();
+ case wPhaseIdx: return IOName::aqueousPhase();
+ case nPhaseIdx: return IOName::naplPhase();
+ case gPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/h2oheavyoil.hh b/dumux/material/fluidsystems/h2oheavyoil.hh
index 55f7c00c47..b4e1b3437e 100644
--- a/dumux/material/fluidsystems/h2oheavyoil.hh
+++ b/dumux/material/fluidsystems/h2oheavyoil.hh
@@ -189,9 +189,9 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
switch (phaseIdx)
{
- case wPhaseIdx: return IOName::aqueous();
- case nPhaseIdx: return IOName::napl();
- case gPhaseIdx: return IOName::gaseous();
+ case wPhaseIdx: return IOName::aqueousPhase();
+ case nPhaseIdx: return IOName::naplPhase();
+ case gPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index f1cf83305c..47d8f04e78 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -107,8 +107,8 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
switch (phaseIdx)
{
- case liquidPhaseIdx: return IOName::liquid();
- case gasPhaseIdx: return IOName::gaseous();
+ case liquidPhaseIdx: return IOName::liquidPhase();
+ case gasPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index c30a26d4d7..9673b9b904 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -126,8 +126,8 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
switch (phaseIdx)
{
- case liquidPhaseIdx: return IOName::liquid();
- case gasPhaseIdx: return IOName::gaseous();
+ case liquidPhaseIdx: return IOName::liquidPhase();
+ case gasPhaseIdx: return IOName::gaseousPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/liquidphase2c.hh b/dumux/material/fluidsystems/liquidphase2c.hh
index c0e0d9a751..a911e6c426 100644
--- a/dumux/material/fluidsystems/liquidphase2c.hh
+++ b/dumux/material/fluidsystems/liquidphase2c.hh
@@ -76,7 +76,7 @@ public:
* \param phaseIdx The index of the fluid phase to consider
*/
static std::string phaseName(int phaseIdx = 0)
- { return IOName::liquid(); }
+ { return IOName::liquidPhase(); }
/*!
* \brief Returns whether the fluids are miscible
diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh
index eaafbb8769..d68745b9bd 100644
--- a/dumux/material/fluidsystems/spe5.hh
+++ b/dumux/material/fluidsystems/spe5.hh
@@ -90,9 +90,9 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
switch (phaseIdx)
{
- case gPhaseIdx: return IOName::gaseous();
- case wPhaseIdx: return IOName::aqueous();
- case oPhaseIdx: return IOName::napl();
+ case gPhaseIdx: return IOName::gaseousPhase();
+ case wPhaseIdx: return IOName::aqueousPhase();
+ case oPhaseIdx: return IOName::naplPhase();
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/porousmediumflow/richardsnc/iofields.hh b/dumux/porousmediumflow/richardsnc/iofields.hh
index 99c20395d6..865623ad38 100644
--- a/dumux/porousmediumflow/richardsnc/iofields.hh
+++ b/dumux/porousmediumflow/richardsnc/iofields.hh
@@ -43,21 +43,21 @@ public:
using FS = typename VolumeVariables::FluidSystem;
out.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::liquidPhaseIdx); },
- IOName::saturation() + "_" + IOName::liquid());
+ IOName::saturation() + "_" + IOName::liquidPhase());
out.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::gasPhaseIdx); },
- IOName::saturation() + "_" + IOName::gaseous());
+ IOName::saturation() + "_" + IOName::gaseousPhase());
out.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::liquidPhaseIdx); },
- IOName::pressure() + "_" + IOName::liquid());
+ IOName::pressure() + "_" + IOName::liquidPhase());
out.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::gasPhaseIdx); },
- IOName::pressure() + "_" + IOName::gaseous());
+ IOName::pressure() + "_" + IOName::gaseousPhase());
out.addVolumeVariable([](const auto& v){ return v.capillaryPressure(); },
IOName::capillaryPressure());
out.addVolumeVariable([](const auto& v){ return v.density(FS::liquidPhaseIdx); },
- IOName::density() + "_" + IOName::liquid());
+ IOName::density() + "_" + IOName::liquidPhase());
out.addVolumeVariable([](const auto& v){ return v.mobility(FS::liquidPhaseIdx); },
- IOName::mobility() + "_" + IOName::liquid());
+ IOName::mobility() + "_" + IOName::liquidPhase());
out.addVolumeVariable([](const auto& v){ return v.relativePermeability(VolumeVariables::liquidPhaseIdx); },
- IOName::relativePermeability() + "_" + IOName::liquid());
+ IOName::relativePermeability() + "_" + IOName::liquidPhase());
out.addVolumeVariable([](const auto& v){ return v.porosity(); },
IOName::porosity());
out.addVolumeVariable([](const auto& v){ return v.temperature(); },
--
GitLab