OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

problems with how ideal gas constant R was defined on mac, David helped me fix it

Browse Source
This commit is contained in:
Trine Mykkeltvedt 2022-05-10 10:51:37 +02:00
parent eee1f72482
commit 03685e5bf2
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/material/eos/PengRobinson.hpp
View File

@ -55,8 +55,6 @@ namespace Opm {
template <class Scalar> template <class Scalar>
class PengRobinson class PengRobinson
{ {
//! The ideal gas constant [Pa * m^3/mol/K]
static const Scalar R;
PengRobinson() PengRobinson()
{ } { }
@ -168,7 +166,7 @@ public:
if (!std::isfinite(scalarValue(b)) || b <= 0) if (!std::isfinite(scalarValue(b)) || b <= 0)
return std::numeric_limits<Scalar>::quiet_NaN(); return std::numeric_limits<Scalar>::quiet_NaN();
const Evaluation& RT= R*T; const Evaluation& RT= Constants<Scalar>::R*T;
const Evaluation& Astar = a*p/(RT*RT); const Evaluation& Astar = a*p/(RT*RT);
const Evaluation& Bstar = b*p/RT; const Evaluation& Bstar = b*p/RT;
@ -253,7 +251,7 @@ public:
const Evaluation& p = params.pressure(); const Evaluation& p = params.pressure();
const Evaluation& Vm = params.molarVolume(); const Evaluation& Vm = params.molarVolume();
const Evaluation& RT = R*T; const Evaluation& RT = Constants<Scalar>::R*T;
const Evaluation& Z = p*Vm/RT; const Evaluation& Z = p*Vm/RT;
const Evaluation& Bstar = p*params.b() / RT; const Evaluation& Bstar = p*params.b() / RT;
@ -417,7 +415,7 @@ protected:
Scalar u = 2; Scalar u = 2;
Scalar w = -1; Scalar w = -1;
const Evaluation& RT = R*T; const Evaluation& RT = Constants<Scalar>::R*T;
// calculate coefficients of the 4th order polynominal in // calculate coefficients of the 4th order polynominal in
// monomial basis // monomial basis
@ -541,8 +539,6 @@ protected:
*/ */
}; };
template <class Scalar>
const Scalar PengRobinson<Scalar>::R = Constants<Scalar>::R;
/* /*
template <class Scalar> template <class Scalar>

7
opm/material/eos/PengRobinsonParamsMixture.hpp
View File

@ -65,9 +65,6 @@ class PengRobinsonParamsMixture
typedef MathToolbox<Scalar> Toolbox; typedef MathToolbox<Scalar> Toolbox;
// the ideal gas constant
static const Scalar R;
public: public:
/*! /*!
* \brief Update Peng-Robinson parameters for the pure components. * \brief Update Peng-Robinson parameters for the pure components.
@ -98,7 +95,7 @@ public:
Scalar pc = FluidSystem::criticalPressure(i); Scalar pc = FluidSystem::criticalPressure(i);
Scalar omega = FluidSystem::acentricFactor(i); Scalar omega = FluidSystem::acentricFactor(i);
Scalar Tr = temperature/FluidSystem::criticalTemperature(i); Scalar Tr = temperature/FluidSystem::criticalTemperature(i);
Scalar RTc = R*FluidSystem::criticalTemperature(i); Scalar RTc = Constants<Scalar>::R*FluidSystem::criticalTemperature(i);
Scalar f_omega; Scalar f_omega;
@ -246,8 +243,6 @@ private:
Scalar aCache_[numComponents][numComponents]; Scalar aCache_[numComponents][numComponents];
}; };
template <class Scalar, class FluidSystem, unsigned phaseIdx, bool useSpe5Relations>
const Scalar PengRobinsonParamsMixture<Scalar, FluidSystem, phaseIdx, useSpe5Relations>::R = Constants<Scalar>::R;
} // namespace Opm } // namespace Opm