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

25 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
f516af92cc [cantera]: all files are now on the same (correct) linkage page 2012-02-06 20:41:16 +00:00
Nicholas Malaya
5298d6989c [cantera]: fixing a bug where two .cpp files attempted compile/linkage. 2012-02-03 00:09:46 +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
9e1fdfe39a Eliminated CVS keyword cruft 2012-01-09 17:32:01 +00:00
Ray Speth
71588d307d Remove files for Autotools and Visual Studio build systems 2011-12-14 19:38:10 +00:00
Harry Moffat
fa56309462 Modifications to the Makefiles to make the THREAD_SAFE_CANTERA ifdef 
block work again.
 2010-11-12 19:18:49 +00:00
Harry Moffat
173e5dff9c Fixed an error that appeared in the Makefile on the mac 2009-08-22 20:12:25 +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
0fcfa18199 added using namespace command 2008-02-16 21:41:06 +00:00
Harry Moffat
bcdd65922a Changes in Makefiles to support the SAFE THREADS capability. 2008-01-16 21:38:52 +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
cf308423fe Updated Makefile to new methodology 2008-01-07 16:17:07 +00:00
Harry Moffat
ab100d892e Added a solver variable. 2007-11-11 23:27:06 +00:00
Harry Moffat
9029f8b979 Fixed the Make clean rule. Have to eliminate .depends before make is 
called, because the rule to 'make .depends' was being called on invocation
if .depends exists.
 2007-05-06 17:15:53 +00:00
Dave Goodwin
fea8c985f5 reorganized source tree, changed include files, etc. 2007-05-04 15:18:40 +00:00
Harry Moffat
51a5f82474 Doxygen update: 
Added info to DebyeHuckel. It's getting to be near a documented state.
test suite fix:
   fixed Makefile.in's. The .depends were not being included in the Makefiles.
   It should now be more stable.
 2007-03-11 19:46:14 +00:00
Harry Moffat
1cd197ea7a doxygen update: 
Added EdgePhase
Worked on test suite:
   HMW_Test_1 passes now whether Debug_Mode is turned on or not.
 2007-02-24 00:51:56 +00:00
Harry Moffat
289eb43afb solaris port 
added the CXX_DEPENDS variable.
 2006-12-14 18:43:08 +00:00
Dave Goodwin
ce73f8bacd removed using namespace statements from Cantera header files, and fully qualified most members of std (string, vector< >, etc.) in header files. User programs may need to have "using namespace" statements added. 2006-11-27 21:43:30 +00:00
Harry Moffat
310377466d Slight change to the blessed solution. 2006-10-20 21:47:21 +00:00
Harry Moffat
18152a04b3 Added another test program for the element potential equilibrium 
solver.
This test does a matrix of T, pres, and mixture fraction for the
gri30 mechanism. It does a total of 1500 calculation starting from
a bad initial guess.
 2006-10-20 21:12:45 +00:00