diff --git a/test_problems/SConscript b/test_problems/SConscript index 7250d71bc..4b80fa782 100644 --- a/test_problems/SConscript +++ b/test_problems/SConscript @@ -8,9 +8,13 @@ localenv.Append(CCFLAGS=env['warning_flags']) if localenv['python_package'] in ('full', 'minimal'): localenv['ENV']['PYTHONPATH'] = pjoin(os.getcwd(), '..', 'build', 'python2') localenv['ENV']['PYTHON_CMD'] = localenv.subst('$python_cmd') + haveConverters = True elif localenv['python3_package'] == 'y': localenv['ENV']['PYTHONPATH'] = pjoin(os.getcwd(), '..', 'build', 'python3') localenv['ENV']['PYTHON_CMD'] = localenv.subst('$python3_cmd') + haveConverters = True +else: + haveConverters = False localenv['ENV']['CANTERA_DATA'] = pjoin(os.getcwd(), '..', 'build', 'data') @@ -250,8 +254,9 @@ diamond = localenv.Program('diamondSurf/runDiamond', diamond_name = diamond[0].name Test('diamondSurf-xml', 'diamondSurf', diamond, 'runDiamond_blessed.out', options='diamond_blessed.xml', artifacts=diamond_name) -Test('diamondSurf-cti', 'diamondSurf', diamond, 'runDiamond_blessed.out', - options='diamond.cti', artifacts=diamond_name) +if haveConverters: + Test('diamondSurf-cti', 'diamondSurf', diamond, 'runDiamond_blessed.out', + options='diamond.cti', artifacts=diamond_name) CompileAndTest('dustyGasTransport', 'dustyGasTransport', 'dustyGasTransport', 'output_blessed.txt') CompileAndTest('fracCoeff', 'fracCoeff', 'fracCoeff', 'frac_blessed.out') @@ -267,14 +272,16 @@ negA = localenv.Program('negATest/negATest', negA_name = negA[0].name Test('negA-xml', 'negATest', negA, 'negATest_blessed.out', options='noxNeg_blessed.xml', artifacts=negA_name) -Test('negA-cti', 'negATest', negA, 'negATest_blessed.out', - options='noxNeg.cti', artifacts=negA_name) +if haveConverters: + Test('negA-cti', 'negATest', negA, 'negATest_blessed.out', + options='noxNeg.cti', artifacts=negA_name) CompileAndTest('pecosTransport', 'PecosTransport', 'pecosTransport', 'output_blessed.txt') CompileAndTest('printUtil', 'printUtilUnitTest', 'pUtest', 'output_blessed.txt') CompileAndTest('pureFluid', 'pureFluidTest', 'testPureWater', 'output_blessed.txt') -CompileAndTest('rankine_democxx', 'rankine_democxx', 'rankine', 'output_blessed.txt', - artifacts=['liquidvapor.xml']) +if haveConverters: + CompileAndTest('rankine_democxx', 'rankine_democxx', 'rankine', 'output_blessed.txt', + artifacts=['liquidvapor.xml']) CompileAndTest('silane_equil', 'silane_equil', 'silane_equi', 'output_blessed.txt') # spectroscopy is incomplete CompileAndTest('simpleTransport', 'simpleTransport', 'simpleTransport', diff --git a/test_problems/cxx_ex/rxnpath_example1.cpp b/test_problems/cxx_ex/rxnpath_example1.cpp index e9eb1b658..f44c17352 100644 --- a/test_problems/cxx_ex/rxnpath_example1.cpp +++ b/test_problems/cxx_ex/rxnpath_example1.cpp @@ -88,7 +88,7 @@ int rxnpath_example1(int job) // create an ideal gas mixture that corresponds to GRI-Mech // 3.0 - IdealGasMix gas("gri30.cti", "gri30"); + IdealGasMix gas("gri30.xml", "gri30"); gas.setState_TPX(1001.0, OneAtm, "H2:2.0, O2:1.0, N2:4.0"); // create a reactor diff --git a/test_problems/cxx_ex/transport_example1.cpp b/test_problems/cxx_ex/transport_example1.cpp index 1bd5d8989..9e0e3570f 100644 --- a/test_problems/cxx_ex/transport_example1.cpp +++ b/test_problems/cxx_ex/transport_example1.cpp @@ -29,7 +29,7 @@ int transport_example1(int job) // create a gas mixture, and set its state - IdealGasMix gas("gri30.cti", "gri30"); + IdealGasMix gas("gri30.xml", "gri30"); doublereal temp = 500.0; doublereal pres = 2.0*OneAtm; gas.setState_TPX(temp, pres, "H2:1.0, CH4:0.1"); diff --git a/test_problems/cxx_ex/transport_example2.cpp b/test_problems/cxx_ex/transport_example2.cpp index 92d6fa395..4fb18773b 100644 --- a/test_problems/cxx_ex/transport_example2.cpp +++ b/test_problems/cxx_ex/transport_example2.cpp @@ -30,7 +30,7 @@ int transport_example2(int job) // create a gas mixture, and set its state - IdealGasMix gas("gri30.cti", "gri30"); + IdealGasMix gas("gri30.xml", "gri30"); doublereal temp = 2000.0; doublereal pres = 2.0*OneAtm; gas.setState_TPX(temp, pres, "H2:1.0, O2:0.5, CH4:0.1, N2:0.2");