diff --git a/samples/cxx/NASA_coeffs/runtest b/samples/cxx/NASA_coeffs/runtest deleted file mode 100755 index 7800e0b8f..000000000 --- a/samples/cxx/NASA_coeffs/runtest +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output_0.txt diff_csv.txt diff_out_0.txt output.txt output_a.txt - -########################################################################## - -prog=NASA_coeffs -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -$prog > output_0.txt <<+ -1.0 -+ -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" -fi - -${CANTERA_BIN}/exp3to2.sh output_0.txt > output_a.txt -cat output_a.txt | sed /'press any'/d > output.txt - - -diff -w output_0_blessed.txt output.txt > diff_out_0.txt -retnStat_0=$? - - -retnTotal=1 -if test $retnStat_0 = "0" -then - retnTotal=0 -fi - - -if test $retnTotal = "0" -then - echo "Successful test comparison on "`pwd` -else - echo "Unsuccessful test comparison on "`pwd` " test" - echo " txt files are different - see diff_test*.txt" -fi - diff --git a/samples/cxx/combustor/runtest b/samples/cxx/combustor/runtest deleted file mode 100755 index 6751d43fb..000000000 --- a/samples/cxx/combustor/runtest +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output_0.txt combustor_cxx.csv diff_csv.txt diff_out_0.txt - -########################################################################## - -prog=combustor -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -$prog > output_0.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" -fi - -diff -w output_0_blessed.txt output_0.txt > diff_out_0.txt -retnStat_0=$? - -${CANTERA_BIN}/csvdiff -a 1.0E-50 combustor_blessed_0.csv combustor_cxx.csv > diff_csv.txt -retnStat_csv_0=$? - -retnTotal=1 -if test $retnStat_0 = "0" -then - retnTotal=0 -fi - -retnCSVTotal=1 -if test $retnStat_csv_0 = "1" -then - retnCSVTotal=0 -fi - -if test $retnCSVTotal = "0" -then - echo "Successful test comparison on "`pwd` - if test $retnTotal = "1" - then - echo " But text files show differences see diff_out_0.txt" - fi -else - echo "Unsuccessful test comparison on "`pwd` " test" - if test $retnTotal != "0" - then - echo " files are different - see diff_test*.txt" - fi -fi - diff --git a/samples/cxx/flamespeed/runtest b/samples/cxx/flamespeed/runtest deleted file mode 100755 index 324c97d9e..000000000 --- a/samples/cxx/flamespeed/runtest +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output_0.txt flamespeed.csv diff_csv.txt diff_out_0.txt - -########################################################################## - -prog=flamespeed -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -$prog > output_0.txt < phi_input.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" -fi - -diff -w output_0_blessed.txt output_0.txt > diff_out_0.txt -retnStat_0=$? - -${CANTERA_BIN}/csvdiff -a 1.0E-50 flamespeed_blessed_0.csv flamespeed.csv > diff_csv.txt -retnStat_csv_0=$? - -retnTotal=1 -if test $retnStat_0 = "0" -then - retnTotal=0 -fi - -retnCSVTotal=1 -if test $retnStat_csv_0 = "1" -then - retnCSVTotal=0 -fi - -if test $retnCSVTotal = "0" -then - echo "Successful test comparison on "`pwd` - if test $retnTotal = "1" - then - echo " But text files show differences see diff_out_0.txt" - fi -else - echo "Unsuccessful test comparison on "`pwd` " test" - if test $retnTotal != "0" - then - echo " files are different - see diff_test*.txt" - fi -fi - diff --git a/samples/cxx/kinetics1/runtest b/samples/cxx/kinetics1/runtest deleted file mode 100755 index f851f104b..000000000 --- a/samples/cxx/kinetics1/runtest +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output_0.txt kin1.csv diff_csv.txt diff_out_0.txt output.txt output_a.txt - -########################################################################## - -prog=kinetics1 -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -$prog > output_0.txt <<+ -1.0 -+ -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" -fi - -${CANTERA_BIN}/exp3to2.sh output_0.txt > output_a.txt -cat output_a.txt | sed /'press any'/d > output.txt - - -diff -w output_0_blessed.txt output.txt > diff_out_0.txt -retnStat_0=$? - -${CANTERA_BIN}/csvdiff -a 1.0E-20 kin1_blessed_0.csv kin1.csv > diff_csv.txt -retnStat_csv_0=$? - -retnTotal=1 -if test $retnStat_0 = "0" -then - retnTotal=0 -fi - -retnCSVTotal=1 -if test $retnStat_csv_0 = "1" -then - retnCSVTotal=0 -fi - -if test $retnCSVTotal = "0" -then - echo "Successful test comparison on "`pwd` - if test $retnTotal = "1" - then - echo " But text files show differences see diff_out_0.txt" - fi -else - echo "Unsuccessful test comparison on "`pwd` " test" - if test $retnTotal != "0" - then - echo " files are different - see diff_test*.txt" - fi -fi - diff --git a/samples/cxx/rankine/runtest b/samples/cxx/rankine/runtest deleted file mode 100755 index 0ce67c457..000000000 --- a/samples/cxx/rankine/runtest +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output_0.txt diff_csv.txt diff_out_0.txt output.txt output_a.txt - -########################################################################## - -prog=rankine -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -$prog > output_0.txt <<+ -1.0 -+ -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" -fi - -${CANTERA_BIN}/exp3to2.sh output_0.txt > output_a.txt -cat output_a.txt | sed /'press any key'/d > output.txt - -diff -w output_0_blessed.txt output.txt > diff_out_0.txt -retnStat_0=$? - - -retnTotal=1 -if test $retnStat_0 = "0" -then - retnTotal=0 -fi - - -if test $retnTotal = "0" -then - echo "Successful test comparison on "`pwd` -else - echo "Unsuccessful test comparison on "`pwd` " test" - echo " txt files are different - see diff_test*.txt" -fi - diff --git a/samples/f77/runtest b/samples/f77/runtest deleted file mode 100755 index 402dae71b..000000000 --- a/samples/f77/runtest +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output_0.txt diff_csv.txt diff_out_0.txt - -########################################################################## - -prog=isentropic -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -$prog > output_0.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" -fi - -diff -w output_0_blessed.txt output_0.txt > diff_out_0.txt -retnStat_0=$? - - -############################################################ - -ctlib > output_1.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" -fi - -diff -w output_1_blessed.txt output_1.txt > diff_out_1.txt -retnStat_1=$? - - - -retnTotal=1 -if test $retnStat_0 = "0" -a $retnStat_1 = "0" -then - retnTotal=0 -fi - - -if test $retnTotal = "0" -then - echo "Successful test comparison on "`pwd` -else - echo "Unsuccessful test comparison on "`pwd` " test" - echo " txt files are different - see diff_test*.txt" -fi - diff --git a/test_problems/ChemEquil_ionizedGas/runtest b/test_problems/ChemEquil_ionizedGas/runtest deleted file mode 100755 index 713de1ed4..000000000 --- a/test_problems/ChemEquil_ionizedGas/runtest +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt table.csv diff_out.txt diff_csv.txt -testName="ChemEquil_ionizedGas" - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./ionizedGasEquil > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="1" - echo "ERROR: $testName: ionizedGasEquil returned with bad status, $retnStat, check output" -fi - -#diff -w output.txt output_blessed.txt > diff_out.txt -#retnStat_txt=$? -${CANTERA_BIN}/csvdiff -a 1.0E-19 table.csv table_blessed.csv > diff_csv.txt -retnStat_csv=$? - -eCode=1 -if test $retnStat_csv = "0" -then - eCode=0 - echo "Successful test comparison on " $testName -# if [ $retnStat_txt != "0" ] -# then -# echo " But, text output files have differences. See diff_out.txt" -# return 1 -# fi -else - echo "Unsuccessful test comparison on " $testName " test" - if test $retnStat_csv != "1" - then - echo " csv files are different - see diff_csv.txt" - return 1 - fi -# if test $retnStat_txt != "0" -# then -# echo " And, text output files have differences. See diff_out.txt" -# return 1 -# fi -fi -# -# -exit 0 diff --git a/test_problems/CpJump/runtest b/test_problems/CpJump/runtest deleted file mode 100755 index 85edfb427..000000000 --- a/test_problems/CpJump/runtest +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./CpJump > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "gri_pairs returned with bad status, $retnStat, check output" - exit 1 -fi - -../../bin/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on CpJump test" - exit 0 -else - echo "unsuccessful diff comparison on CpJump test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - diff --git a/test_problems/VPsilane_test/runtest b/test_problems/VPsilane_test/runtest deleted file mode 100755 index 474603001..000000000 --- a/test_problems/VPsilane_test/runtest +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -doDebug=@CANTERA_DEBUG_MODE@ -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./VPsilane_test > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "VPsilane_test returned with bad status, $retnStat, check output" -fi - -if test "x$doDebug" = "x1" -then -diff -w output.txt output_debug_blessed.txt > diff_test.out -retnStat=$? -else -diff -w output.txt output_blessed.txt > diff_test.out -retnStat=$? - -fi -if [ $retnStat = "0" ] -then - echo "successful diff comparison on VPsilane_test test" -else - echo "unsuccessful diff comparison on VPsilane_test test" - echo "FAILED" > csvCode.txt - temp_success="0" -fi - diff --git a/test_problems/cathermo/DH_graph_1/runtest b/test_problems/cathermo/DH_graph_1/runtest deleted file mode 100755 index 9a6a5043d..000000000 --- a/test_problems/cathermo/DH_graph_1/runtest +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# run_test -# -########################################################################## -# A couple of validity checks -if test ! $# -eq 0 ; then - echo 'usage: runtest' - echo ' ' - exit -1 -fi - -temp_success="0" -/bin/rm -f output.txt outputa.txt -########################################################################## -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -prog=DH_graph_1 -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -########################################################################## -/bin/rm -f test.out test.diff DH_graph_1.csv - -# echo 'Testing the DH dilute act calculation - act vs I' -./$prog DH_NaCl_dilute.xml > DH_graph_1.csv -retnStat=$? -diff DH_graph_1.csv DH_NaCl_dilute_blessed.csv > diff.out -zres=$? -if test "$zres" = "0" -a "$retnStat" = "0"; then - echo "successful diff comparison on $prog dilute test" -else - echo "unsuccessful diff comparison on $prog dilute test" - temp_success="1" - if [ $retnStat != "0" ] - then - echo "$prog returned with bad status, $retnStat, check output" - fi -fi - - - -########################################################################## -if test $temp_success = "0" ; then - echo "PASSED" > csvCode.txt - return 0 -else - echo "FAILED" > csvCode.txt - return 1 -fi diff --git a/test_problems/cathermo/HMW_dupl_test/runtest b/test_problems/cathermo/HMW_dupl_test/runtest deleted file mode 100755 index 414ea4f66..000000000 --- a/test_problems/cathermo/HMW_dupl_test/runtest +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -########################################################################## -prog=HMW_dupl_test -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -########################################################################## -/bin/rm -f test.out test.diff output.txt - -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin/} - -################################################################# - -./$prog HMW_NaCl_sp1977_alt.xml > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog exited with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $prog test" - exit 0 -else - echo "unsuccessful diff comparison on $prog test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - diff --git a/test_problems/cathermo/HMW_graph_CpvT/runtest b/test_problems/cathermo/HMW_graph_CpvT/runtest deleted file mode 100755 index c335ca1ff..000000000 --- a/test_problems/cathermo/HMW_graph_CpvT/runtest +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -########################################################################## -prog=HMW_graph_CpvT -if test ! -x $prog ; then - echo $prog ' does not exist' - exit 1 -fi -########################################################################## -/bin/rm -f test.out test.diff output.txt - -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -./$prog HMW_NaCl_sp1977_alt.xml > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" - exit 1 -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $prog test" - exit 0 -else - echo "unsuccessful diff comparison on $prog test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - diff --git a/test_problems/cathermo/HMW_graph_GvI/runtest b/test_problems/cathermo/HMW_graph_GvI/runtest deleted file mode 100755 index 8ebb6edad..000000000 --- a/test_problems/cathermo/HMW_graph_GvI/runtest +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# -temp_success="0" -/bin/rm -f output.txt outputa.txt - -########################################################################## -prog=HMW_graph_GvI -if test ! -x $prog ; then - echo $prog ' does not exist' - exit 1 -fi -########################################################################## -/bin/rm -f test.out test.diff output.txt -/bin/rm -f test.out test.diff T298.csv T523.csv - -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -./$prog > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="1" - echo "$prog returned with bad status, $retnStat, check output" - exit 1 -fi -diff T298.csv T298_blessed.csv > test.diff -zres=$? -diff T523.csv T523_blessed.csv > test2.diff -zres2=$? -if test "$zres" = "0" ; then - if test "$zres2" = "0" ; then - hhh="1" - else - temp_success="1" - fi -else - echo 'test 1 failed' - temp_success="1" -fi -if [ $temp_success = "0" ] -then - echo "successful diff comparison on $prog test" - exit 0 -else - echo "unsuccessful diff comparison on $prog test" - echo "FAILED" > csvCode.txt - exit 1 -fi - - diff --git a/test_problems/cathermo/HMW_graph_GvT/runtest b/test_problems/cathermo/HMW_graph_GvT/runtest deleted file mode 100755 index 24b9f0075..000000000 --- a/test_problems/cathermo/HMW_graph_GvT/runtest +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -########################################################################## -prog=HMW_graph_GvT -if test ! -x $prog ; then - echo $prog ' does not exist' - exit 1 -fi -########################################################################## -/bin/rm -f test.out test.diff output.txt - -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -./$prog HMW_NaCl_sp1977_alt.xml > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" - exit 1 -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $prog test" - exit 0 -else - echo "unsuccessful diff comparison on $prog test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 0 -fi - diff --git a/test_problems/cathermo/HMW_graph_HvT/runtest b/test_problems/cathermo/HMW_graph_HvT/runtest deleted file mode 100755 index d50da1e84..000000000 --- a/test_problems/cathermo/HMW_graph_HvT/runtest +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -########################################################################## -prog=HMW_graph_HvT -if test ! -x $prog ; then - echo $prog ' does not exist' - exit 1 -fi -########################################################################## -/bin/rm -f test.out test.diff output.txt - -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -./$prog HMW_NaCl_sp1977_alt.xml > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" - exit 1 -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $prog test" - exit 0 -else - echo "unsuccessful diff comparison on $prog test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - diff --git a/test_problems/cathermo/HMW_graph_VvT/runtest b/test_problems/cathermo/HMW_graph_VvT/runtest deleted file mode 100755 index c3edce8bc..000000000 --- a/test_problems/cathermo/HMW_graph_VvT/runtest +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -########################################################################## -prog=HMW_graph_VvT -if test ! -x $prog ; then - echo $prog ' does not exist' - exit 1 -fi -########################################################################## -/bin/rm -f test.out test.diff output.txt - -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -./$prog HMW_NaCl_sp1977_alt.xml > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" - exit 1 -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $prog test" - exit 0 -else - echo "unsuccessful diff comparison on $prog test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - diff --git a/test_problems/cathermo/HMW_test_1/runtest b/test_problems/cathermo/HMW_test_1/runtest deleted file mode 100755 index 6ef22d849..000000000 --- a/test_problems/cathermo/HMW_test_1/runtest +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" - -########################################################################## -prog=HMW_test_1 -if test ! -x $prog ; then - echo $prog ' does not exist' - exit 1 -fi -########################################################################## -/bin/rm -f output.txt outputa.txt -/bin/rm -f test.out test.diff output.txt diff_test.out -/bin/rm -f CheckDebug.txt output_bc.txt - -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -./$prog > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" - exit 1 -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -if [ -f CheckDebug.txt ] -then - cp output_blessed.txt output_bc.txt -else - cp output_noD_blessed.txt output_bc.txt -fi - -diff -w outputa.txt output_bc.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $prog test" - exit 0 -else - echo "unsuccessful diff comparison on $prog test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - diff --git a/test_problems/cathermo/VPissp/runtest b/test_problems/cathermo/VPissp/runtest deleted file mode 100755 index c751b28db..000000000 --- a/test_problems/cathermo/VPissp/runtest +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./ISSPTester > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "ISSPTester returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on VPissp test" - return 0 -else - echo "unsuccessful diff comparison on VPissp test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/ims/runtest b/test_problems/cathermo/ims/runtest deleted file mode 100755 index cbbd54163..000000000 --- a/test_problems/cathermo/ims/runtest +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./IMSTester > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "IMSTester returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on IMSTester test" - return 0 -else - echo "unsuccessful diff comparison on IMSTester test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/issp/runtest b/test_problems/cathermo/issp/runtest deleted file mode 100755 index 9e9352e18..000000000 --- a/test_problems/cathermo/issp/runtest +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./ISSPTester > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "ISSPTester returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on issp test" - return 0 -else - echo "unsuccessful diff comparison on issp test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/stoichSubSSTP/runtest b/test_problems/cathermo/stoichSubSSTP/runtest deleted file mode 100755 index f127200b3..000000000 --- a/test_problems/cathermo/stoichSubSSTP/runtest +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -########################################################################## -prog=stoichSubSSTP -if test ! -x $prog ; then - echo $prog ' does not exist' - exit -1 -fi -########################################################################## -/bin/rm -f test.out test.diff output.txt - -################################################################# -# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} - -################################################################# - -./$prog > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$prog returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $prog test" - return 0 -else - echo "unsuccessful diff comparison on $prog test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/testIAPWS/runtest b/test_problems/cathermo/testIAPWS/runtest deleted file mode 100755 index 6d543ced3..000000000 --- a/test_problems/cathermo/testIAPWS/runtest +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -testName=testIAPWSphi -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./testIAPWSphi > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$testName returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $testName test" - return 0 -else - echo "unsuccessful diff comparison on $testName test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/testIAPWSPres/runtest b/test_problems/cathermo/testIAPWSPres/runtest deleted file mode 100755 index 328ce8373..000000000 --- a/test_problems/cathermo/testIAPWSPres/runtest +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -testName=testIAPWSPress -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./testPress > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$testName returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $testName test" - return 0 -else - echo "unsuccessful diff comparison on $testName test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/testIAPWSTripP/runtest b/test_problems/cathermo/testIAPWSTripP/runtest deleted file mode 100755 index be06f912d..000000000 --- a/test_problems/cathermo/testIAPWSTripP/runtest +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -testName=testTripleP -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./testTripleP > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$testName returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $testName test" - return 0 -else - echo "unsuccessful diff comparison on $testName test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/testWaterPDSS/runtest b/test_problems/cathermo/testWaterPDSS/runtest deleted file mode 100755 index 92855379a..000000000 --- a/test_problems/cathermo/testWaterPDSS/runtest +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -testName=testWaterPDSS -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./testWaterPDSS > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$testName returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $testName test" - return 0 -else - echo "unsuccessful diff comparison on $testName test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/testWaterTP/runtest b/test_problems/cathermo/testWaterTP/runtest deleted file mode 100755 index c6bfcf1cb..000000000 --- a/test_problems/cathermo/testWaterTP/runtest +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -testName=testWaterTP -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./testWaterSSTP > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$testName returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $testName test" - return 0 -else - echo "unsuccessful diff comparison on $testName test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cathermo/wtWater/runtest b/test_problems/cathermo/wtWater/runtest deleted file mode 100755 index 76018c121..000000000 --- a/test_problems/cathermo/wtWater/runtest +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -testName=wtWater -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../../bin} -./wtWater > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$testName returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $testName test" - return 0 -else - echo "unsuccessful diff comparison on $testName test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/cxx_ex/runtest b/test_problems/cxx_ex/runtest deleted file mode 100755 index 0e1768c39..000000000 --- a/test_problems/cxx_ex/runtest +++ /dev/null @@ -1,191 +0,0 @@ -#!/bin/sh -# -temp_success="1" -/bin/rm -f eq1.csv tr1.csv tr2.csv kin1.csv kin2.csv \ - kin1_blessed_tmp.csv kin2_blessed_tmp.csv - -echo " " -echo "***************************************************" -echo " Testing the Cantera C++ Examples " -echo "***************************************************" -echo " " -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -cxx_examples > cxx_examples.out -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "cxx_examples returned with bad status, $retnStat, check output" - exit 1 -fi - -# -# Machine dependent blessed files require knowing the machType -# -#machType=`../../bin/get_arch` -machType='linux' - - -################################################################# -# -################################################################# - -$CANTERA_BIN/csvdiff eq1.csv eq1_blessed.csv > eq1_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful csv comparison on eq1 test" -else - echo "########################################################" - echo "unsuccessful csv comparison on eq1 test" - echo " For more information, see files:" - echo " test_problems/cxx_ex/eq1_test.out" - echo " test_problems/cxx_ex/eq1.csv" - echo " test_problems/cxx_ex/eq1_blessed.csv" - echo "########################################################" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - -################################################################# -# -################################################################# - -$CANTERA_BIN/csvdiff tr1.csv tr1_blessed.csv > tr1_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful csv comparison on tr1 test" - if [ $temp_success = "1" ] - then - echo "PASSED" > csvCode.txt - fi -else - echo "########################################################" - echo "unsuccessful csv comparison on tr1 test" - echo " For more information, see files:" - echo " test_problems/cxx_ex/tr1_test.out" - echo " test_problems/cxx_ex/tr1.csv" - echo " test_problems/cxx_ex/tr1_blessed.csv" - echo "########################################################" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - -################################################################# -# -################################################################# - -$CANTERA_BIN/csvdiff tr2.csv tr2_blessed.csv > tr2_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful csv comparison on tr2 test" - if [ $temp_success = "1" ] - then - echo "PASSED" > csvCode.txt - fi -else - echo "########################################################" - echo "unsuccessful csv comparison on tr2 test" - echo " For more information, see files:" - echo " test_problems/cxx_ex/tr2_test.out" - echo " test_problems/cxx_ex/tr2.csv" - echo " test_problems/cxx_ex/tr2_blessed.csv" - echo "########################################################" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - -################################################################# -# KIN1 -> Test for compliance -################################################################# -# -# Currently kin1 is creating a machine dependent result: -# -> difference is in one time in minor components during the middle -# of a large change. -# -cp kin1_blessed.csv kin1_blessed_tmp.csv -if test x"$machType" = "xcygwin" ; then - /bin/cp kin1_blessed_win.csv kin1_blessed_tmp.csv -fi - -$CANTERA_BIN/csvdiff -r 3.0E-3 kin1.csv kin1_blessed_tmp.csv > kin1_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful csv comparison on kin1 test" - if [ $temp_success = "1" ] - then - echo "PASSED" > csvCode.txt - fi -else - echo "########################################################" - echo "unsuccessful csv comparison on kin1 test" - echo " For more information, see files:" - echo " test_problems/cxx_ex/kin1_test.out" - echo " test_problems/cxx_ex/kin1.csv" - echo " test_problems/cxx_ex/kin1_blessed_tmp.csv" - echo "########################################################" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - -################################################################# -# kin3 test -> check for compliance -################################################################# -# -# Currently kin3 is creating a machine dependent result: -# -> difference is in one time in minor components during the middle -# of a large change. -# -cp kin3_blessed.csv kin3_blessed_tmp.csv -if test x"$machType" = "xcygwin" ; then - /bin/cp kin3_blessed_win.csv kin3_blessed_tmp.csv -fi - -$CANTERA_BIN/csvdiff kin3.csv kin3_blessed_tmp.csv > kin3_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful csv comparison on kin3 test" - if [ $temp_success = "1" ] - then - echo "PASSED" > csvCode.txt - fi -else - echo "########################################################" - echo "unsuccessful csv comparison on kin3 test" - echo " For more information, see files:" - echo " test_problems/cxx_ex/kin3_test.out" - echo " test_problems/cxx_ex/kin3.csv" - echo " test_problems/cxx_ex/kin3_blessed_tmp.csv" - echo "########################################################" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi -if [ $temp_success = "1" ] -then - echo 'cxx_examples csv test PASSED!' - exit 0 -else - echo 'cxx_examples csv test FAILED!' - exit 1 -fi - -echo - -################################################################# -# -################################################################# - diff --git a/test_problems/diamondSurf/runtest b/test_problems/diamondSurf/runtest deleted file mode 100755 index e50d0d489..000000000 --- a/test_problems/diamondSurf/runtest +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# -# - -temp_success="1" -/bin/rm -f output.txt outputa.txt -tname="diamondSurf" - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./runDiamond diamond_blessed.xml > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "runDiamond ($tname test) returned with bad status, $retnStat, check output" - exit 1 -fi - -../../bin/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt runDiamond_blessed.out > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $tname test" - exit 0 -else - echo "unsuccessful diff comparison on $tname test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - -../../bin/exp3to2.sh diamond.xml > diamonda.xml -diff -w diamonda.xml diamond_blessed.xml > xml_diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $tname diamond.xml test" - exit 0 -else - echo "unsuccessful diff comparison on $thame diamond.xml test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - - diff --git a/test_problems/diamondSurf_dupl/runtest b/test_problems/diamondSurf_dupl/runtest deleted file mode 100755 index 8cbd4d30d..000000000 --- a/test_problems/diamondSurf_dupl/runtest +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# - -temp_success="1" -/bin/rm -f output.txt outputa.txt diff_test.txt -tname="diamondSurf_dupl" - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./runDiamondDupl > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "runDiamond ($tname test) returned with bad status, $retnStat, check output" - exit 1 -fi - -../../bin/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.txt -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $tname test" - exit 0 -else - echo "unsuccessful diff comparison on $tname test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - - diff --git a/test_problems/mixGasTransport/runtest b/test_problems/mixGasTransport/runtest deleted file mode 100755 index 422ba6580..000000000 --- a/test_problems/mixGasTransport/runtest +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# - -temp_success="1" -/bin/rm -f output.txt outputa.txt -tname="mixGasTransport" -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./mixGasTransport > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$tname ($tname test) returned with bad status, $retnStat, check output" - return 1 -fi - -../../bin/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $tname test" - return 0 -else - echo "unsuccessful diff comparison on $tname test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/multiGasTransport/runtest b/test_problems/multiGasTransport/runtest deleted file mode 100755 index 5b87cb030..000000000 --- a/test_problems/multiGasTransport/runtest +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# - -temp_success="1" -/bin/rm -f output.txt outputa.txt -tname="multiGasTransport" - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./multiGasTransport > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$tname ($tname test) returned with bad status, $retnStat, check output" - exit 1 -fi - -../../bin/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $tname test" - exit 0 -else - echo "unsuccessful diff comparison on $tname test" - echo "FAILED" > csvCode.txt - temp_success="0" - exit 1 -fi - diff --git a/test_problems/pureFluidTest/runtest b/test_problems/pureFluidTest/runtest deleted file mode 100755 index 5f00f43ef..000000000 --- a/test_problems/pureFluidTest/runtest +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -testName=pureFluidTest_Water -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./testPureWater > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "$testName returned with bad status, $retnStat, check output" -fi - -$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on $testName test" - return 0 -else - echo "unsuccessful diff comparison on $testName test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/rankine_democxx/runtest b/test_problems/rankine_democxx/runtest deleted file mode 100755 index f25678108..000000000 --- a/test_problems/rankine_democxx/runtest +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt -testName="rankine" - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:="../../data/inputs"} -export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./rankine > output.txt -retnStat=$? -if test $retnStat != "0" -then - temp_success="0" - echo "$testName returned with bad status, $retnStat, check output" - exit 1 -fi - -diff -w output.txt output_blessed.txt > diff_test.out -retnStat=$? -if test $retnStat = "0" -then - echo "successful diff comparison on $testName test" - return 0 -else - echo "unsuccessful diff comparison on $testName test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/silane_equil/runtest b/test_problems/silane_equil/runtest deleted file mode 100755 index b6fcd134f..000000000 --- a/test_problems/silane_equil/runtest +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# -temp_success="1" -/bin/rm -f output.txt outputa.txt - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./silane_equil > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "silane_equil returned with bad status, $retnStat, check output" -fi - -../../bin/exp3to2.sh output.txt > outputa.txt -diff -w outputa.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on silane_equil test" - return 0 -else - echo "unsuccessful diff comparison on silane_equil test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi - diff --git a/test_problems/surfSolverTest/runtest b/test_problems/surfSolverTest/runtest deleted file mode 100755 index b54b19154..000000000 --- a/test_problems/surfSolverTest/runtest +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# -# - -temp_success="1" -/bin/rm -f output.txt diff_test.txt results.txt diff_csv.txt -tname="surfaceSolver" - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./surfaceSolver haca2.xml > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "surfaceSolver ($tname test) returned with bad status, $retnStat, check output" -fi -diff results.txt results_blessed.txt > diff_csv.txt -retnStat_csv=$? - -diff -w output.txt surfaceSolver_blessed.out > diff_out.txt -retnStat_txt=$? - -if test $retnStat_csv = "0" -then - echo "Successful test comparison on "`pwd` - if [ $retnStat_txt != "0" ] - then - echo " But, text output files have differences. See diff_out.txt" - return 1 - fi -else - echo "Unsuccessful test comparison on "`pwd` " test" - if test $retnStat_csv != "0" - then - echo " results files are different - see diff_csv.txt" - return 1 - fi - if test $retnStat_txt != "0" - then - echo " And, text output files have differences. See diff_out.txt" - return 1 - fi -fi - -return 0 - - diff --git a/test_problems/surfkin/runtest b/test_problems/surfkin/runtest deleted file mode 100755 index 460789937..000000000 --- a/test_problems/surfkin/runtest +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# - -temp_success="1" -/bin/rm -f output.txt - -################################################################# -# -################################################################# -CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA - -CANTERA_BIN=${CANTERA_BIN:=../../bin} -./surfdemo > output.txt -retnStat=$? -if [ $retnStat != "0" ] -then - temp_success="0" - echo "surfdemo returned with bad status, $retnStat, check output" -fi - -diff -w output.txt output_blessed.txt > diff_test.out -retnStat=$? -if [ $retnStat = "0" ] -then - echo "successful diff comparison on surfkin test" - return 0 -else - echo "unsuccessful diff comparison on surfkin test" - echo "FAILED" > csvCode.txt - temp_success="0" - return 1 -fi -