more peng robinson
This commit is contained in:
parent
bf89f6747b
commit
16c88d0a02
@ -85,7 +85,6 @@ public:
|
|||||||
* R. Reid, et al.: The Properties of Gases and Liquids,
|
* R. Reid, et al.: The Properties of Gases and Liquids,
|
||||||
* 4th edition, McGraw-Hill, 1987, pp. 42-44, 143-145
|
* 4th edition, McGraw-Hill, 1987, pp. 42-44, 143-145
|
||||||
*/
|
*/
|
||||||
#warning should check why this function is changed
|
|
||||||
template <class FluidState, class Params, class LhsEval = typename FluidState::Scalar>
|
template <class FluidState, class Params, class LhsEval = typename FluidState::Scalar>
|
||||||
static LhsEval computeFugacityCoefficient(const FluidState& fs_arg,
|
static LhsEval computeFugacityCoefficient(const FluidState& fs_arg,
|
||||||
const Params& params_arg,
|
const Params& params_arg,
|
||||||
|
@ -108,12 +108,10 @@ public:
|
|||||||
|
|
||||||
Scalar f_omega;
|
Scalar f_omega;
|
||||||
|
|
||||||
// if (useSpe5Relations) {
|
if (omega < 0.49)
|
||||||
if (omega < 0.49) f_omega = 0.37464 + omega*(1.54226 + omega*(-0.26992));
|
f_omega = 0.37464 + omega*(1.54226 + omega*(-0.26992));
|
||||||
else f_omega = 0.379642 + omega*(1.48503 + omega*(-0.164423 + omega*0.016666));
|
else
|
||||||
// }
|
f_omega = 0.379642 + omega*(1.48503 + omega*(-0.164423 + omega*0.016666));
|
||||||
// else
|
|
||||||
// f_omega = 0.37464 + omega*(1.54226 - omega*0.26992);
|
|
||||||
|
|
||||||
Valgrind::CheckDefined(f_omega);
|
Valgrind::CheckDefined(f_omega);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user