Combined redundant configuration options for "with_pure_fluids"

Eliminated enable_tpx, incl_pure_fluids

Cantera/matlab/src/thermomethods.cpp

@@ -131,7 +131,7 @@ static void thermoget( int nlhs, mxArray *plhs[],
                 vv = th_maxTemp(n); break;
             case 18:
                 vv = double(th_eosType(n)); break;
-#ifdef INCL_PURE_FLUIDS
+#ifdef WITH_PURE_FLUIDS
             case 19:
                 vv  = th_critTemperature(n); break;
             case 20:

SConstruct

@@ -214,10 +214,6 @@ opts.AddVariables(
         'enable_rxnpath',
         'Enable reaction path analysis',
         True),
-    BoolVariable(
-        'enable_tpx',
-        'Enable two-phase pure fluids',
-        True),
     BoolVariable(
         'with_html_log_files',
         """write HTML log files. Some multiphase equilibrium
@@ -509,8 +505,7 @@ cdefine('WITH_STOICH_SUBSTANCE', 'with_stoich_substance')
 cdefine('WITH_SEMICONDUCTOR', 'with_semiconductor')
 cdefine('WITH_PRIME', 'with_prime')
 cdefine('H298MODIFY_CAPABILITY', 'with_n298modify_capability')
-cdefine('WITH_PURE_FLUIDS', 'with_pure_fluids')
-cdefine('INCL_PURE_FLUIDS', 'with_pure_fluids') # TODO: fix redundancy
+cdefine('WITH_PURE_FLUIDS', 'with_pure_fluids5A')
 cdefine('WITH_HTML_LOGS', 'with_html_log_files')
 cdefine('WITH_VCSNONIDEAL', 'with_vcsnonideal')
 

config.h.in.scons

@@ -138,7 +138,6 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 //    accurate liquid/vapor equations
 //    of state for several fluids, including water, nitrogen, hydrogen,
 //    oxygen, methane, andd HFC-134a.
-%(INCL_PURE_FLUIDS)s
 %(WITH_PURE_FLUIDS)s
 
 %(WITH_LATTICE_SOLID)s