Commit graph

93 commits

Author SHA1 Message Date
Ray Speth
c7ba8bfb84 Remove abandoned autotools build system 2014-03-04 17:38:53 +00:00
Ray Speth
ca0ea8bc35 [SCons] Simplify treatment of sydep1.h and signal1.h
We don't actually have system-dependent versions of these headers,
so just put the templates in place directly.
2014-02-20 03:00:45 +00:00
Nicholas Malaya
bf3b763350 [cantera2.0]: finally figured this arith.h out 2012-06-19 02:31:11 +00:00
Nicholas Malaya
631be2da45 [cantera2.0]: building and writing arith.h 2012-06-19 01:50:57 +00:00
Nicholas Malaya
4e16d3aafa [cantera2.0]: partial fix to problem ray identified, followup coming in a few minutes 2012-06-18 21:19:33 +00:00
Nicholas Malaya
724baced8b [cantera]: fixing up the build system in prep for the 2.0 release. Should be shiny. 2012-06-14 23:00:58 +00:00
Nicholas Malaya
79b29300a6 [cantera]: updating autotools build system. Library building, need to fix another test. Additionally, adding hypersonic flow transport model-- need to add hypersonic thermodynamics as well. 2012-04-25 13:18:25 +00:00
Ray Speth
055b6e5710 Fixed issues compiling with MinGW using SCons 2012-02-21 16:06:07 +00:00
Ray Speth
52e0e30c61 Removed f2c source files for functions with undefined externals 2012-02-13 17:24:20 +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
Nicholas Malaya
b53f21cec7 [cantera]: fixing up a makefile 2012-02-03 20:48:05 +00:00
Nicholas Malaya
5efce48bca [cantera]: fixing build that was broken in previous update, continuing with transport model additions 2012-02-01 21:14:09 +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
00b631a310 [cantera]: removing a few files we dont need to compile 2012-01-18 19:00:11 +00:00
Nicholas Malaya
6de0d5e7f4 [cantera]: updating from includes to AM_CPPFLAGS 2012-01-18 17:39:12 +00:00
Nicholas Malaya
187fb69c19 [cantera]: adding ax_enable_builddir to enable builddir creation 2012-01-18 17:15:12 +00:00
Nicholas Malaya
4538e19768 [cantera]: removing makefile.in 2012-01-18 16:52:47 +00:00
Nicholas Malaya
43767fab35 [cantera]: update from hacking last night, adding f2c lib 2012-01-18 15:59:22 +00:00
Ray Speth
9c2ec3862b Fixes for MSVC warnings C4273 and C4996
C4273 - (inconsistent dll linkage) generated by multiple declarations of isatty
C4996 - deprecated POSIX function names need to be prefixed with "_"
2012-01-17 04:12:15 +00:00
Ray Speth
4babd5898b Fixing compiler warnings, part 1 2012-01-17 04:10:08 +00:00
Ray Speth
e960f715b7 Fixed a bunch of compiler warnings (MSVC) in the f2c code 2012-01-17 04:09:58 +00:00
Ray Speth
453576f0ad Removed MSVC-specific compiler warning suppression 2012-01-17 04:09:18 +00:00
Ray Speth
8045e68d86 Added .gitignore files
Helpful for git-svn users
2011-12-16 16:22:15 +00:00
Ray Speth
71588d307d Remove files for Autotools and Visual Studio build systems 2011-12-14 19:38:10 +00:00
Ray Speth
99a0dc5f0f Removed incomplete CMake build scripts 2011-12-14 03:54:19 +00:00
Ray Speth
2c4623e336 SCons can now build the contents of the 'ext' directory 2011-12-14 02:41:29 +00:00
Harry Moffat
35f32314b9 Modifications to beat down the compiler warnings. Merged from the
liquidTransportDevelop
2009-12-29 03:01:18 +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
183b600572 Eliminated warning messages on vc++ 2009-07-13 18:37:34 +00:00
Harry Moffat
b5404d5907 Got rid of warnings on windows. 2009-04-22 00:40:31 +00:00
Harry Moffat
a8ade32602 Took out some files that are created during the compilation process 2009-04-20 14:26:53 +00:00
Harry Moffat
7fc902373e Fix for a possible ubuntu problem. Will have to check with users to
see if this works.
2009-03-13 03:08:59 +00:00
Dave Goodwin
7b179cb44f *** empty log message *** 2008-02-18 04:04:06 +00:00
Dave Goodwin
a2bb5e8135 removed old files 2008-02-09 02:55:08 +00:00
Dave Goodwin
73bebe4768 cmake files 2008-02-05 23:36:07 +00:00
Dave Goodwin
6723d332d8 re-added 2008-01-12 16:46:35 +00:00
Harry Moffat
c113e07e52 Added dependency on Makefile 2008-01-01 19:25:54 +00:00
Harry Moffat
6ceff256b4 These files are autogenerted during the makefile process. Therefore,
they don't need to be in the cvs system.
2007-10-28 19:08:51 +00:00
Harry Moffat
bdbe4b2d41 Added -c command to the @INSTALL@. It doesn't matter unless the
install command is config/install-sh. For the later, it
changes mv to a cp command.
2007-07-12 00:58:39 +00:00
Dave Goodwin
7f570c79ca bug fixes 2007-05-12 12:55:25 +00:00
Dave Goodwin
9ec5f81be1 minor bug fixes 2007-05-10 20:22:36 +00:00
Dave Goodwin
ba5928083f added thread safety option 2007-05-10 03:28:30 +00:00
Dave Goodwin
93be5e02fe *** empty log message *** 2007-04-25 00:27:59 +00:00
Harry Moffat
a15b30e7ba Fixed an error in the test suite. Changed some files around in
caThermo so that requesting the ideal solution option but
not the electrochemistry option will now pass the test suite.
2007-04-17 21:10:14 +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
6545937948 Changed the WaterTP class to WaterSSTP, which now inherits from SingleSpeciesTP,
as it should
Fixed an error in pressure calculation within  WaterSSTP.
Added more function calls to the test problem for WaterSSTP.
2007-03-15 22:56:59 +00:00
Dave Goodwin
a1191dd9be *** empty log message *** 2007-02-17 17:31:16 +00:00