OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

property&parameter systems: get rid of the warnings when -pedantic is used

Browse Source
This commit is contained in:
Andreas Lauser
2012-01-25 18:02:54 +00:00
committed by Andreas Lauser
parent ca400de662
commit 5cd2cb0a23
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dumux/material/components/h2o.hh
View File

@@ -41,7 +41,7 @@
#include "iapws/region4.hh"
#include <cmath>
#include <assert.h>
namespace Dumux
{

36
dumux/material/fluidsystems/h2on2fluidsystem.hh
View File

@@ -645,8 +645,8 @@ public:
if (phaseIdx == lPhaseIdx){// liquid phase
if(useComplexRelations){
const Scalar & temperature = fluidState.temperature(phaseIdx) ;
const Scalar & pressure = fluidState.pressure(phaseIdx);
Scalar temperature = fluidState.temperature(phaseIdx) ;
Scalar pressure = fluidState.pressure(phaseIdx);
return H2O::liquidThermalConductivity(temperature, pressure);
}
else
@@ -654,29 +654,29 @@ public:
}
else{// gas phase
// Isobaric Properties for Nitrogen in: NIST Standard Reference Database Number 69, Eds. P.J. Linstrom
// and W.G. Mallard
// evaluated at p=.1 MPa, T=8°C, does not change dramatically with p,T
const Scalar & lambdaPureNitrogen = 0.024572;
// Isobaric Properties for Nitrogen in: NIST Standard
// Reference Database Number 69, Eds. P.J. Linstrom and
// W.G. Mallard evaluated at p=.1 MPa, T=8°C, does not
// change dramatically with p,T
Scalar lambdaPureN2 = 0.024572;
if (useComplexRelations){
const Scalar & xNitrogen = fluidState.moleFraction(phaseIdx, N2Idx);
const Scalar & xWater = fluidState.moleFraction(phaseIdx, H2OIdx);
const Scalar & lambdaNitrogen = xNitrogen * lambdaPureNitrogen;
Scalar xN2 = fluidState.moleFraction(phaseIdx, N2Idx);
Scalar xH2O = fluidState.moleFraction(phaseIdx, H2OIdx);
Scalar lambdaN2 = xN2 * lambdaPureN2;
// Assuming Raoult's, Daltons law and ideal gas
// in order to obtain the partial density of water in the air phase
const Scalar & temperature = fluidState.temperature(phaseIdx) ;
const Scalar & pressure = fluidState.pressure(phaseIdx);
const Scalar & averageMolarMass = fluidState.averageMolarMass(gPhaseIdx);
const Scalar & partialPressure = pressure * xWater;
Scalar temperature = fluidState.temperature(phaseIdx) ;
Scalar pressure = fluidState.pressure(phaseIdx);
Scalar partialPressure = pressure * xH2O;
const Scalar & lambdaWater = xWater * H2O::gasThermalConductivity(temperature,
partialPressure);
return lambdaNitrogen + lambdaWater;
Scalar lambdaH2O =
xH2O
* H2O::gasThermalConductivity(temperature, partialPressure);
return lambdaN2 + lambdaH2O;
}
else
return lambdaPureNitrogen; // conductivity of Nitrogen [W / (m K ) ]
return lambdaPureN2; // conductivity of Nitrogen [W / (m K ) ]
}
}