research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3550 commits 2 branches 16 tags 37 MiB
Commit graph

53 commits

Author SHA1 Message Date
Ray Speth
0b8d2ec223 Removed includes of Cantera.h from the regression tests 2012-02-15 01:00:46 +00:00
Ray Speth
1bffc6e150 Fix include paths for tests and samples 2012-02-12 02:47:21 +00:00
Ray Speth
a6f939c2fe Applied consistent formatting to all C++ code 
Done using astyle:
astyle --style=kr --add-brackets --indent=spaces=4 --indent-col1-comments --unpad-paren --pad-header --align-pointer=type --lineend=linux
 2012-02-10 17:24:00 +00:00
Ray Speth
75db210a43 Merge branch 'pecos_autotools' into 'trunk' 
This merge skips some of the source tree rearrangement from the
autotools branch, so the autotools build system is not presently
working.

Conflicts:
	Cantera/cxx/include/kinetics.h
	Cantera/cxx/include/zerodim.h
	Cantera/cxx/src/Cantera.h
	Cantera/cxx/src/importPhase.cpp
	Cantera/cxx/src/importPhase.h
	Cantera/cxx/src/thermo.h
	Cantera/cxx/src/transport.h
	Cantera/ext/f2c_libs/arith.hwin32
	Cantera/ext/f2c_libs/arithchk.c
	Cantera/ext/f2c_libs/ftell64_.c
	Cantera/ext/f2c_libs/pow_qq.c
	Cantera/ext/f2c_libs/qbitbits.c
	Cantera/ext/f2c_libs/qbitshft.c
	Cantera/ext/f2c_math/mkl_cblas.h
	Cantera/ext/f2c_recipes/Makefile.in
	Cantera/ext/f2c_recipes/simp1.c
	Cantera/ext/f2c_recipes/simp2.c
	Cantera/ext/f2c_recipes/simp3.c
	Cantera/ext/f2c_recipes/simplx.c
	Cantera/ext/f2c_recipes/splie2.c
	Cantera/ext/f2c_recipes/splin2.c
	Cantera/ext/f2c_recipes/spline.c
	Cantera/ext/f2c_recipes/splint.c
	Cantera/ext/recipes/Makefile.in
	Cantera/ext/recipes/simp1.f
	Cantera/ext/recipes/simp2.f
	Cantera/ext/recipes/simp3.f
	Cantera/ext/recipes/simplx.f
	Cantera/ext/recipes/splie2.f
	Cantera/ext/recipes/splin2.f
	Cantera/ext/recipes/spline.f
	Cantera/ext/recipes/splint.f
	Cantera/ext/tpx/CMakeLists.txt
	Cantera/ext/tpx/ideal.cpp
	Cantera/ext/tpx/lkw.cpp
	Cantera/ext/tpx/lkw.h
	Cantera/src/base/config.h.in
	Cantera/src/converters/ck2ctml.cpp
	Cantera/src/converters/ck2ctml.h
	Cantera/src/numerics/NonlinearSolver.cpp
	Cantera/src/numerics/ctlapack.h
	Cantera/src/numerics/sort.cpp
	ChangeLog
	License.rtf
	docs/install_examples/cygwin_gcc344_f2c_numeric.sh
	docs/install_examples/linux.64_sierra_gcc444_python264_numpy
	docs/install_examples/linux_rhel5_64_gcc424_dbg_python264_numpy
	docs/install_examples/sol10_64bit_CC57_py24_numarray
	examples/cxx/flame1.cpp
	ext/f2c_libs/arithchk.c
	ext/f2c_libs/arithchk/arithchk.c
	ext/math/gmres.h
	test_problems/ChemEquil_gri_pairs/runtest
	test_problems/ChemEquil_ionizedGas/runtest
	test_problems/ChemEquil_red1/basopt_red1.cpp
	test_problems/VCSnonideal/NaCl_equil/Makefile.in
	test_problems/VPsilane_test/runtest
	test_problems/cathermo/DH_graph_1/runtest
	test_problems/cathermo/DH_graph_NM/runtest
	test_problems/cathermo/DH_graph_Pitzer/runtest
	test_problems/cathermo/DH_graph_acommon/runtest
	test_problems/cathermo/DH_graph_bdotak/runtest
	test_problems/cathermo/HMW_dupl_test/runtest
	test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
	test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
	test_problems/cathermo/VPissp/runtest
	test_problems/cathermo/ims/runtest
	test_problems/cathermo/issp/runtest
	test_problems/cathermo/stoichSubSSTP/runtest
	test_problems/cathermo/testIAPWS/runtest
	test_problems/cathermo/testIAPWSPres/runtest
	test_problems/cathermo/testIAPWSTripP/runtest
	test_problems/cathermo/testWaterPDSS/runtest
	test_problems/cathermo/testWaterTP/runtest
	test_problems/cathermo/wtWater/runtest
	test_problems/cxx_ex/equil_example1.cpp
	test_problems/cxx_ex/examples.cpp
	test_problems/cxx_ex/kinetics_example1.cpp
	test_problems/cxx_ex/kinetics_example2.cpp
	test_problems/cxx_ex/kinetics_example3.cpp
	test_problems/cxx_ex/rxnpath_example1.cpp
	test_problems/cxx_ex/transport_example1.cpp
	test_problems/cxx_ex/transport_example2.cpp
	test_problems/mixGasTransport/runtest
	test_problems/nasa9_reader/runtest
	test_problems/negATest/runtest
	test_problems/printUtilUnitTest/runtest
	test_problems/pureFluidTest/runtest
	test_problems/rankine_democxx/runtest
	test_problems/silane_equil/runtest
	test_problems/surfSolverTest/runtest
	test_problems/surfSolverTest/runtest2
	test_problems/surfkin/runtest
	tools/testtools/Makefile.in
 2012-02-10 16:22:02 +00:00
Nicholas Malaya
c599918145 [cantera]: adding cxx_ex test (successfully) 2012-02-07 00:48:32 +00:00
Ray Speth
32afe97ebd Removed 'using namespace Cantera' from all header files 2012-01-23 03:37:08 +00:00
Ray Speth
c708682e56 Removed 'using namespace std' from all header files 2012-01-23 03:36:42 +00:00
Ray Speth
ffec1b052a Combined CanteraZeroD and CanteraSpectra namespaces with Cantera 2012-01-23 03:36:13 +00:00
Ray Speth
d832f32625 Eliminated the Cantera_CXX namespace 2012-01-23 03:35:46 +00:00
Ray Speth
453576f0ad Removed MSVC-specific compiler warning suppression 2012-01-17 04:09:18 +00:00
Ray Speth
32bcd0314f Removed a few unused files from the regression tests 2012-01-09 17:35:51 +00:00
Ray Speth
b6fa3d9701 Made results of 'cxx_ex' test consistent 2012-01-09 17:35:43 +00:00
Ray Speth
b88846e5e0 Fixed C++ tests that were failing under Windows 
Visual Studio defaults to 3-digit exponents when printing in scientific
notation. The tests now use a MSVC-specific function to change this
behavior when necessary.
 2012-01-09 17:35:28 +00:00
Ray Speth
9e1fdfe39a Eliminated CVS keyword cruft 2012-01-09 17:32:01 +00:00
Nicholas Malaya
92abf1f919 [cantera]: changing relative directory of all generated libraries to build directory, in keeping with cantera 1.8 standard. Next: make working 'make check'! 2012-01-04 00:42:46 +00:00
Ray Speth
71588d307d Remove files for Autotools and Visual Studio build systems 2011-12-14 19:38:10 +00:00
Ray Speth
5c95d30807 Use relative tolerances for comparing csv file in regression tests 
Each test can have a different threshold and tolerance, reducing the
need to recreate blessed output files in response to small numerical
changes.
 2011-12-14 05:55:35 +00:00
Ray Speth
9ff2c93615 Modified the cxx_ex tests to generate consistent output 2011-12-14 05:55:29 +00:00
Ray Speth
ea63e3163a Moved remaining C++ tests out of examples/cxx 2011-12-14 05:55:11 +00:00
Harry Moffat
4811459364 Changed the csvdiff default return value. 
Now a return of 0 indicates a success.
  Previously a return of 1 indicated a success. Please note!
 2010-04-02 19:29:07 +00:00
Harry Moffat
9023c30cd8 took out an unused command from the clean rule. 2010-02-09 19:44:37 +00:00
Harry Moffat
201117842e ignore list maintenance. 2009-07-29 15:22:58 +00:00
Harry Moffat
70647c85ed Initial Import 2009-07-27 23:17:19 +00:00
Harry Moffat
25bb63376a Rebaselined this file. 
The title line was wrong, and csvdiff is now comparing title lines.
 2007-04-13 16:47:45 +00:00
Harry Moffat
88f4866882 Relaxed the tolerance on the comparison for the kin1 problem. 
It had failed on SUSE problems
 2006-08-14 19:32:55 +00:00
Harry Moffat
93427d1f42 Commented out CANTERA_DATA statement. On the x86-linux1 cf machine, this 
was causing the test to crash for some reason.
 2006-06-20 23:52:32 +00:00
Harry Moffat
90a83569d0 Rebaselined the blessed state, due to a small change in 
initial conditions.
 2006-05-03 18:07:01 +00:00
Harry Moffat
2f5bf8b7fb Added a new test that pretty much mimics the frac python test. 
It does add tests for the calculation of equilibrium constants
for fractional coefficient reactions.
 2006-04-30 18:06:56 +00:00
Dave Goodwin
53cbe7e119 *** empty log message *** 2006-04-11 07:15:48 +00:00
Harry Moffat
bd47fc101c Rebaselined the kin1 problem after taking a close look at the 
results. At one time plane, a couple of the radicals concentrations
changed at the ~5.0E-3 level. This seems to be a nontrivial change,
however, I this we should let it pass.
I sense this problem could be made more stable if the nonlinear
convergence requirements were made a lot stricter, while maintaining
the same time step truncation error tolerances.
 2006-03-03 15:27:14 +00:00
Dave Goodwin
a6b65715d7 *** empty log message *** 2005-09-13 17:10:43 +00:00
Dave Goodwin
9e54a6857e *** empty log message *** 2005-07-22 04:02:05 +00:00
Harry Moffat
177b67b248 Made the blessed files machine dependent for this test. 2004-09-16 17:51:28 +00:00
Harry Moffat
447a76e55b Changed required file from gri30.xml to gri30.cti. 2004-08-06 20:26:55 +00:00
Dave Goodwin
6632519536 *** empty log message *** 2004-08-03 16:35:37 +00:00
Harry Moffat
11d73d12c1 Added depends target to makefiles 2004-07-29 22:14:33 +00:00
Dave Goodwin
cb97e7387a added comments 2004-06-04 05:19:30 +00:00
Dave Goodwin
47a520dffb reverted to previus version due to error in last versions 2004-05-17 16:23:56 +00:00
Dave Goodwin
76f82b2341 updated blessed files due to slight change in how Nasa polynomial thermo properties computed 2004-04-24 12:50:00 +00:00
Dave Goodwin
d68036396e *** empty log message *** 2004-04-23 19:02:13 +00:00
Dave Goodwin
319263100e *** empty log message *** 2004-02-08 13:09:02 +00:00
Harry Moffat
9ff04adb41 Changed the blessed files. There was a small change in the actual 
answer.
 2004-01-14 16:30:19 +00:00
Dave Goodwin
88a5ab4ebd added definition of CANTERA_DATA 2004-01-02 01:02:03 +00:00
Dave Goodwin
7beb187fdf *** empty log message *** 2004-01-02 00:39:11 +00:00
Dave Goodwin
65b7e6a5bd changed problem parameters to keep T in range 2003-12-20 12:12:50 +00:00
Dave Goodwin
4e29ebffe5 changed problem parameters to keep T in range 2003-12-20 12:06:11 +00:00
Dave Goodwin
ae3af10a1c rebaselined 2003-12-13 14:08:13 +00:00
Dave Goodwin
1665ea3217 *** empty log message *** 2003-09-18 21:16:42 +00:00
Harry Moffat
0aaaab9c98 rebaselined due to change in constants. 2003-09-03 19:59:09 +00:00
Harry Moffat
d46d6d15ac Rebaselined these three tests. The results had changed in the 
3rd significant digit.

The changes, according to Goodwin, were most likely due to the change
in the method of inclusion of the activation energies. Basically,
a non standard kcal/mole conversion method was used to convert
activation energies to temperatures internally.
 2003-08-07 00:22:11 +00:00