diff --git a/dumux/material/components/heavyoil.hh b/dumux/material/components/heavyoil.hh
index 8dd4653f26ac00e2f8848adfcd9a045df8318bbd..141d9b61f7b645f342d3934419c012f95ad8f1d3 100644
--- a/dumux/material/components/heavyoil.hh
+++ b/dumux/material/components/heavyoil.hh
@@ -340,9 +340,7 @@ public:
*/
static Scalar gasDensity(Scalar temperature, Scalar pressure)
{
- return IdealGas::density(molarMass(),
- temperature,
- pressure);
+ return IdealGas::density(molarMass(), temperature, pressure);
}
/*!
diff --git a/dumux/material/constraintsolvers/computefromreferencephase.hh b/dumux/material/constraintsolvers/computefromreferencephase.hh
index 7def87e82d8f9370f3385bd76a610551509473ff..55dd2b226b93f556ac977505a03eeb6e22f97f3e 100644
--- a/dumux/material/constraintsolvers/computefromreferencephase.hh
+++ b/dumux/material/constraintsolvers/computefromreferencephase.hh
@@ -136,9 +136,9 @@ public:
paramCache,
refPhaseIdx));
fluidState.setMolarDensity(refPhaseIdx,
- FluidSystem::molarDensity(fluidState,
- paramCache,
- refPhaseIdx));
+ FluidSystem::molarDensity(fluidState,
+ paramCache,
+ refPhaseIdx));
if (setEnthalpy)
fluidState.setEnthalpy(refPhaseIdx,
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index b2816cdebc91aa1312849c93f277354da9688fa4..32340796fc3850f22adb5a711e334e5e97f9b6d2 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -290,7 +290,7 @@ public:
}
using Base::density;
- /*!
+ /*!
* \brief Given a phase's composition, temperature, pressure, and
* the partial pressures of all components, return its
* density \f$\mathrm{[kg/m^3]}\f$.
@@ -321,23 +321,23 @@ public:
else
{
return Brine::liquidMolarDensity(temperature,
- pressure,
- fluidState.massFraction(phase0Idx, NaClIdx))
- *(Brine::molarMass()*fluidState.moleFraction(liquidPhaseIdx, H2OIdx)
- + Brine::molarMass()*fluidState.moleFraction(liquidPhaseIdx, NaClIdx)
- + Air::molarMass()*fluidState.moleFraction(liquidPhaseIdx, AirIdx));
+ pressure,
+ fluidState.massFraction(phase0Idx, NaClIdx))
+ * (Brine::molarMass()*fluidState.moleFraction(liquidPhaseIdx, H2OIdx)
+ + Brine::molarMass()*fluidState.moleFraction(liquidPhaseIdx, NaClIdx)
+ + Air::molarMass()*fluidState.moleFraction(liquidPhaseIdx, AirIdx));
}
}
else if (phaseIdx == phase1Idx){
if (!useComplexRelations)
- // for the gas phase assume an ideal gas
- {
+ // for the gas phase assume an ideal gas
+ {
const Scalar averageMolarMass = fluidState.averageMolarMass(phase1Idx);
return IdealGas::density(averageMolarMass, temperature, pressure);
- }
- return
- Brine::gasDensity(temperature, fluidState.partialPressure(phase1Idx, H2OIdx)) +
- Air::gasDensity(temperature, fluidState.partialPressure(phase1Idx, AirIdx));
+ }
+
+ return Brine::gasDensity(temperature, fluidState.partialPressure(phase1Idx, H2OIdx))
+ + Air::gasDensity(temperature, fluidState.partialPressure(phase1Idx, AirIdx));
}
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
@@ -368,11 +368,11 @@ public:
else if (phaseIdx == phase1Idx)
{
if (!useComplexRelations)
- // for the gas phase assume an ideal gas
- { return IdealGas::molarDensity(temperature, pressure); }
- return
- Brine::gasMolarDensity(temperature, fluidState.partialPressure(phase1Idx, H2OIdx)) +
- Air::gasMolarDensity(temperature, fluidState.partialPressure(phase1Idx, AirIdx));
+ // for the gas phase assume an ideal gas
+ { return IdealGas::molarDensity(temperature, pressure); }
+
+ return Brine::gasMolarDensity(temperature, fluidState.partialPressure(phase1Idx, H2OIdx))
+ + Air::gasMolarDensity(temperature, fluidState.partialPressure(phase1Idx, AirIdx));
}
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
@@ -461,8 +461,9 @@ public:
else if (compIdx == AirIdx)
return BinaryCoeff::H2O_Air::henry(T)/p;
- else
- return 1/p;
+
+ else
+ return 1/p;
}
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
@@ -570,8 +571,8 @@ public:
{
Scalar XlNaCl = fluidState.massFraction(phaseIdx, NaClIdx);
Scalar result = Brine::liquidEnthalpy(T, p, XlNaCl);
- Valgrind::CheckDefined(result);
- return result;
+ Valgrind::CheckDefined(result);
+ return result;
}
else
{
diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh
index 4f3583d228e15a1862311045a989572f14e20289..e44dcad3c89f98456060251795fbcf10ebf6850c 100644
--- a/dumux/material/fluidsystems/h2oairmesitylene.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylene.hh
@@ -263,11 +263,10 @@ public:
// See: Eq. (7) in Class et al. (2002a)
// this assumes each dissolved molecule displaces exactly one
// water molecule in the liquid
- return
- H2O::liquidMolarDensity(fluidState.temperature(phaseIdx), fluidState.pressure(phaseIdx))
- * (H2O::molarMass()*fluidState.moleFraction(wPhaseIdx, H2OIdx)
- + Air::molarMass()*fluidState.moleFraction(wPhaseIdx, AirIdx)
- + NAPL::molarMass()*fluidState.moleFraction(wPhaseIdx, NAPLIdx));
+ return H2O::liquidMolarDensity(fluidState.temperature(phaseIdx), fluidState.pressure(phaseIdx))
+ * (H2O::molarMass()*fluidState.moleFraction(wPhaseIdx, H2OIdx)
+ + Air::molarMass()*fluidState.moleFraction(wPhaseIdx, AirIdx)
+ + NAPL::molarMass()*fluidState.moleFraction(wPhaseIdx, NAPLIdx));
}
else if (phaseIdx == nPhaseIdx) {
// assume pure NAPL for the NAPL phase
@@ -285,10 +284,9 @@ public:
Scalar pNAPL =
fluidState.moleFraction(gPhaseIdx, NAPLIdx) *
fluidState.pressure(gPhaseIdx);
- return
- H2O::gasDensity(fluidState.temperature(phaseIdx), pH2O) +
- Air::gasDensity(fluidState.temperature(phaseIdx), pAir) +
- NAPL::gasDensity(fluidState.temperature(phaseIdx), pNAPL);
+ return H2O::gasDensity(fluidState.temperature(phaseIdx), pH2O)
+ + Air::gasDensity(fluidState.temperature(phaseIdx), pAir)
+ + NAPL::gasDensity(fluidState.temperature(phaseIdx), pNAPL);
}
using Base::molarDensity;
@@ -319,8 +317,8 @@ public:
else
{
return H2O::gasMolarDensity(temperature, fluidState.partialPressure(gPhaseIdx, H2OIdx))
- + NAPL::gasMolarDensity(temperature, fluidState.partialPressure(gPhaseIdx, NAPLIdx))
- + Air::gasMolarDensity(temperature, fluidState.partialPressure(gPhaseIdx, AirIdx));
+ + NAPL::gasMolarDensity(temperature, fluidState.partialPressure(gPhaseIdx, NAPLIdx))
+ + Air::gasMolarDensity(temperature, fluidState.partialPressure(gPhaseIdx, AirIdx));
}
}
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index 73cf7d41c707f9acd243d3afb78fcb96fc6dfe97..1805ef2dcd9741bea738f9f722603a068c6d7564 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -264,11 +264,10 @@ public:
if (phaseIdx == wPhaseIdx) {
// This assumes each gas molecule displaces exactly one
// molecule in the liquid.
- return
- H2O::liquidMolarDensity(fluidState.temperature(phaseIdx), fluidState.pressure(phaseIdx))*
- (H2O::molarMass()*fluidState.moleFraction(wPhaseIdx, H2OIdx)
- + Air::molarMass()*fluidState.moleFraction(wPhaseIdx, AirIdx)
- + NAPL::molarMass()*fluidState.moleFraction(wPhaseIdx, NAPLIdx));
+ return H2O::liquidMolarDensity(fluidState.temperature(phaseIdx), fluidState.pressure(phaseIdx))
+ * (H2O::molarMass()*fluidState.moleFraction(wPhaseIdx, H2OIdx)
+ + Air::molarMass()*fluidState.moleFraction(wPhaseIdx, AirIdx)
+ + NAPL::molarMass()*fluidState.moleFraction(wPhaseIdx, NAPLIdx));
}
else if (phaseIdx == nPhaseIdx) {
// assume pure NAPL for the NAPL phase
@@ -286,10 +285,9 @@ public:
Scalar pNAPL =
fluidState.moleFraction(gPhaseIdx, NAPLIdx) *
fluidState.pressure(gPhaseIdx);
- return
- H2O::gasDensity(fluidState.temperature(phaseIdx), pH2O) +
- Air::gasDensity(fluidState.temperature(phaseIdx), pAir) +
- NAPL::gasDensity(fluidState.temperature(phaseIdx), pNAPL);
+ return H2O::gasDensity(fluidState.temperature(phaseIdx), pH2O)
+ + Air::gasDensity(fluidState.temperature(phaseIdx), pAir)
+ + NAPL::gasDensity(fluidState.temperature(phaseIdx), pNAPL);
}
using Base::molarDensity;
diff --git a/dumux/material/fluidsystems/h2oheavyoil.hh b/dumux/material/fluidsystems/h2oheavyoil.hh
index efe6d74631412eff293b91312cfe931de6a7e55a..14f959b814558b7cc05b34b14fde3c8f5331c98c 100644
--- a/dumux/material/fluidsystems/h2oheavyoil.hh
+++ b/dumux/material/fluidsystems/h2oheavyoil.hh
@@ -245,10 +245,9 @@ public:
// This assumes each gas molecule displaces exactly one
// molecule in the liquid.
- return
- H2O::liquidMolarDensity(fluidState.temperature(phaseIdx), fluidState.pressure(phaseIdx))
- * (H2O::molarMass()*fluidState.moleFraction(wPhaseIdx, H2OIdx)
- + HeavyOil::molarMass()*fluidState.moleFraction(wPhaseIdx, NAPLIdx));
+ return H2O::liquidMolarDensity(fluidState.temperature(phaseIdx), fluidState.pressure(phaseIdx))
+ * (H2O::molarMass()*fluidState.moleFraction(wPhaseIdx, H2OIdx)
+ + HeavyOil::molarMass()*fluidState.moleFraction(wPhaseIdx, NAPLIdx));
}
else if (phaseIdx == nPhaseIdx) {
// assume pure NAPL for the NAPL phase
@@ -263,9 +262,8 @@ public:
Scalar pNAPL =
fluidState.moleFraction(gPhaseIdx, NAPLIdx) *
fluidState.pressure(gPhaseIdx);
- return
- H2O::gasDensity(fluidState.temperature(phaseIdx), pH2O) +
- HeavyOil::gasDensity(fluidState.temperature(phaseIdx), pNAPL);
+ return H2O::gasDensity(fluidState.temperature(phaseIdx), pH2O)
+ + HeavyOil::gasDensity(fluidState.temperature(phaseIdx), pNAPL);
}
using Base::molarDensity;
@@ -295,7 +293,7 @@ public:
else
{
return H2O::gasMolarDensity(temperature, fluidState.partialPressure(gPhaseIdx, H2OIdx))
- + HeavyOil::gasMolarDensity(temperature, fluidState.partialPressure(gPhaseIdx, NAPLIdx));
+ + HeavyOil::gasMolarDensity(temperature, fluidState.partialPressure(gPhaseIdx, NAPLIdx));
}
}
@@ -337,7 +335,7 @@ public:
};
return mu[H2OIdx]*fluidState.moleFraction(gPhaseIdx, H2OIdx)
- + mu[NAPLIdx]*fluidState.moleFraction(gPhaseIdx, NAPLIdx);
+ + mu[NAPLIdx]*fluidState.moleFraction(gPhaseIdx, NAPLIdx);
}
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index 47d54298f30ba4988806eee3828cb1d4bf87b795..c2767b3bd440bb7f595dd216fcf2677993c3bac9 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -504,10 +504,9 @@ public:
return IdealGas::molarDensity(T,p);
}
- return
- H2O::gasMolarDensity(T, fluidState.partialPressure(gasPhaseIdx, H2OIdx)) +
- N2::gasMolarDensity(T, fluidState.partialPressure(gasPhaseIdx, N2Idx)) +
- O2::gasMolarDensity(T, fluidState.partialPressure(gasPhaseIdx, O2Idx));
+ return H2O::gasMolarDensity(T, fluidState.partialPressure(gasPhaseIdx, H2OIdx))
+ + N2::gasMolarDensity(T, fluidState.partialPressure(gasPhaseIdx, N2Idx))
+ + O2::gasMolarDensity(T, fluidState.partialPressure(gasPhaseIdx, O2Idx));
}
}
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index f716e4de722b0c229e86a4dadd9851c82917c93d..8019a93ec4854472d99397f512f84dfedb3989ae 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -330,18 +330,18 @@ public:
fluidState.setMoleFraction(wPhaseIdx, wCompIdx, 1.0);
// compute density of injection phase
const Scalar density = FluidSystem::density(fluidState,
- dummyCache,
- wPhaseIdx);
+ dummyCache,
+ wPhaseIdx);
fluidState.setDensity(wPhaseIdx, density);
const Scalar molarDensity = FluidSystem::molarDensity(fluidState,
- dummyCache,
- wPhaseIdx);
+ dummyCache,
+ wPhaseIdx);
fluidState.setMolarDensity(wPhaseIdx, molarDensity);
for(int phaseIdx=0; phaseIdx<numPhases; phaseIdx++) {
const Scalar h = FluidSystem::enthalpy(fluidState,
- dummyCache,
- phaseIdx);
+ dummyCache,
+ phaseIdx);
fluidState.setEnthalpy(phaseIdx, h);
}