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

change names according to the meeting on monday

Browse Source
This commit is contained in:
Andreas Lauser
2010-08-05 12:11:43 +00:00
committed by Andreas Lauser
parent 8121eae709
commit ed13754ff8
18 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dumux/material/binarycoefficients/henryiapws.hh
View File

@@ -55,7 +55,7 @@ inline Scalar henryIAPWS(Scalar E,
-1.75493479,-45.5170352, -6.7469445e5
};
const Scalar d[6] = {
1/3.0, 2/3.0, 5/3.0,
1/3.0, 2/3.0, 5/3.0,
16/3.0, 43/3.0, 110/3.0
};
const Scalar q = -0.023767;

6
dumux/material/components/brine.hh
View File

@@ -115,8 +115,8 @@ public:
/*Numerical coefficents from MICHAELIDES for the enthalpy of brine*/
static const Scalar a[4][3] = {
{ -9633.6, -4080.0, +286.49 },
{ +166.58, +68.577, -4.6856 },
{ -9633.6, -4080.0, +286.49 },
{ +166.58, +68.577, -4.6856 },
{ -0.90963, -0.36524, +0.249667E-1 },
{ +0.17965E-2, +0.71924E-3, -0.4900E-4 }
};
@@ -240,7 +240,7 @@ public:
Scalar f = liquidDensity(temperature, pressure) - density;
Scalar df_dp;
df_dp = liquidDensity(temperature, pressure + eps);
df_dp = liquidDensity(temperature, pressure + eps);
df_dp -= liquidDensity(temperature, pressure - eps);
df_dp /= 2*eps;

6
dumux/material/components/ch4.hh
View File

@@ -125,9 +125,9 @@ public:
Scalar pressure)
{
// method of Joback
const Scalar cpVapA = 19.25;
const Scalar cpVapB = 0.05213;
const Scalar cpVapC = 1.197e-5;
const Scalar cpVapA = 19.25;
const Scalar cpVapB = 0.05213;
const Scalar cpVapC = 1.197e-5;
const Scalar cpVapD = -1.132e-8;
//Scalar cp =

6
dumux/material/components/h2.hh
View File

@@ -131,10 +131,10 @@ public:
Scalar pressure)
{
// method of Joback
const Scalar cpVapA = 27.14;
const Scalar cpVapB = 9.273e-3;
const Scalar cpVapA = 27.14;
const Scalar cpVapB = 9.273e-3;
const Scalar cpVapC = -1.381e-5;
const Scalar cpVapD = 7.645e-9;
const Scalar cpVapD = 7.645e-9;
//Scalar cp =
// cpVapA + T*(cpVapB + T*(cpVapC + T*cpVapD));

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

@@ -510,7 +510,7 @@ public:
Scalar f = gasDensity(temperature, pressure) - density;
Scalar df_dp;
df_dp = gasDensity(temperature, pressure + eps);
df_dp = gasDensity(temperature, pressure + eps);
df_dp -= gasDensity(temperature, pressure - eps);
df_dp /= 2*eps;
@@ -587,7 +587,7 @@ public:
Scalar f = liquidDensity(temperature, pressure) - density;
Scalar df_dp;
df_dp = liquidDensity(temperature, pressure + eps);
df_dp = liquidDensity(temperature, pressure + eps);
df_dp -= liquidDensity(temperature, pressure - eps);
df_dp /= 2*eps;

12
dumux/material/components/iapws/common.hh
View File

@@ -89,12 +89,12 @@ public:
// muBar = muBar_1
const Scalar Hij[6][7] = {
{ 5.20094e-1, 2.22531e-1,-2.81378e-1, 1.61913e-1,-3.25372e-2, 0, 0 },
{ 8.50895e-2, 9.99115e-1,-9.06851e-1, 2.57399e-1, 0, 0, 0 },
{-1.08374 , 1.88797 ,-7.72479e-1, 0, 0, 0, 0 },
{-2.89555e-1, 1.26613 ,-4.89837e-1, 0, 6.98452e-2, 0,-4.35673e-3 },
{ 0, 0,-2.57040e-1, 0, 0, 8.72102e-3, 0 },
{ 0, 1.20573e-1, 0, 0, 0, 0,-5.93264e-4 }
{ 5.20094e-1, 2.22531e-1,-2.81378e-1, 1.61913e-1,-3.25372e-2, 0, 0 },
{ 8.50895e-2, 9.99115e-1,-9.06851e-1, 2.57399e-1, 0, 0, 0 },
{-1.08374 , 1.88797 ,-7.72479e-1, 0, 0, 0, 0 },
{-2.89555e-1, 1.26613 ,-4.89837e-1, 0, 6.98452e-2, 0,-4.35673e-3 },
{ 0, 0,-2.57040e-1, 0, 0, 8.72102e-3, 0 },
{ 0, 1.20573e-1, 0, 0, 0, 0,-5.93264e-4 }
};
Scalar tmp, tmp2, tmp3 = 1;

58
dumux/material/components/iapws/region1.hh
View File

@@ -161,7 +161,7 @@ public:
-n(i) *
I(i) *
std::pow(7.1 - pi_, I(i) - 1) *
std::pow(tau_ - 1.222, J(i));
std::pow(tau_ - 1.222, J(i));
}
return result;
@@ -188,7 +188,7 @@ public:
I(i) *
J(i) *
std::pow(7.1 - pi_, I(i) - 1) *
std::pow(tau_ - 1.222, J(i) - 1);
std::pow(tau_ - 1.222, J(i) - 1);
}
return result;
@@ -215,7 +215,7 @@ public:
I(i) *
(I(i) - 1) *
std::pow(7.1 - pi_, I(i) - 2) *
std::pow(tau_ - 1.222, J(i));
std::pow(tau_ - 1.222, J(i));
}
return result;
@@ -224,13 +224,13 @@ public:
private:
static Scalar n(int i)
{
static const Scalar n[34] = {
0.14632971213167, -0.84548187169114, -0.37563603672040e1,
0.33855169168385e1, -0.95791963387872, 0.15772038513228,
-0.16616417199501e-1, 0.81214629983568e-3, 0.28319080123804e-3,
static const Scalar n[34] = {
0.14632971213167, -0.84548187169114, -0.37563603672040e1,
0.33855169168385e1, -0.95791963387872, 0.15772038513228,
-0.16616417199501e-1, 0.81214629983568e-3, 0.28319080123804e-3,
-0.60706301565874e-3, -0.18990068218419e-1, -0.32529748770505e-1,
-0.21841717175414e-1, -0.52838357969930e-4, -0.47184321073267e-3,
-0.30001780793026e-3, 0.47661393906987e-4, -0.44141845330846e-5,
-0.30001780793026e-3, 0.47661393906987e-4, -0.44141845330846e-5,
-0.72694996297594e-15,-0.31679644845054e-4, -0.28270797985312e-5,
-0.85205128120103e-9, -0.22425281908000e-5, -0.65171222895601e-6,
-0.14341729937924e-12,-0.40516996860117e-6, -0.12734301741641e-8,
@@ -244,16 +244,16 @@ private:
static short int I(int i)
{
static const short int I[34] = {
0, 0, 0,
0, 0, 0,
0, 0, 1,
1, 1, 1,
1, 1, 2,
2, 2, 2,
2, 3, 3,
3, 4, 4,
4, 5, 8,
8, 21, 23,
0, 0, 0,
0, 0, 0,
0, 0, 1,
1, 1, 1,
1, 1, 2,
2, 2, 2,
2, 3, 3,
3, 4, 4,
4, 5, 8,
8, 21, 23,
29, 30, 31,
32
};
@@ -263,17 +263,17 @@ private:
static short int J(int i)
{
static const short int J[34] = {
-2, -1, 0,
1, 2, 3,
4, 5, -9,
-7, -1, 0,
1, 3, -3,
0, 1, 3,
17, -4, 0,
6, -5, -2,
10, -8, -11,
-6, -29, -31,
-38, -39, -40,
-2, -1, 0,
1, 2, 3,
4, 5, -9,
-7, -1, 0,
1, 3, -3,
0, 1, 3,
17, -4, 0,
6, -5, -2,
10, -8, -11,
-6, -29, -31,
-38, -39, -40,
-41
};
return J[i];

38
dumux/material/components/iapws/region2.hh
View File

@@ -140,7 +140,7 @@ public:
result +=
n_g(i) *
J_g(i) *
std::pow(tau_, J_g(i) - 1);
std::pow(tau_, J_g(i) - 1);
}
// residual part
@@ -149,7 +149,7 @@ public:
n_r(i) *
std::pow(pi_, I_r(i)) *
J_r(i) *
std::pow(tau_ - 0.5, J_r(i) - 1);
std::pow(tau_ - 0.5, J_r(i) - 1);
}
return result;
@@ -248,7 +248,7 @@ public:
private:
static Scalar n_g(int i)
{
static const Scalar n[9] = {
static const Scalar n[9] = {
-0.96927686500217e1, 0.10086655968018e2, -0.56087911283020e-2,
0.71452738081455e-1, -0.40710498223928, 0.14240819171444e1,
-0.43839511319450e1, -0.28408632460772, 0.21268463753307e-1
@@ -258,21 +258,21 @@ private:
static Scalar n_r(int i)
{
static const Scalar n[43] = {
-0.17731742473213e-2, -0.17834862292358e-1, -0.45996013696365e-1,
-0.57581259083432e-1, -0.50325278727930e-1, -0.33032641670203e-4,
-0.18948987516315e-3, -0.39392777243355e-2, -0.43797295650573e-1,
-0.26674547914087e-4, 0.20481737692309e-7, 0.43870667284435e-6,
-0.32277677238570e-4, -0.15033924542148e-2, -0.40668253562649e-1,
-0.78847309559367e-9, 0.12790717852285e-7, 0.48225372718507e-6,
static const Scalar n[43] = {
-0.17731742473213e-2, -0.17834862292358e-1, -0.45996013696365e-1,
-0.57581259083432e-1, -0.50325278727930e-1, -0.33032641670203e-4,
-0.18948987516315e-3, -0.39392777243355e-2, -0.43797295650573e-1,
-0.26674547914087e-4, 0.20481737692309e-7, 0.43870667284435e-6,
-0.32277677238570e-4, -0.15033924542148e-2, -0.40668253562649e-1,
-0.78847309559367e-9, 0.12790717852285e-7, 0.48225372718507e-6,
0.22922076337661e-5, -0.16714766451061e-10, -0.21171472321355e-2,
-0.23895741934104e2, -0.59059564324270e-17, -0.12621808899101e-5,
-0.38946842435739e-1, 0.11256211360459e-10, -0.82311340897998e1,
0.19809712802088e-7, 0.10406965210174e-18, -0.10234747095929e-12,
-0.10018179379511e-8, -0.80882908646985e-10, 0.10693031879409,
-0.33662250574171, 0.89185845355421e-24, 0.30629316876232e-12,
-0.42002467698208e-5, -0.59056029685639e-25, 0.37826947613457e-5,
-0.12768608934681e-14, 0.73087610595061e-28, 0.55414715350778e-16,
-0.23895741934104e2, -0.59059564324270e-17, -0.12621808899101e-5,
-0.38946842435739e-1, 0.11256211360459e-10, -0.82311340897998e1,
0.19809712802088e-7, 0.10406965210174e-18, -0.10234747095929e-12,
-0.10018179379511e-8, -0.80882908646985e-10, 0.10693031879409,
-0.33662250574171, 0.89185845355421e-24, 0.30629316876232e-12,
-0.42002467698208e-5, -0.59056029685639e-25, 0.37826947613457e-5,
-0.12768608934681e-14, 0.73087610595061e-28, 0.55414715350778e-16,
-0.94369707241210e-6
};
return n[i];
@@ -303,9 +303,9 @@ private:
static Scalar J_g(int i)
{
static const short int J[9] = {
0, 1, -5,
0, 1, -5,
-4, -3, -2,
-1, 2, 3
-1, 2, 3
};
return J[i];
}

6
dumux/material/components/iapws/region4.hh
View File

@@ -57,9 +57,9 @@ public:
static Scalar saturationPressure(Scalar temperature)
{
static const Scalar n[10] = {
0.11670521452767e4, -0.72421316703206e6, -0.17073846940092e2,
0.12020824702470e5, -0.32325550322333e7, 0.14915108613530e2,
-0.48232657361591e4, 0.40511340542057e6, -0.23855557567849,
0.11670521452767e4, -0.72421316703206e6, -0.17073846940092e2,
0.12020824702470e5, -0.32325550322333e7, 0.14915108613530e2,
-0.48232657361591e4, 0.40511340542057e6, -0.23855557567849,
0.65017534844798e3
};

4
dumux/material/components/n2.hh
View File

@@ -154,9 +154,9 @@ public:
Scalar pressure)
{
// method of Joback
const Scalar cpVapA = 31.15;
const Scalar cpVapA = 31.15;
const Scalar cpVapB = -0.01357;
const Scalar cpVapC = 2.680e-5;
const Scalar cpVapC = 2.680e-5;
const Scalar cpVapD = -1.168e-8;
//Scalar cp =

10
dumux/material/components/o2.hh
View File

@@ -97,10 +97,10 @@ public:
Scalar X =
(1 - tripleTemperature()/T) /
(1 - tripleTemperature()/criticalTemperature());
const Scalar A = 7.568956;
const Scalar B = 5.004836;
const Scalar A = 7.568956;
const Scalar B = 5.004836;
const Scalar C = -2.137460;
const Scalar D = 3.454481;
const Scalar D = 3.454481;
const Scalar epsilon = 1.514;
return
@@ -141,9 +141,9 @@ public:
Scalar pressure)
{
// method of Joback
const Scalar cpVapA = 28.11;
const Scalar cpVapA = 28.11;
const Scalar cpVapB = -3.680e-6;
const Scalar cpVapC = 1.746e-5;
const Scalar cpVapC = 1.746e-5;
const Scalar cpVapD = -1.065e-8;
//Scalar cp =

6
dumux/material/components/simpleh2o.hh
View File

@@ -99,9 +99,9 @@ public:
return 0; // water is solid: We don't take sublimation into account
static const Scalar n[10] = {
0.11670521452767e4, -0.72421316703206e6, -0.17073846940092e2,
0.12020824702470e5, -0.32325550322333e7, 0.14915108613530e2,
-0.48232657361591e4, 0.40511340542057e6, -0.23855557567849,
0.11670521452767e4, -0.72421316703206e6, -0.17073846940092e2,
0.12020824702470e5, -0.32325550322333e7, 0.14915108613530e2,
-0.48232657361591e4, 0.40511340542057e6, -0.23855557567849,
0.65017534844798e3
};

24
dumux/material/components/tabulatedcomponent.hh
View File

@@ -624,16 +624,16 @@ private:
static Scalar *liquidPressure_;
// temperature, pressure and density ranges
static Scalar tempMin_;
static Scalar tempMax_;
static Scalar tempMin_;
static Scalar tempMax_;
static unsigned nTemp_;
static Scalar pressMin_;
static Scalar pressMax_;
static Scalar pressMin_;
static Scalar pressMax_;
static unsigned nPress_;
static Scalar densityMin_;
static Scalar densityMax_;
static Scalar densityMin_;
static Scalar densityMax_;
static unsigned nDensity_;
};
@@ -668,21 +668,21 @@ Scalar* TabulatedComponent<Scalar, RawComponent, verbose>::gasPressure_;
template <class Scalar, class RawComponent, bool verbose>
Scalar* TabulatedComponent<Scalar, RawComponent, verbose>::liquidPressure_;
template <class Scalar, class RawComponent, bool verbose>
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::tempMin_;
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::tempMin_;
template <class Scalar, class RawComponent, bool verbose>
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::tempMax_;
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::tempMax_;
template <class Scalar, class RawComponent, bool verbose>
unsigned TabulatedComponent<Scalar, RawComponent, verbose>::nTemp_;
template <class Scalar, class RawComponent, bool verbose>
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::pressMin_;
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::pressMin_;
template <class Scalar, class RawComponent, bool verbose>
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::pressMax_;
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::pressMax_;
template <class Scalar, class RawComponent, bool verbose>
unsigned TabulatedComponent<Scalar, RawComponent, verbose>::nPress_;
template <class Scalar, class RawComponent, bool verbose>
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::densityMin_;
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::densityMin_;
template <class Scalar, class RawComponent, bool verbose>
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::densityMax_;
Scalar TabulatedComponent<Scalar, RawComponent, verbose>::densityMax_;
template <class Scalar, class RawComponent, bool verbose>
unsigned TabulatedComponent<Scalar, RawComponent, verbose>::nDensity_;

4
dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
View File

@@ -35,9 +35,9 @@ namespace Dumux
template <class EffLawParamsT>
class EffToAbsLawParams : public EffLawParamsT
{
typedef EffLawParamsT EffLawParams;
typedef EffLawParamsT EffLawParams;
public:
typedef typename EffLawParams::Scalar Scalar;
typedef typename EffLawParams::Scalar Scalar;
EffToAbsLawParams()
: EffLawParams()

10
dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
View File

@@ -144,16 +144,16 @@ private:
// check wether the permeability needs to be regularized
else if (S < lowS) {
typedef Dumux::Spline<Scalar> Spline;
Spline sp(0, lowS,
0, lowS/2,
0, m);
Spline sp(0, lowS,
0, lowS/2,
0, m);
return sp.eval(S);
}
else if (S > highS) {
typedef Dumux::Spline<Scalar> Spline;
Spline sp(highS, 1,
Spline sp(highS, 1,
1 - (1 - highS)/2, 1,
m, 0);
m, 0);
return sp.eval(S);
}

6
dumux/material/fluidsystems/defaultcomponents.hh
View File

@@ -53,7 +53,7 @@ SET_PROP_DEFAULT(DefaultComponents)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef Dumux::H2O<Scalar> H2O_IAPWS;
public:
typedef Dumux::TabulatedComponent<Scalar, H2O_IAPWS> H2O;
typedef Dumux::N2<Scalar> N2;
@@ -62,7 +62,7 @@ public:
typedef Dumux::CH4<Scalar> CH4;
typedef Dumux::SimpleCO2<Scalar> SimpleCO2;
typedef Dumux::Brine<Scalar, H2O> Brine;
static void init()
{
int nT = 100;
@@ -74,7 +74,7 @@ public:
}
};
SET_PROP_DEFAULT(Components)
SET_PROP_DEFAULT(Components)
: public GET_PROP(TypeTag, PTAG(DefaultComponents))
{};

12
dumux/material/fluidsystems/h2o_n2_system.hh
View File

@@ -107,7 +107,7 @@ public:
// \todo: proper citation
Scalar rholH2O = H2O::liquidDensity(temperature, pressure);
Scalar clH2O = rholH2O/H2O::molarMass();
// this assumes each nitrogen molecule displaces exactly one
// water molecule in the liquid
return
@@ -118,7 +118,7 @@ public:
else if (phaseIdx == gPhaseIdx) {
Scalar fugH2O = fluidState.fugacity(H2OIdx);
Scalar fugN2 = fluidState.fugacity(N2Idx);
return
return
H2O::gasDensity(temperature, fugH2O) +
N2::gasDensity(temperature, fugN2);
}
@@ -314,14 +314,14 @@ public:
Scalar fugN2 = std::max(1e-3, state.fugacity(N2Idx));
Scalar cH2O = H2O::gasDensity(temperature, fugH2O) / H2O::molarMass();
Scalar cN2 = N2::gasDensity(temperature, fugN2) / N2::molarMass();
Scalar alpha = (fugH2O + fugN2)/pressure;
if (compIdx == H2OIdx)
return fugH2O/(alpha*cH2O/(cH2O + cN2));
else if (compIdx == N2Idx)
return fugN2/(alpha*cN2/(cH2O + cN2));
DUNE_THROW(Dune::InvalidStateException, "Invalid component index " << compIdx);
}
@@ -400,7 +400,7 @@ public:
Scalar pressure,
const FluidState &fluidState)
{
if (phaseIdx == lPhaseIdx) {
if (phaseIdx == lPhaseIdx) {
Scalar cN2 = fluidState.concentration(lPhaseIdx, N2Idx);
Scalar pN2 = N2::gasPressure(temperature, cN2*N2::molarMass());
@@ -450,7 +450,7 @@ private:
// \todo: proper citation
Scalar rholH2O = H2O::liquidDensity(T, pl);
Scalar clH2O = rholH2O/H2O::molarMass();
// this assumes each nitrogen molecule displaces exactly one
// water molecule in the liquid
return

14
dumux/material/spatialparameters/boxspatialparameters.hh
View File

@@ -46,7 +46,7 @@ class BoxSpatialParameters
enum {
dimWorld = GridView::dimensionworld
};
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
@@ -83,15 +83,15 @@ public:
Scalar extrusionFactorScvf(const Element &element,
const FVElementGeometry &fvElemGeom,
int scvfIdx) const
{
{
return
0.5 *
(asImp_().extrusionFactorScv(element,
fvElemGeom,
(asImp_().extrusionFactorScv(element,
fvElemGeom,
fvElemGeom.subContVolFace[scvfIdx].i)
+
asImp_().extrusionFactorScv(element,
fvElemGeom,
asImp_().extrusionFactorScv(element,
fvElemGeom,
fvElemGeom.subContVolFace[scvfIdx].j));
}
@@ -127,7 +127,7 @@ public:
protected:
Implementation &asImp_()
{ return *static_cast<Implementation*>(this); }
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
};