From 66325195369dfb45c8126025066a1db1c0031756 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Tue, 3 Aug 2004 16:35:37 +0000 Subject: [PATCH] *** empty log message *** --- Cantera/cxx/demos/Makefile.in | 2 +- Cantera/python/Makefile.in | 6 +++++ config/configure | 3 ++- config/configure.in | 1 + examples/cxx/Makefile.in | 2 +- test_problems/cxx_ex/gri30.xml | 42 +++++++++++++++++++++++++++++++++- 6 files changed, 52 insertions(+), 4 deletions(-) diff --git a/Cantera/cxx/demos/Makefile.in b/Cantera/cxx/demos/Makefile.in index 39cce3259..464f2da64 100644 --- a/Cantera/cxx/demos/Makefile.in +++ b/Cantera/cxx/demos/Makefile.in @@ -45,7 +45,7 @@ CANTERA_LIBS = CANTERA_INCDIR=@ctroot@/build/include # flags passed to the C++ compiler/linker for the linking step -LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIR@ @CXXFLAGS@ +LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # how to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: diff --git a/Cantera/python/Makefile.in b/Cantera/python/Makefile.in index 842f86dea..46f3e5ab2 100755 --- a/Cantera/python/Makefile.in +++ b/Cantera/python/Makefile.in @@ -65,6 +65,12 @@ clean: depends: echo '-' +test: + cd examples; @PYTHON_CMD@ reactor1.py &> reactor1.out + cd examples; @PYTHON_CMD@ flame1.py &> flame1.out + cd examples; @PYTHON_CMD@ diamond.py &> diamond.out + cd examples; @PYTHON_CMD@ critProperties.py &> critProperties.out + # end of file diff --git a/config/configure b/config/configure index cbc28779e..bdf87deec 100755 --- a/config/configure +++ b/config/configure @@ -3915,7 +3915,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_config_files="$ac_config_files ../Cantera/Makefile ../Cantera/src/Makefile ../Cantera/src/zeroD/Makefile ../Cantera/src/oneD/Makefile ../Cantera/src/converters/Makefile ../Cantera/src/transport/Makefile ../Cantera/clib/src/Makefile ../Cantera/fortran/src/Makefile ../Cantera/fortran/f77demos/f77demos.mak ../Cantera/fortran/f77demos/isentropic.dsp ../Cantera/matlab/Makefile ../Cantera/matlab/setup_matlab.py ../Cantera/matlab/setup_winmatlab.py ../Cantera/python/Makefile ../Cantera/python/setup.py ../Cantera/cxx/Makefile ../Cantera/cxx/src/Makefile ../Cantera/cxx/demos/Makefile ../Cantera/user/Makefile ../Cantera/python/src/Makefile ../ext/lapack/Makefile ../ext/blas/Makefile ../ext/cvode/Makefile ../ext/math/Makefile ../ext/tpx/Makefile ../ext/Makefile ../ext/recipes/Makefile ../examples/Makefile ../examples/cxx/Makefile ../Makefile ../tools/Makefile ../tools/src/Makefile ../tools/src/sample.mak ../tools/src/finish_install.py ../tools/src/package4mac ../tools/templates/f77/demo.mak ../tools/templates/cxx/demo.mak ../tools/testtools/Makefile ../data/inputs/Makefile ../test_problems/Makefile ../test_problems/cxx_ex/Makefile ../test_problems/silane_equil/Makefile ../test_problems/surfkin/Makefile ../test_problems/diamondSurf/Makefile ../test_problems/ck2cti_test/runtest ../test_problems/ck2cti_test/Makefile" + ac_config_files="$ac_config_files ../Cantera/Makefile ../Cantera/src/Makefile ../Cantera/src/zeroD/Makefile ../Cantera/src/oneD/Makefile ../Cantera/src/converters/Makefile ../Cantera/src/transport/Makefile ../Cantera/clib/src/Makefile ../Cantera/fortran/src/Makefile ../Cantera/fortran/f77demos/f77demos.mak ../Cantera/fortran/f77demos/isentropic.dsp ../Cantera/matlab/Makefile ../Cantera/matlab/setup_matlab.py ../Cantera/matlab/setup_winmatlab.py ../Cantera/python/Makefile ../Cantera/python/setup.py ../Cantera/cxx/Makefile ../Cantera/cxx/src/Makefile ../Cantera/cxx/demos/Makefile ../Cantera/user/Makefile ../Cantera/python/src/Makefile ../ext/lapack/Makefile ../ext/blas/Makefile ../ext/cvode/Makefile ../ext/math/Makefile ../ext/tpx/Makefile ../ext/Makefile ../ext/recipes/Makefile ../examples/Makefile ../examples/cxx/Makefile ../Makefile ../tools/Makefile ../tools/src/Makefile ../tools/src/sample.mak ../tools/src/finish_install.py ../tools/src/package4mac ../tools/templates/f77/demo.mak ../tools/templates/cxx/demo.mak ../tools/testtools/Makefile ../data/inputs/Makefile ../test_problems/Makefile ../test_problems/cxx_ex/Makefile ../test_problems/silane_equil/Makefile ../test_problems/surfkin/Makefile ../test_problems/diamondSurf/Makefile ../test_problems/ck2cti_test/runtest ../test_problems/ck2cti_test/Makefile ../test_problems/python/Makefile" test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -4433,6 +4433,7 @@ do "../test_problems/diamondSurf/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../test_problems/diamondSurf/Makefile" ;; "../test_problems/ck2cti_test/runtest" ) CONFIG_FILES="$CONFIG_FILES ../test_problems/ck2cti_test/runtest" ;; "../test_problems/ck2cti_test/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../test_problems/ck2cti_test/Makefile" ;; + "../test_problems/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../test_problems/python/Makefile" ;; "../config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ../config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/config/configure.in b/config/configure.in index 6c13d5d46..a2e5da40c 100755 --- a/config/configure.in +++ b/config/configure.in @@ -694,6 +694,7 @@ AC_OUTPUT(../Cantera/Makefile \ ../test_problems/diamondSurf/Makefile \ ../test_problems/ck2cti_test/runtest \ ../test_problems/ck2cti_test/Makefile \ + ../test_problems/python/Makefile \ ) # ) if test "x${OS_IS_WIN}" = "x1"; then diff --git a/examples/cxx/Makefile.in b/examples/cxx/Makefile.in index 4491dd34c..43f97effa 100755 --- a/examples/cxx/Makefile.in +++ b/examples/cxx/Makefile.in @@ -59,7 +59,7 @@ CANTERA_LIBS = CANTERA_INC=-I@ctroot@/build/include/cantera # flags passed to the C++ compiler/linker for the linking step -LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIR@ @CXXFLAGS@ +LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # how to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: diff --git a/test_problems/cxx_ex/gri30.xml b/test_problems/cxx_ex/gri30.xml index fdbee1b26..ad168f908 100644 --- a/test_problems/cxx_ex/gri30.xml +++ b/test_problems/cxx_ex/gri30.xml @@ -18,10 +18,50 @@ 101325.0 - + + + + + + + O H C N Ar + + H2 H O O2 OH H2O HO2 H2O2 C CH + CH2 CH2(S) CH3 CH4 CO CO2 HCO CH2O CH2OH CH3O + CH3OH C2H C2H2 C2H3 C2H4 C2H5 C2H6 HCCO CH2CO HCCOH + N NH NH2 NH3 NNH NO NO2 N2O HNO CN + HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7 + C3H8 CH2CHO CH3CHO + + + 300.0 + 101325.0 + + + + + + O H C N Ar + + H2 H O O2 OH H2O HO2 H2O2 C CH + CH2 CH2(S) CH3 CH4 CO CO2 HCO CH2O CH2OH CH3O + CH3OH C2H C2H2 C2H3 C2H4 C2H5 C2H6 HCCO CH2CO HCCOH + N NH NH2 NH3 NNH NO NO2 N2O HNO CN + HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7 + C3H8 CH2CHO CH3CHO + + + 300.0 + 101325.0 + + + + + +