From 1fc178b19c49b8f6f38b267afb840623d5e04e32 Mon Sep 17 00:00:00 2001
From: Klaus Mosthaf <klmos@env.dtu.dk>
Date: Tue, 5 Nov 2013 13:24:44 +0000
Subject: [PATCH] =?UTF-8?q?Removed=20commented=20lines=20which=20were=20co?=
=?UTF-8?q?pied=20from=20the=20h2on2fluidsystem.=20The=20thermal=20conduct?=
=?UTF-8?q?ivity=20of=20air=20is=20set=20constant=20so=20far=20and=20is=20?=
=?UTF-8?q?only=20valid=20for=20a=20temperature=20of=20approximately=2020?=
=?UTF-8?q?=C2=B0C.=20The=20same=20holds=20for=20the=20liquid=20thermal=20?=
=?UTF-8?q?conductivity=20if=20the=20complex=20relations=20are=20not=20use?=
=?UTF-8?q?d.=20This=20should=20be=20generalized=20in=20a=20similar=20way?=
=?UTF-8?q?=20as=20the=20h2on2fluidsystem=20in=20dependency=20on=20the=20f?=
=?UTF-8?q?luid=20composition,=20temperature=20and=20pressure.=20Heat=20ca?=
=?UTF-8?q?pacity=20is=20not=20implemented=20so=20far,=20but=20also=20not?=
=?UTF-8?q?=20used=20in=20the=20standard=20models.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11907 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../fluidsystems/h2oairfluidsystem.hh | 57 -------------------
1 file changed, 57 deletions(-)
diff --git a/dumux/material/fluidsystems/h2oairfluidsystem.hh b/dumux/material/fluidsystems/h2oairfluidsystem.hh
index 7e1014ee0e..907f7d97b5 100644
--- a/dumux/material/fluidsystems/h2oairfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairfluidsystem.hh
@@ -687,24 +687,6 @@ public:
// lambda_air is approximately 0.78*lambda_N2+0.22*lambda_O2
const Scalar lambdaPureAir = 0.0255535;
-//TODO: arithmetic mean correct? partial pressure for lambdaH2O?
-// if (useComplexRelations){
-// Scalar xAir = fluidState.moleFraction(phaseIdx, AirIdx);
-// Scalar xH2O = fluidState.moleFraction(phaseIdx, H2OIdx);
-// Scalar lambdaAir = xAir * lambdaPureAir;
-//
-// // 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 partialPressure = pressure * xH2O;
-//
-// // thermal conductivity of vapor
-// Scalar lambdaH2O = H2O::gasThermalConductivity(temperature, partialPressure);
-//
-// return lambdaAir + lambdaH2O;
-// }
-// else
return lambdaPureAir; // conductivity of pure air [W/(m K)]
}
}
@@ -722,45 +704,6 @@ public:
int phaseIdx)
{
DUNE_THROW(Dune::NotImplemented, "FluidSystems::H2OAir::heatCapacity()");
-// if (phaseIdx == wPhaseIdx) {
-// return H2O::liquidHeatCapacity(fluidState.temperature(phaseIdx),
-// fluidState.pressure(phaseIdx));
-// }
-//
-// // for the gas phase, assume ideal mixture, i.e. molecules of
-// // one component don't "see" the molecules of the other
-// // component
-//
-// Scalar c_pN2;
-// Scalar c_pH2O;
-// // let the water and nitrogen components do things their own way
-// if (useComplexRelations) {
-// c_pN2 = N2::gasHeatCapacity(fluidState.temperature(phaseIdx),
-// fluidState.pressure(phaseIdx)
-// * fluidState.moleFraction(phaseIdx, AirIdx));
-//
-// c_pH2O = H2O::gasHeatCapacity(fluidState.temperature(phaseIdx),
-// fluidState.pressure(phaseIdx)
-// * fluidState.moleFraction(phaseIdx, H2OIdx));
-// }
-// else {
-// // assume an ideal gas for both components. See:
-// //
-// // http://en.wikipedia.org/wiki/Heat_capacity
-// Scalar c_vN2molar = Dumux::Constants<Scalar>::R*2.39;
-// Scalar c_pN2molar = Dumux::Constants<Scalar>::R + c_vN2molar;
-//
-// Scalar c_vH2Omolar = Dumux::Constants<Scalar>::R*3.37; // <- correct??
-// Scalar c_pH2Omolar = Dumux::Constants<Scalar>::R + c_vH2Omolar;
-//
-// c_pN2 = c_pN2molar/molarMass(AirIdx);
-// c_pH2O = c_pH2Omolar/molarMass(H2OIdx);
-// }
-//
-// // mangle both components together
-// return
-// c_pH2O*fluidState.massFraction(nPhaseIdx, H2OIdx)
-// + c_pN2*fluidState.massFraction(nPhaseIdx, AirIdx);
}
};
--
GitLab