Commit 7fa38e9f authored by Andreas Lauser's avatar Andreas Lauser
Browse files

isIncompressible() -> isCompressible()

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7090 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent c1e55147
......@@ -111,6 +111,21 @@ public:
return true;
}
/*!
* \brief Returns true if and only if a fluid phase is assumed to
* be compressible.
*
* Compressible means that the partial derivative of the density
* to the fluid pressure is always larger than zero.
*
* \param phaseIdx The index of the fluid phase to consider
*/
static bool isCompressible(int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
return false;
};
/****************************************
* Component related static parameters
****************************************/
......
......@@ -250,16 +250,16 @@ public:
}
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return H2O::gasIsIncompressible(); }
static bool gasIsCompressible()
{ return H2O::gasIsCompressible(); }
/*!
* \brief Returns true iff the liquid phase is assumed to be incompressible
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsIncompressible()
{ return H2O::liquidIsIncompressible(); }
static bool liquidIsCompressible()
{ return H2O::liquidIsCompressible(); }
/*!
* \brief The pressure of steam in \f$\mathrm{[Pa]}\f$ at a given density and temperature.
......
......@@ -96,10 +96,10 @@ public:
{ DUNE_THROW(Dune::NotImplemented, "vaporPressure for CH4"); }
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return false; }
static bool gasIsCompressible()
{ return true; }
/*!
* \brief The density \f$\mathrm{[kg/m^3]}\f$ of \f$CH_4\f$ gas at a given pressure and temperature.
......
......@@ -62,16 +62,16 @@ public:
{ Dune::dwarn << "No init routine defined - make sure that this is not necessary!" << std::endl; }
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ DUNE_THROW(Dune::NotImplemented, "Component::gasIsIncompressible()"); }
static bool gasIsCompressible()
{ DUNE_THROW(Dune::NotImplemented, "Component::gasIsCompressible()"); }
/*!
* \brief Returns true iff the liquid phase is assumed to be incompressible
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsIncompressible()
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidIsIncompressible()"); }
static bool liquidIsCompressible()
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidIsCompressible()"); }
/*!
* \brief A human readable name for the component.
......
......@@ -122,10 +122,10 @@ public:
}
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return false; }
static bool gasIsCompressible()
{ return true; }
/*!
* \brief The pressure of gaseous \f$H_2\f$ in \f$\mathrm{[Pa]}\f$ at a given density and temperature.
......
......@@ -496,16 +496,16 @@ public:
}
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return false; }
static bool gasIsCompressible()
{ return true; }
/*!
* \brief Returns true iff the liquid phase is assumed to be incompressible
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsIncompressible()
{ return false; }
static bool liquidIsCompressible()
{ return true; }
/*!
* \brief The density of steam in \f$\mathrm{[kg/m^3]}\f$ at a given pressure and temperature.
......
......@@ -125,10 +125,10 @@ public:
}
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return false; }
static bool gasIsCompressible()
{ return true; }
/*!
* \brief The density \f$\mathrm{[kg/m^3]}\f$ of \f$N_2\f$ gas at a given pressure and temperature.
......
......@@ -124,10 +124,10 @@ public:
}
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return false; }
static bool gasIsCompressible()
{ return true; }
/*!
* \brief The density in \f$\mathrm{[kg/m^3]}\f$ of pure \f$O_2\f$ at a given pressure and temperature.
......
......@@ -50,10 +50,10 @@ public:
{ return "Oil"; }
/*!
* \brief Returns true iff the liquid phase is assumed to be incompressible
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsIncompressible()
{ return true; }
static bool liquidIsCompressible()
{ return false; }
/*!
* \brief Rough estimate of the density of oil \f$\mathrm{[kg/m^3]}\f$.
......
......@@ -128,10 +128,10 @@ public:
}
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return false; }
static bool gasIsCompressible()
{ return true; }
/*!
* \brief The density of \f$CO_2\f$ at a given pressure and temperature [kg/m^3].
......
......@@ -102,16 +102,16 @@ public:
};
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return false; }
static bool gasIsCompressible()
{ return true; }
/*!
* \brief Returns true iff the liquid phase is assumed to be incompressible
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsIncompressible()
{ return true; }
static bool liquidIsCompressible()
{ return false; }
/*!
* \brief The density of steam at a given pressure and temperature \f$\mathrm{[kg/m^3]}\f$.
......
......@@ -183,16 +183,16 @@ public:
pressure/liquidDensity(temperature, pressure); }
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return false; }
static bool gasIsCompressible()
{ return true; }
/*!
* \brief Returns true iff the liquid phase is assumed to be incompressible
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsIncompressible()
{ return true; }
static bool liquidIsCompressible()
{ return false; }
/*!
* \brief The density \f$\mathrm{[kg/m^3]}\f$ of steam at a given pressure and temperature.
......
......@@ -350,16 +350,16 @@ public:
};
/*!
* \brief Returns true iff the gas phase is assumed to be incompressible
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsIncompressible()
{ return RawComponent::gasIsIncompressible(); }
static bool gasIsCompressible()
{ return RawComponent::gasIsCompressible(); }
/*!
* \brief Returns true iff the liquid phase is assumed to be incompressible
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsIncompressible()
{ return RawComponent::liquidIsIncompressible(); }
static bool liquidIsCompressible()
{ return RawComponent::liquidIsCompressible(); }
/*!
* \brief The density of gas at a given pressure and temperature
......
......@@ -50,10 +50,10 @@ public:
{ return "Unit"; }
/*!
* \brief Returns true iff the liquid phase is assumed to be incompressible
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsIncompressible()
{ return true; }
static bool liquidIsCompressible()
{ return false; }
/*!
* \brief Rough estimate of the density of water \f$\mathrm{[kg/m^3]}\f$.
......
......@@ -135,7 +135,7 @@ public:
/////////////////////////
bool allIncompressible = true;
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
if (!FluidSystem::isIncompressible(phaseIdx)) {
if (FluidSystem::isCompressible(phaseIdx)) {
allIncompressible = false;
break;
}
......
......@@ -83,19 +83,19 @@ public:
/*!
* \brief Returns true if and only if a fluid phase is assumed to
* be incompressible.
* be compressible.
*
* Incompressible means that the partial derivative of the density
* to the fluid pressure is equivalent to zero.
* Compressible means. that the partial derivative of the density
* to the fluid pressure is always larger than zero.
*
* \param phaseIdx The index of the fluid phase to consider
*/
static bool isIncompressible(int phaseIdx)
static bool isCompressible(int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
// let the fluid decide
return Fluid::isIncompressible();
return Fluid::isCompressible();
}
/*!
......
......@@ -124,21 +124,21 @@ public:
/*!
* \brief Returns true if and only if a fluid phase is assumed to
* be incompressible.
* be compressible.
*
* Incompressible means that the partial derivative of the density
* to the fluid pressure is equivalent to zero.
* Compressible means. that the partial derivative of the density
* to the fluid pressure is always larger than zero.
*
* \param phaseIdx The index of the fluid phase to consider
*/
static bool isIncompressible(int phaseIdx)
static bool isCompressible(int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
// let the fluids decide
if (phaseIdx == wPhaseIdx)
return WettingPhase::isIncompressible();
return NonWettingPhase::isIncompressible();
return WettingPhase::isCompressible();
return NonWettingPhase::isCompressible();
}
/****************************************
......
......@@ -49,10 +49,10 @@ public:
{ return false; };
/*!
* \brief Returns true iff the fluid is assumed to be incompressible
* \brief Returns true iff the fluid is assumed to be compressible
*/
static bool isIncompressible()
{ return Component::gasIsIncompressible(); }
static bool isCompressible()
{ return Component::gasIsCompressible(); }
/*!
* \brief The mass in [kg] of one mole of the component.
......
......@@ -133,21 +133,21 @@ public:
/*!
* \brief Returns true if and only if a fluid phase is assumed to
* be incompressible.
* be compressible.
*
* Incompressible means that the partial derivative of the density
* to the fluid pressure is equivalent to zero.
* Compressible means that the partial derivative of the density
* to the fluid pressure is always larger than zero.
*
* \param phaseIdx The index of the fluid phase to consider
*/
static bool isIncompressible(int phaseIdx)
static bool isCompressible(int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
// ideal gases are never incompressible
// ideal gases are always compressible
if (phaseIdx == gPhaseIdx)
return false;
return true;
// the water component decides for the liquid phase...
return H2O::liquidIsIncompressible();
return H2O::liquidIsCompressible();
}
/****************************************
......
......@@ -50,10 +50,10 @@ public:
{ return true; };
/*!
* \brief Returns true iff the fluid is assumed to be incompressible
* \brief Returns true iff the fluid is assumed to be compressible
*/
static bool isIncompressible()
{ return Component::liquidIsIncompressible(); }
static bool isCompressible()
{ return Component::liquidIsCompressible(); }
/*!
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment