diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 8856e21bbb7221d601453673ce2ec2fb3f2554a3..b4d8baf240509314eae3b6e59f12b24dd5dc7526 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -76,7 +76,6 @@ class BrineCO2
public:
typedef Dumux::NullParameterCache ParameterCache;
typedef H2Otype H2O;
-// typedef Dumux::Brine<Scalar, H2O> BrineRawComponent; //salinity is stored into the raw brine component, wether tabulated or not.
typedef Brinetype Brine;
typedef typename Dumux::CO2<Scalar, CO2Table> CO2;
@@ -85,8 +84,6 @@ public:
static const int lPhaseIdx = 0; // index of the liquid phase
static const int gPhaseIdx = 1; // index of the gas phase
- static const int wPhaseIdx = lPhaseIdx;
- static const int nPhaseIdx = gPhaseIdx;
static const int wCompIdx = 0;
static const int nCompIdx = 1;
static const int lCompIdx = wCompIdx;
@@ -446,6 +443,8 @@ public:
* where \f$\mathrm{p_\alpha}\f$ and \f$\mathrm{T_\alpha}\f$ are the fluid phase'
* pressure and temperature.
*
+ * Maybe see http://www.ddbst.de/en/EED/PCP/DIF_C1050.php
+ *
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component to consider
@@ -563,8 +562,9 @@ public:
/*!
* \copydoc BaseFluidSystem::heatCapacity
*
- * We employ the heat capacity of the pure phases.
- * Todo: Include compositional effects.
+ * \note We employ the heat capacity of the pure phases.
+ *
+ * \todo implement heat capacity for gaseous co2
*
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
@@ -574,12 +574,12 @@ public:
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
{
- if(phaseIdx == wPhaseIdx)
+ if(phaseIdx == lPhaseIdx)
return H2O::liquidHeatCapacity(fluidState.temperature(phaseIdx),
fluidState.pressure(phaseIdx));
else
return CO2::liquidHeatCapacity(fluidState.temperature(phaseIdx),
- fluidState.pressure(phaseIdx));
+ fluidState.pressure(phaseIdx));
}
private:
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index e369b8ae97d96a6a6ab2eeec9335e8f7f73b945d..65bf32f10498532f28714e7085514c8cee179515 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -541,7 +541,6 @@ public:
int phaseIdx,
int compIdx)
{
- // TODO!
DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
}
@@ -682,9 +681,7 @@ public:
Scalar pressure = fluidState.pressure(phaseIdx);
Scalar partialPressure = pressure * xH2O;
- Scalar lambdaH2O =
- xH2O
- * H2O::gasThermalConductivity(temperature, partialPressure);
+ Scalar lambdaH2O = xH2O * H2O::gasThermalConductivity(temperature, partialPressure);
return lambdaN2 + lambdaH2O;
}
else
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index 60586ce38953b2e361d9c9b1cd5da4883f2f2c18..9300495836fd6b30bb16f47751497d08293a449c 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -788,9 +788,7 @@ public:
// Assuming Raoult's, Daltons law and ideal gas
// in order to obtain the partial density of water in the air phase
Scalar partialPressure = pressure * xH2O;
- Scalar lambdaH2O =
- xH2O
- * H2O::gasThermalConductivity(temperature, partialPressure);
+ Scalar lambdaH2O = xH2O * H2O::gasThermalConductivity(temperature, partialPressure);
return lambdaN2 + lambdaH2O + lambdaO2;
}
else
diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/dumux/material/fluidsystems/purewatersimple.hh
index 4d128335a082e3ee0145996d3d3c16c8a70d7ada..aadc18d17838c11fbca19d66e5c8413cb3a83952 100644
--- a/dumux/material/fluidsystems/purewatersimple.hh
+++ b/dumux/material/fluidsystems/purewatersimple.hh
@@ -264,9 +264,7 @@ public:
*/
static Scalar criticalMolarVolume(int compIdx)
{
- DUNE_THROW(Dune::NotImplemented,
- "H2ON2FluidSystem::criticalMolarVolume()");
- return 0;
+ DUNE_THROW(Dune::NotImplemented, "criticalMolarVolume()");
}
/*!
@@ -336,16 +334,15 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
// liquid phase
- if (phaseIdx == wPhaseIdx) {
- return 1044.0 ;
+ if (phaseIdx == wPhaseIdx)
+ {
+ return 1044.0;
}
else if (phaseIdx == nPhaseIdx)// gas phase
{
- return
- 1.679 ;
+ return 1.679;
}
- else DUNE_THROW(Dune::NotImplemented,
- "wrong index");
+ else DUNE_THROW(Dune::NotImplemented, "Wrong phase index");
}
/*!
@@ -362,15 +359,15 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
// liquid phase
- if (phaseIdx == wPhaseIdx) {
- return 2.694e-7 * density(fluidState, phaseIdx) ;
+ if (phaseIdx == wPhaseIdx)
+ {
+ return 2.694e-7 * density(fluidState, phaseIdx);
}
else if (phaseIdx == nPhaseIdx) // gas phase
{
- return 7.16e-6 * density(fluidState, phaseIdx) ;
+ return 7.16e-6 * density(fluidState, phaseIdx);
}
- else DUNE_THROW(Dune::NotImplemented,
- "wrong index");
+ else DUNE_THROW(Dune::NotImplemented, "Wrong phase index");
}
/*!
@@ -384,9 +381,9 @@ public:
const unsigned int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
- Scalar pressure = fluidState.pressure(nPhaseIdx) ;
+ Scalar pressure = fluidState.pressure(nPhaseIdx);
- return IAPWS::Region4<Scalar>::vaporTemperature( pressure ) ;
+ return IAPWS::Region4<Scalar>::vaporTemperature( pressure );
}
/*!
@@ -429,7 +426,8 @@ public:
Scalar p = fluidState.pressure(phaseIdx);
// liquid phase
- if (phaseIdx == wPhaseIdx) {
+ if (phaseIdx == wPhaseIdx)
+ {
if (compIdx == H2OIdx)
return H2O::vaporPressure(T)/p;
return Dumux::BinaryCoeff::H2O_N2::henry(T)/p;
@@ -493,18 +491,18 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
Scalar temperature = fluidState.temperature(phaseIdx);
- const Scalar cp = heatCapacity(fluidState, phaseIdx) ;
+ const Scalar cp = heatCapacity(fluidState, phaseIdx);
// liquid phase
- if (phaseIdx == wPhaseIdx) {
- return cp * (temperature - 373.15);
+ if (phaseIdx == wPhaseIdx)
+ {
+ return cp * (temperature - 373.15);
}
else if (phaseIdx == nPhaseIdx) // gas phase
{
return cp * (temperature - 373.15) + 2.257e6;
}
- else DUNE_THROW(Dune::NotImplemented,
- "wrong index");
+ else DUNE_THROW(Dune::NotImplemented, "Wrong phase index");
}
/*!
@@ -522,15 +520,15 @@ public:
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
// liquid phase
- if (phaseIdx == wPhaseIdx) {
- return 0.68 ;
+ if (phaseIdx == wPhaseIdx)
+ {
+ return 0.68;
}
else if (phaseIdx == nPhaseIdx) // gas phase
{
return 0.0248;
}
- else DUNE_THROW(Dune::NotImplemented,
- "wrong index");
+ else DUNE_THROW(Dune::NotImplemented, "Wrong phase index");
}
/*!
@@ -547,15 +545,15 @@ public:
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
// liquid phase
- if (phaseIdx == wPhaseIdx) {
- return 4.217e3 ;
+ if (phaseIdx == wPhaseIdx)
+ {
+ return 4.217e3;
}
else if (phaseIdx == nPhaseIdx) // gas phase
{
return 2.029e3;
}
- else DUNE_THROW(Dune::NotImplemented,
- "wrong index");
+ else DUNE_THROW(Dune::NotImplemented, "Wrong phase index");
}
};