From a2a2c80323cb1a5e34c22d5ba0d431a52b77bf1a Mon Sep 17 00:00:00 2001
From: Ian Bell <ian.h.bell@gmail.com>
Date: Wed, 10 Sep 2014 15:53:57 +0200
Subject: [PATCH] Renamed normalization flag

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
---
 src/Backends/Helmholtz/Configuration.cpp      |  2 +-
 src/Backends/Helmholtz/Configuration.h        |  2 +-
 .../Helmholtz/HelmholtzEOSMixtureBackend.cpp  |  5 ++--
 src/main.cxx                                  | 30 ++++---------------
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/src/Backends/Helmholtz/Configuration.cpp b/src/Backends/Helmholtz/Configuration.cpp
index cd67e330..0c209124 100644
--- a/src/Backends/Helmholtz/Configuration.cpp
+++ b/src/Backends/Helmholtz/Configuration.cpp
@@ -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));
diff --git a/src/Backends/Helmholtz/Configuration.h b/src/Backends/Helmholtz/Configuration.h
index 8f5ee5a7..b061ebde 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_CONSTANTS2};
+enum configuration_keys {NORMALIZE_GAS_CONSTANTS};
 
 namespace CoolProp
 {
diff --git a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp
index 6c3e382f..2e3dff1d 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_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;
diff --git a/src/main.cxx b/src/main.cxx
index 4121ce98..d487c37e 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -431,7 +431,7 @@ int main()
         std::cin >> c;
     }
     #endif
-    #if 1
+    #if 0
     {
 		run_tests();
 		char c;
@@ -445,33 +445,15 @@ int main()
         int rr =0;
     }
     #endif
-    #if 0
+    #if 1
     { 
-//        std::vector<std::string> names(1, "n-Propane");
-//        shared_ptr<HelmholtzEOSMixtureBackend> HEOS(new HelmholtzEOSMixtureBackend(names));
-//        
-//        for (double p = HEOS->melting_line(iP_min, -1, -1)*1.01; p < HEOS->melting_line(iP_max, -1, -1); p *= 1.1)
-//        {
-//            double Tmelt = HEOS->melting_line(iT, iP, p);
-//            //HEOS->specify_phase(iphase_liquid);
-//            HEOS->clear();
-//            HEOS->update(PT_INPUTS, p, Tmelt);
-//            std::cout << format("%0.16g %0.16g %0.16g %0.16g %d %0.16g\n", Tmelt, p, HEOS->delta(), HEOS->hmolar(), HEOS->phase(), PropsSI("Dmass","P",p,"T",Tmelt,"REFPROP::Propane"));
-//            if (HEOS->phase() == iphase_twophase){
-//                HEOS->update(PT_INPUTS, p, Tmelt);};
-//            std::cout << get_global_param_string("errstring") << std::endl;
-//        }
-//        double TTTA = PropsSI("T","P",1e5,"Q",0,"Methane[0.25]&Ethane[0.2]&Propane[0.1]");
-//        double TTT = PropsSI("Dmolar","P",1e5,"T",300,"Methane[0.25]&Ethane[0.2]&Propane[0.1]");
-//        double TTTB = PropsSI("T","P",3e6,"Q",0,"R32[0.5]&R125[0.5]");
-//        double TTTB2 = PropsSI("T","P",3e6,"Q",0,"REFPROP::R32[0.5]&R125[0.5]");
         
         ::set_debug_level(0);
         
-        //shared_ptr<AbstractState> HEOS(AbstractState::factory("HEOS","Ethane&Propane"));
-        //std::vector<long double> z(2, 0.3); z[1] = 0.7;
-        shared_ptr<AbstractState> HEOS(AbstractState::factory("HEOS","Methane&Propane&Ethane&n-Butane"));
-        std::vector<long double> z(4, 0.1); z[1] = 0.35; z[2] = 0.35, z[3] = 0.2;
+        shared_ptr<AbstractState> HEOS(AbstractState::factory("HEOS","Methane&Propane"));
+        std::vector<long double> z(2, 0.3); z[1] = 0.7;
+        //shared_ptr<AbstractState> HEOS(AbstractState::factory("HEOS","Methane&Propane&Ethane&n-Butane"));
+        //std::vector<long double> z(4, 0.1); z[1] = 0.35; z[2] = 0.35, z[3] = 0.2;
         HEOS->set_mole_fractions(z);
         
         time_t t1, t2;