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

27 commits

Author SHA1 Message Date
Ray Speth
b0deb41708 [Transport] Make WaterTransport constructible using newTransportMgr 
This makes it possible to specify the WaterTransport model in XML input files,
and to use the model from Python and Matlab.

Resolves #289
 2018-09-07 23:24:23 -04:00
Ray Speth
d9f9f69fc3 [SCons/Test] Regression tests also look for input files in test/data 
This allows the elimination of a number of duplicate input files.
 2018-09-07 23:24:23 -04:00
Ray Speth
f46df83841 [Thermo] Make WaterSSTP constructible using newPhase 
This makes it possible to create a WaterSSTP phase using an XML input file, and
use this model from Python and Matlab.
 2018-09-07 23:24:23 -04:00
Ray Speth
e4c45b6429 General whitespace cleanup 
Remove unnecessary blank lines and trailing whitespace. Replace tabs with
spaces.
 2015-08-02 23:06:15 -04:00
Ray Speth
d308944509 [Test] Remove unused, platform-specific 'runtest' scripts 2015-07-15 12:17:11 -04:00
Ray Speth
002c158761 Cleanup include statements 
Move includes from header to implementation files where possible, and remove
unnecessary includes.
 2014-08-28 16:54:13 +00:00
Ray Speth
c7ba8bfb84 Remove abandoned autotools build system 2014-03-04 17:38:53 +00:00
Ray Speth
88bb6fe679 Removed obsolete C++ Chemkin mechanism converter 2012-07-26 20:49:50 +00:00
Nicholas Malaya
4757cf6b69 cutting precision off to make tests less stringent: this makes me nervous but a test suite is useless unless it works under certain circumstances 2012-07-16 20:43:13 +00:00
Nicholas Malaya
532141a107 [cantera2.0]: adding missing -lexecstream -pthread to makefile.am in tests 2012-06-19 02:06:23 +00:00
Nicholas Malaya
70db937d32 [cantera2.0]: 2nd round of test makefiles edited 2012-06-18 16:16:55 +00:00
Ray Speth
54efbaa320 Rewrote exception handling to be more general and more explicit 
CanteraError inerits from std:exception, so now it has a what() method
that is used to print a message describing the exception. Adding an
exception to the Cantera error stack now requires explicitly calling
the .save() method.
 2012-03-05 20:45:56 +00:00
Ray Speth
1bffc6e150 Fix include paths for tests and samples 2012-02-12 02:47:21 +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
f516af92cc [cantera]: all files are now on the same (correct) linkage page 2012-02-06 20:41:16 +00:00
Nicholas Malaya
67ad9b11d7 [cantera]: removing these makefile.ins 2012-02-02 22:22:48 +00:00
Nicholas Malaya
a3f16ff596 [cantera]: done with tests in cathermo 2012-02-02 22:18:30 +00:00
Ray Speth
9e1fdfe39a Eliminated CVS keyword cruft 2012-01-09 17:32:01 +00:00
Ray Speth
8b699082c8 Removed cantera/kernel from include path 
The "cantera/kernel" directory is now part of the include path only
when building the Cantera kernel. All other modules include files in
this directory as "kernel/header.h".

This fixes a problem distinguishing between kernel/Kinetics.h and
kinetics.h on Windows.
 2012-01-09 17:31:21 +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
1e77c40db0 Small changes 2010-04-02 19:44:08 +00:00
Harry Moffat
0742f3f601 Took the Makefile out of the distribution and made it an 
ignore file.
 2009-09-22 16:55:07 +00:00
Harry Moffat
2bd7816b65 Added in a model for the thermal conductivity of pure water 
at all T and P.
Added in a test for the new model.
 2009-09-16 02:13:43 +00:00
Harry Moffat
5009a3817f Added a viscosity model into WaterTransport.cpp for pure water 
Added a test problem for the viscosity model.
Updated WaterSSTP object to support the use of WaterTransport 
with the object.
 2009-09-15 21:46:44 +00:00
Harry Moffat
910f319223 Adding a single test 2009-09-11 23:42:03 +00:00