github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-13 23:35:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Renamed normalization flag

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-09-10 15:53:57 +02:00
parent d64889965b
commit a2a2c80323
4 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Backends/Helmholtz/Configuration.cpp
View File

@@ -15,7 +15,7 @@ bool get_config_bool(configuration_keys key)
{
switch(key)
{
case NORMALIZE_GAS_CONSTANTS2:
case NORMALIZE_GAS_CONSTANTS:
return true;
default:
throw ValueError(format("%d is invalid key to get_config_bool",key));

2
src/Backends/Helmholtz/Configuration.h
View File

@@ -4,7 +4,7 @@
#include "Exceptions.h"
#include "CoolPropTools.h"
enum configuration_keys {NORMALIZE_GAS_CONSTANTS2};
enum configuration_keys {NORMALIZE_GAS_CONSTANTS};
namespace CoolProp
{

5
src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp
View File

@@ -171,7 +171,7 @@ long double HelmholtzEOSMixtureBackend::calc_gas_constant(void)
return components[0]->gas_constant();
}
else{
if (get_config_bool(NORMALIZE_GAS_CONSTANTS2)){
if (get_config_bool(NORMALIZE_GAS_CONSTANTS)){
return R_u_CODATA;
}
else{
@@ -184,7 +184,6 @@ long double HelmholtzEOSMixtureBackend::calc_gas_constant(void)
return summer;
}
}
}
long double HelmholtzEOSMixtureBackend::calc_molar_mass(void)
{
@@ -2091,7 +2090,7 @@ void HelmholtzEOSMixtureBackend::calc_all_alphar_deriv_cache(const std::vector<l
HelmholtzDerivatives derivs = components[i]->pEOS->alphar.all(tau, delta);
long double xi = mole_fractions[i];
long double R_u_ratio = 1;
if (get_config_bool(NORMALIZE_GAS_CONSTANTS2)){
if (get_config_bool(NORMALIZE_GAS_CONSTANTS)){
R_u_ratio = components[0]->pEOS->R_u/R_u_CODATA;
}
summer_base += xi*derivs.alphar;