Commit graph

21 commits

Author SHA1 Message Date
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
26f81ad26a [cantera]: adding multigastransport test 2012-02-07 16:47:30 +00:00
Nicholas Malaya
35c088a406 [cantera]: removing all these makefile.in's 2012-02-07 16:43:23 +00:00
Ray Speth
d832f32625 Eliminated the Cantera_CXX namespace 2012-01-23 03:35:46 +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
71588d307d Remove files for Autotools and Visual Studio build systems 2011-12-14 19:38:10 +00:00
Harry Moffat
201117842e ignore list maintenance. 2009-07-29 15:22:58 +00:00
Harry Moffat
9091de5aa3 Added PURIFY instrumentation commands to a lot of test programs. 2008-12-30 22:08:14 +00:00
Harry Moffat
2f259c6f6a Worked on making the Makefiles more uniform 2008-05-06 23:32:07 +00:00
Harry Moffat
6ded74a26d Added using namespace command 2008-02-16 21:48:00 +00:00
Harry Moffat
c22dfbd9c2 Added a test against build_with_f2c
Took out src_dir_tree checks
2008-01-15 16:54:27 +00:00
Harry Moffat
696c9bcd39 Added .depends to the make all rule. 2007-12-19 17:00:13 +00:00
Harry Moffat
0535ba5982 Changed some formatting to 4 digits from 5. I was having trouble with
the last digit changing.
2007-12-19 16:50:02 +00:00
Dave Goodwin
783ea0a254 *** empty log message *** 2007-12-19 04:29:50 +00:00
Harry Moffat
f46c9da1cd Rebaselined -> changed in 5th dig due to new constants 2007-12-17 20:25:36 +00:00
Harry Moffat
d8bb6b7fd2 Fixed a couple of errors in the Makefiles.
Special cased lapack and blas, and took out a recursive variable defn.
2007-10-29 23:50:09 +00:00
Dave Goodwin
707bea68da *** empty log message *** 2007-10-29 14:01:42 +00:00
Harry Moffat
a85279c015 Cutoff low values so that comparisons pass between machines 2007-09-12 22:02:08 +00:00
Harry Moffat
6f0ef653b0 Improved the dependencies in the file. 2007-08-29 20:48:50 +00:00
Harry Moffat
6469863f62 Addition of basic test for multiTransport object.
This just picks an arbitrary condition, calculates all of the
interfacial properties, and dumps it to an ascii file.
We want to ensure that the answer doesn't change over time.
2007-07-31 21:04:58 +00:00