From d64889965b9317348d42b4fb07b281b4b5d4e25e Mon Sep 17 00:00:00 2001
From: Ian Bell <ian.h.bell@gmail.com>
Date: Wed, 10 Sep 2014 15:46:18 +0200
Subject: [PATCH] Removed old-style gas constant normalization

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
---
 src/Backends/Helmholtz/Configuration.cpp              | 2 --
 src/Backends/Helmholtz/Configuration.h                | 2 +-
 src/Backends/Helmholtz/Fluids/FluidLibrary.h          | 9 ---------
 src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp | 2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Backends/Helmholtz/Configuration.cpp b/src/Backends/Helmholtz/Configuration.cpp
index 404938d7..cd67e330 100644
--- a/src/Backends/Helmholtz/Configuration.cpp
+++ b/src/Backends/Helmholtz/Configuration.cpp
@@ -15,8 +15,6 @@ bool get_config_bool(configuration_keys key)
 {
     switch(key)
     {
-        case NORMALIZE_GAS_CONSTANTS:
-            return false;
         case NORMALIZE_GAS_CONSTANTS2:
             return true;
         default:
diff --git a/src/Backends/Helmholtz/Configuration.h b/src/Backends/Helmholtz/Configuration.h
index 20d9b6c2..8f5ee5a7 100644
--- a/src/Backends/Helmholtz/Configuration.h
+++ b/src/Backends/Helmholtz/Configuration.h
@@ -4,7 +4,7 @@
 #include "Exceptions.h"
 #include "CoolPropTools.h"
 
-enum configuration_keys {NORMALIZE_GAS_CONSTANTS, NORMALIZE_GAS_CONSTANTS2};
+enum configuration_keys {NORMALIZE_GAS_CONSTANTS2};
 
 namespace CoolProp
 {
diff --git a/src/Backends/Helmholtz/Fluids/FluidLibrary.h b/src/Backends/Helmholtz/Fluids/FluidLibrary.h
index ab075272..c9c36421 100644
--- a/src/Backends/Helmholtz/Fluids/FluidLibrary.h
+++ b/src/Backends/Helmholtz/Fluids/FluidLibrary.h
@@ -51,7 +51,6 @@ protected:
                 assert(n.size() == t.size());
                 assert(n.size() == l.size());
                 
-                if (get_config_bool(NORMALIZE_GAS_CONSTANTS)){for(std::size_t i = 0; i < n.size(); ++i){n[i] *= EOS.R_u/R_u_CODATA;}}
                 EOS.alphar.GenExp.add_Power(n,d,t,l);
             }
             else if (!type.compare("ResidualHelmholtzGaussian"))
@@ -69,7 +68,6 @@ protected:
                 assert(n.size() == epsilon.size());
                 assert(n.size() == beta.size());
                 assert(n.size() == gamma.size());
-                if (get_config_bool(NORMALIZE_GAS_CONSTANTS)){for(std::size_t i = 0; i < n.size(); ++i){n[i] *= EOS.R_u/R_u_CODATA;}}
                 EOS.alphar.GenExp.add_Gaussian(n,d,t,eta,epsilon,beta,gamma);
             }
             else if (!type.compare("ResidualHelmholtzNonAnalytic"))
@@ -90,7 +88,6 @@ protected:
                 assert(n.size() == B.size());
                 assert(n.size() == C.size());
                 assert(n.size() == D.size());
-                if (get_config_bool(NORMALIZE_GAS_CONSTANTS)){for(std::size_t i = 0; i < n.size(); ++i){n[i] *= EOS.R_u/R_u_CODATA;}}
                 EOS.alphar.NonAnalytic = ResidualHelmholtzNonAnalytic(n,a,b,beta,A,B,C,D);
             }
             else if (!type.compare("ResidualHelmholtzLemmon2005"))
@@ -104,7 +101,6 @@ protected:
                 assert(n.size() == t.size());
                 assert(n.size() == l.size());
                 assert(n.size() == m.size());
-                if (get_config_bool(NORMALIZE_GAS_CONSTANTS)){for(std::size_t i = 0; i < n.size(); ++i){n[i] *= EOS.R_u/R_u_CODATA;}}
                 EOS.alphar.GenExp.add_Lemmon2005(n,d,t,l,m);
             }
             else if (!type.compare("ResidualHelmholtzExponential"))
@@ -118,7 +114,6 @@ protected:
                 assert(n.size() == t.size());
                 assert(n.size() == g.size());
                 assert(n.size() == l.size());
-                if (get_config_bool(NORMALIZE_GAS_CONSTANTS)){for(std::size_t i = 0; i < n.size(); ++i){n[i] *= EOS.R_u/R_u_CODATA;}}
                 EOS.alphar.GenExp.add_Exponential(n,d,t,g,l);
             }
             else if (!type.compare("ResidualHelmholtzAssociating"))
@@ -374,10 +369,6 @@ protected:
 
         // Validate the equation of state that was just created
         EOS.validate();
-        
-        if (get_config_bool(NORMALIZE_GAS_CONSTANTS)){
-            EOS.R_u = R_u_CODATA;
-        }
     }
 
     /// Parse the list of possible equations of state
diff --git a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp
index 71848561..6c3e382f 100644
--- a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp
+++ b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp
@@ -171,7 +171,7 @@ long double HelmholtzEOSMixtureBackend::calc_gas_constant(void)
         return components[0]->gas_constant();
     }
     else{
-        if (get_config_bool(NORMALIZE_GAS_CONSTANTS) || get_config_bool(NORMALIZE_GAS_CONSTANTS2)){
+        if (get_config_bool(NORMALIZE_GAS_CONSTANTS2)){
             return R_u_CODATA;
         }
         else{