Commit graph

30 commits

Author SHA1 Message Date
Ray Speth
7676097b4a Removed execute permission from nonexecutable files 2012-03-13 17:32:41 +00:00
Ray Speth
a0802e3ad0 Fixed some problems building with Fortran sources for BLAS, LAPACK, etc. 2012-02-23 21:24:32 +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
0c26ea8c72 [cantera]: moving some folders around 2012-02-03 23:41:00 +00:00
Ray Speth
32afe97ebd Removed 'using namespace Cantera' from all header files 2012-01-23 03:37:08 +00:00
Nicholas Malaya
6de0d5e7f4 [cantera]: updating from includes to AM_CPPFLAGS 2012-01-18 17:39:12 +00:00
Nicholas Malaya
2e697b3223 [cantera]: few more modifications to trunk of our tools, to enable regression testing with make check 2012-01-05 18:54:50 +00:00
Nicholas Malaya
0308bf9ab6 [cantera]: adding ext makefile.am to get an example going 2012-01-05 17:16:05 +00:00
Ray Speth
71588d307d Remove files for Autotools and Visual Studio build systems 2011-12-14 19:38:10 +00:00
Harry Moffat
e1dc08c48d Deleting .cvsignore files. 2009-07-28 18:34:16 +00:00
Harry Moffat
70647c85ed Initial Import 2009-07-27 23:17:19 +00:00
Harry Moffat
bcdfcc46d6 Changes to PURIFY. Doesn't take g77 as an option, so not instrumenting
the fortran routines.
2008-12-30 21:58:10 +00:00
Harry Moffat
b2cf384cea Added PURIFY option to makefiles 2008-12-30 21:49:41 +00:00
Harry Moffat
ebdb0b4094 Added more dependencies. 2008-01-01 19:14:33 +00:00
Dave Goodwin
b571729262 bug fixes 2007-05-11 19:29:35 +00:00
Dave Goodwin
6221d28fe0 *** empty log message *** 2007-04-25 00:14:36 +00:00
Dave Goodwin
92eb3d250e ; 2007-04-25 00:08:59 +00:00
Harry Moffat
05e16e8e35 Added in the PIC autoconf variable, that already existed, into most
of the Makefiles in the code. This variable will now be used
to specify the position independent code compiler option within
Cantera. Note, this bug fix was needed for a 64 bit full python compile
on linux.
2007-04-13 22:39:15 +00:00
Harry Moffat
d28432f313 Added the file dgbfa.f
Took out duplicate FFLAGS statement.
2006-03-03 20:31:49 +00:00
Harry Moffat
d2bdb5c9a6 Replaced the file dgbefa.f with dgbfa.f. The later is used in other
math routines.
2006-03-03 16:44:41 +00:00
Dave Goodwin
83501b5d72 *** empty log message *** 2005-08-18 14:44:35 +00:00
Dave Goodwin
9bd690ae04 Prerelease_1_6_0_branch merged into trunk 2005-06-18 16:58:39 +00:00
Dave Goodwin
81f5771b59 improvements to the configuration process 2004-08-09 05:10:18 +00:00
Harry Moffat
05b83f9c4c Added the all: target. 2004-08-06 21:56:36 +00:00
Harry Moffat
75a8802833 Fixed the SUFFIX object 2004-08-05 19:23:34 +00:00
Harry Moffat
fbe1a9923c Added a _i1mach_ target 2004-08-05 19:22:41 +00:00
Dave Goodwin
3e7e28b6fb *** empty log message *** 2004-08-03 10:25:03 +00:00
Dave Goodwin
6ea7a847ab *** empty log message *** 2003-04-20 04:04:16 +00:00
Dave Goodwin
1e8d3822ff Initial revision 2003-04-14 17:57:48 +00:00