Commit graph

26 commits

Author SHA1 Message Date
Ray Speth
7676097b4a Removed execute permission from nonexecutable files 2012-03-13 17:32:41 +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
d3c09984d0 Fixed some preprocessor directives for MinGW
The purpose of these changes is to make the distinction between
compiling under Windows (in which case _WIN32 is defined) and
compiling with the Microsoft compiler (in which case _MSC_VER is
defined). These changes are from the patch submitted by David
Fronczek.
2012-01-19 20:30:26 +00:00
Nicholas Malaya
6de0d5e7f4 [cantera]: updating from includes to AM_CPPFLAGS 2012-01-18 17:39:12 +00:00
Nicholas Malaya
f9f8879122 [cantera]: adding a missing makefile.am 2012-01-17 22:38:14 +00:00
Nicholas Malaya
0516439d68 [cantera]: removing these directories, not sure why we need them, and they are counter to the common cantera organizing structure 2012-01-17 22:11:26 +00:00
Ray Speth
4babd5898b Fixing compiler warnings, part 1 2012-01-17 04:10:08 +00:00
Nicholas Malaya
cd2948d139 [cantera]: relocating for a moment, saving what i have here 2012-01-05 19:56:22 +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
b2cf384cea Added PURIFY option to makefiles 2008-12-30 21:49:41 +00:00
Harry Moffat
92450201d1 Fixed a compile error that was found on a mac build using intel's 10.1
compilers.
2008-06-27 15:16:32 +00:00
Dave Goodwin
7b179cb44f *** empty log message *** 2008-02-18 04:04:06 +00:00
Harry Moffat
c113e07e52 Added dependency on Makefile 2008-01-01 19:25:54 +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
dc094b2338 Solaris 10 Updates:
Changed CXX_FLAGS to CFLAGS in a bunch of ext directories.
2007-03-20 22:00:11 +00:00
Harry Moffat
2bbf07909e Fixed a make clean rule in ext/cvode 2006-08-14 22:01:37 +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
Harry Moffat
e41803d9b3 Fixed makefiles within the ext directory.
Added support for build_with_f2c.
2004-08-06 21:52:23 +00:00
Harry Moffat
deedf7cab7 Added brackets. 2004-08-05 19:25:28 +00:00
Dave Goodwin
f1a15f0e69 *** empty log message *** 2004-05-13 16:58:29 +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