Commit 78f7ca90 authored by Gabi Seitz's avatar Gabi Seitz Committed by Dennis Gläser
Browse files

[steamn2cao2h2] cleanup

parent cd3643f5
......@@ -34,7 +34,6 @@
#include <dumux/material/fluidsystems/base.hh>
#include <dumux/material/components/n2.hh>
#include <dumux/material/components/h2o.hh>
// #include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/CaO2H2.hh>
#include <dumux/material/components/CaOtest.hh>
#include <dumux/material/binarycoefficients/h2o_n2.hh>
......@@ -68,7 +67,6 @@ class SteamN2CaO2H2
typedef Dumux::IdealGas<Scalar> IdealGas;
public:
// typedef Dumux::SimpleH2O<Scalar> H2O;
typedef H2Otype H2O;
typedef Dumux::BinaryCoeff::H2O_N2 H2O_N2;
typedef Dumux::N2<Scalar> N2;
......@@ -88,7 +86,6 @@ public:
static const int numSPhases = 2;// solid phases CaO and CaO2H2
static constexpr int gPhaseIdx = 0;
// static constexpr int gPhaseIdx = phaseIdx;
static const int nPhaseIdx = gPhaseIdx; // index of the gas phase
static constexpr int cPhaseIdx = 1; // CaO-phaseIdx
......@@ -177,7 +174,7 @@ public:
* Component related static parameters
****************************************/
static const int numComponents = 2;//3; // H2O, Air
static const int numComponents = 2; // H2O, Air
static const int numMajorComponents = 2;// H2O, Air
static const int numSComponents = 2;// CaO2H2, CaO
......@@ -244,7 +241,6 @@ public:
*
* \param phaseIdx The index of the solid phase to consider
*/
static Scalar precipitateHeatCapacity(int phaseIdx)
{
if(phaseIdx==cPhaseIdx)
......@@ -302,7 +298,6 @@ public:
* \param pressMax The maximum pressure used for tabulation of water \f$\mathrm{[Pa]}\f$
* \param nPress The number of ticks on the pressure axis of the table of water
*/
static void init(Scalar tempMin, Scalar tempMax, unsigned nTemp,
Scalar pressMin, Scalar pressMax, unsigned nPress)
{
......@@ -560,7 +555,6 @@ public:
// W.G. Mallard evaluated at p=.1 MPa, does not
// change dramatically with p
// and can be interpolated linearly with temperature
// Scalar lambdaPureN2 = 6.525e-5 * temperature + 0.024031;
Scalar lambdaPureN2 = N2::gasThermalConductivity(temperature, pressure);
if (useComplexRelations){
......@@ -609,8 +603,7 @@ public:
fluidState.pressure(phaseIdx)
* fluidState.moleFraction(phaseIdx, H2OIdx));
return
c_pH2O*fluidState.moleFraction(nPhaseIdx, H2OIdx) + c_pN2*fluidState.moleFraction(nPhaseIdx, N2Idx);
return c_pH2O*fluidState.moleFraction(nPhaseIdx, H2OIdx) + c_pN2*fluidState.moleFraction(nPhaseIdx, N2Idx);
}
};
......
Markdown is supported
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