research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Test] Skip tests which require ctml_writer when python_package=none

Browse source
This commit is contained in:
Ray Speth 2013-12-09 01:36:27 +00:00
parent 72515dcc99
commit 3541a8d0bb
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
test_problems/SConscript
View file

@ -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,6 +254,7 @@ 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)
if haveConverters:
Test('diamondSurf-cti', 'diamondSurf', diamond, 'runDiamond_blessed.out',
options='diamond.cti', artifacts=diamond_name)
CompileAndTest('dustyGasTransport', 'dustyGasTransport', 'dustyGasTransport',
@ -267,12 +272,14 @@ 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)
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')
if haveConverters:
CompileAndTest('rankine_democxx', 'rankine_democxx', 'rankine', 'output_blessed.txt',
artifacts=['liquidvapor.xml'])
CompileAndTest('silane_equil', 'silane_equil', 'silane_equi', 'output_blessed.txt')

2
test_problems/cxx_ex/rxnpath_example1.cpp
View file

@ -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

2
test_problems/cxx_ex/transport_example1.cpp
View file

@ -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");

2
test_problems/cxx_ex/transport_example2.cpp
View file

@ -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");