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

[cantera]: adding silane_equil test

Browse source
This commit is contained in:
Nicholas Malaya 2012-02-07 17:29:32 +00:00
parent aa02a1a699
commit 483bcab744
7 changed files with 59 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -105,6 +105,7 @@ AC_OUTPUT(Makefile \
test_problems/NASA9poly_test/Makefile \
test_problems/printUtilUnitTest/Makefile \
test_problems/pureFluidTest/Makefile \
test_problems/silane_equil/Makefile \
test_problems/cathermo/Makefile \
test_problems/cathermo/DH_graph_1/Makefile \
test_problems/cathermo/DH_graph_acommon/Makefile \
@ -158,6 +159,7 @@ AC_OUTPUT(Makefile \
# skipped tests
# test_problems/ck2cti/Makefile
# test_problems/nasa9_reader/Makefile
# test_problems/rankine_democxx/Makefile \
# FINAL SUMMARY

6
test_problems/Makefile.am
View file

@ -1,16 +1,18 @@
#SUBDIRS = surfkin silane_equil VPsilance_test \
#SUBDIRS = surfkin VPsilance_test \
diamondSurf_dupl surfSolverTest
SUBDIRS = cathermo mixGasTransport ChemEquil_gri_matrix ChemEquil_gri_pairs
SUBDIRS += ChemEquil_ionizedGas ChemEquil_red1 CpJump cxx_ex diamondSurf
SUBDIRS += diamondSurf_dupl fracCoeff multiGasTransport NASA9poly_test
SUBDIRS += negATest printUtilUnitTest pureFluidTest
SUBDIRS += negATest printUtilUnitTest pureFluidTest silane_equil
# skipped:
# ck2cti_test
# nasa9_reader (uses ck2cti)
# python
# rankine_democxx
EXTRA_DIST =

23
test_problems/rankine_democxx/Makefile.am Normal file
View file

@ -0,0 +1,23 @@
cc_sources = rankine.cpp
INC = -I. -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = rankine
library_includedir = $(INC)
#-----------------------
# Cantera DH graph test
#-----------------------
rankine_SOURCES = $(cc_sources)
TESTS_ENVIRONMENT =
TESTS = runtest

4
test_problems/rankine_democxx/rankine.cpp
View file

@ -3,8 +3,8 @@
#include <string>
#include <map>
#include <cantera/Cantera.h>
#include <cantera/PureFluid.h> // defines class Water
#include <Cantera.h>
#include <PureFluid.h> // defines class Water
using namespace Cantera;
using namespace std;

3
test_problems/rankine_democxx/runtest
View file

@ -18,6 +18,7 @@ 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
@ -25,9 +26,11 @@ 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

23
test_problems/silane_equil/Makefile.am Normal file
View file

@ -0,0 +1,23 @@
cc_sources = silane_equil.cpp
INC = -I. -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = silane_equil
library_includedir = $(INC)
#-----------------------
# Cantera DH graph test
#-----------------------
silane_equil_SOURCES = $(cc_sources)
TESTS_ENVIRONMENT =
TESTS = runtest

2
test_problems/silane_equil/runtest
View file

@ -24,9 +24,11 @@ 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