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

2362 commits

Author SHA1 Message Date
Ray Speth
7c171631af Merge branch 'scons' into 'trunk' 
Conflicts:
	Cantera/Makefile.in
	Cantera/clib/src/clib_defs.h
	Cantera/clib/src/ctreactor.cpp
	Cantera/clib/src/ctstagn.cpp
	Cantera/clib/src/ctstagn.h
	Cantera/cxx/Makefile.in
	Cantera/cxx/demos/combustor/combustor.cpp
	Cantera/cxx/demos/flamespeed/flamespeed.cpp
	Cantera/cxx/demos/kinetics1/example_utils.h
	Cantera/cxx/demos/kinetics1/kinetics1.cpp
	Cantera/cxx/include/Cantera.h
	Cantera/cxx/include/Cantera.mak.in
	Cantera/cxx/include/Cantera_bt.mak.in
	Cantera/cxx/include/Edge.h
	Cantera/cxx/include/GRI30.h
	Cantera/cxx/include/Interface.h
	Cantera/cxx/include/zerodim.h
	Cantera/fortran/f77demos/Makefile.in
	Cantera/fortran/src/Makefile.in
	Cantera/fortran/src/fct.cpp
	Cantera/fortran/src/fctxml.cpp
	Cantera/fortran/src/flib_defs.h
	Cantera/matlab/Makefile.in
	Cantera/matlab/cantera/Contents.m
	Cantera/matlab/setup_winmatlab.py
	Cantera/matlab/src/ctfunctions.cpp
	Cantera/matlab/src/ctmatutils.h
	Cantera/matlab/src/mixturemethods.cpp
	Cantera/matlab/src/mllogger.h
	Cantera/matlab/src/phasemethods.cpp
	Cantera/matlab/src/reactormethods.cpp
	Cantera/matlab/src/reactornetmethods.cpp
	Cantera/matlab/src/thermomethods.cpp
	Cantera/matlab/src/wallmethods.cpp
	Cantera/matlab/src/xmlmethods.cpp
	Cantera/python/Cantera/Edge.py
	Cantera/python/Cantera/Interface.py
	Cantera/python/Cantera/Phase.py
	Cantera/python/Cantera/importFromFile.py
	Cantera/python/Makefile.in
	Cantera/python/ctml_writer.py
	Cantera/python/setup.py.in
	Cantera/python/src/Makefile.in
	Cantera/python/src/ctkinetics_methods.cpp
	Cantera/python/src/ctonedim_methods.cpp
	Cantera/python/src/pylogger.h
	Cantera/src/Makefile.in
	Cantera/src/base/config.h.in
	Cantera/src/base/ctml.cpp
	Cantera/src/base/ctml.h
	Cantera/src/base/mdp_allo.cpp
	Cantera/src/base/mdp_allo.h
	Cantera/src/base/vec_functions.h
	Cantera/src/base/xml.cpp
	Cantera/src/base/xml.h
	Cantera/src/converters/CKParser.h
	Cantera/src/converters/Element.h
	Cantera/src/converters/Reaction.h
	Cantera/src/converters/RxnSpecies.h
	Cantera/src/converters/Species.h
	Cantera/src/converters/ckr_defs.h
	Cantera/src/converters/ckr_utils.h
	Cantera/src/equil/BasisOptimize.cpp
	Cantera/src/equil/Makefile.in
	Cantera/src/equil/MultiPhase.cpp
	Cantera/src/equil/vcs_MultiPhaseEquil.cpp
	Cantera/src/equil/vcs_VolPhase.cpp
	Cantera/src/equil/vcs_VolPhase.h
	Cantera/src/equil/vcs_linmaxc.cpp
	Cantera/src/equil/vcs_phaseStability.cpp
	Cantera/src/equil/vcs_rxnadj.cpp
	Cantera/src/equil/vcs_solve.cpp
	Cantera/src/equil/vcs_solve.h
	Cantera/src/equil/vcs_solve_TP.cpp
	Cantera/src/equil/vcs_util.cpp
	Cantera/src/equil/vcs_xerror.c
	Cantera/src/kinetics/GasKinetics.cpp
	Cantera/src/kinetics/GasKinetics.h
	Cantera/src/kinetics/InterfaceKinetics.cpp
	Cantera/src/kinetics/InterfaceKinetics.h
	Cantera/src/kinetics/Kinetics.h
	Cantera/src/kinetics/ReactionStoichMgr.h
	Cantera/src/kinetics/RxnRates.h
	Cantera/src/kinetics/StoichManager.h
	Cantera/src/numerics/BandMatrix.cpp
	Cantera/src/numerics/BandMatrix.h
	Cantera/src/numerics/DAE_Solver.h
	Cantera/src/numerics/DAE_solvers.cpp
	Cantera/src/numerics/DenseMatrix.cpp
	Cantera/src/numerics/DenseMatrix.h
	Cantera/src/numerics/FuncEval.h
	Cantera/src/numerics/IDA_Solver.cpp
	Cantera/src/numerics/IDA_Solver.h
	Cantera/src/numerics/Integrator.h
	Cantera/src/numerics/Makefile.in
	Cantera/src/numerics/NonlinearSolver.cpp
	Cantera/src/numerics/NonlinearSolver.h
	Cantera/src/numerics/ResidEval.h
	Cantera/src/numerics/ResidJacEval.cpp
	Cantera/src/numerics/ResidJacEval.h
	Cantera/src/numerics/SquareMatrix.cpp
	Cantera/src/numerics/SquareMatrix.h
	Cantera/src/numerics/ctlapack.h
	Cantera/src/oneD/Domain1D.h
	Cantera/src/oneD/OneDim.cpp
	Cantera/src/oneD/OneDim.h
	Cantera/src/oneD/Resid1D.h
	Cantera/src/oneD/Solid1D.cpp
	Cantera/src/oneD/Solid1D.h
	Cantera/src/oneD/StFlow.cpp
	Cantera/src/oneD/Surf1D.h
	Cantera/src/spectra/LineBroadener.h
	Cantera/src/thermo/Constituents.cpp
	Cantera/src/thermo/GibbsExcessVPSSTP.cpp
	Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp
	Cantera/src/thermo/IonsFromNeutralVPSSTP.h
	Cantera/src/thermo/LatticePhase.cpp
	Cantera/src/thermo/LatticeSolidPhase.cpp
	Cantera/src/thermo/LatticeSolidPhase.h
	Cantera/src/thermo/Makefile.in
	Cantera/src/thermo/MargulesVPSSTP.cpp
	Cantera/src/thermo/MargulesVPSSTP.h
	Cantera/src/thermo/NasaThermo.h
	Cantera/src/thermo/PDSS_IonsFromNeutral.cpp
	Cantera/src/thermo/PDSS_IonsFromNeutral.h
	Cantera/src/thermo/PDSS_SSVol.cpp
	Cantera/src/thermo/Phase.cpp
	Cantera/src/thermo/PseudoBinaryVPSSTP.cpp
	Cantera/src/thermo/PseudoBinaryVPSSTP.h
	Cantera/src/thermo/PureFluidPhase.cpp
	Cantera/src/thermo/ShomateThermo.h
	Cantera/src/thermo/SimpleThermo.h
	Cantera/src/thermo/SpeciesThermoFactory.cpp
	Cantera/src/thermo/State.h
	Cantera/src/thermo/StoichSubstance.h
	Cantera/src/thermo/ThermoFactory.cpp
	Cantera/src/thermo/ThermoPhase.cpp
	Cantera/src/thermo/ThermoPhase.h
	Cantera/src/transport/AqueousTransport.cpp
	Cantera/src/transport/AqueousTransport.h
	Cantera/src/transport/DustyGasTransport.cpp
	Cantera/src/transport/DustyGasTransport.h
	Cantera/src/transport/L_matrix.h
	Cantera/src/transport/LiquidTransport.cpp
	Cantera/src/transport/LiquidTransport.h
	Cantera/src/transport/LiquidTransportData.h
	Cantera/src/transport/MMCollisionInt.cpp
	Cantera/src/transport/MMCollisionInt.h
	Cantera/src/transport/Makefile.in
	Cantera/src/transport/MixTransport.cpp
	Cantera/src/transport/MixTransport.h
	Cantera/src/transport/MultiTransport.cpp
	Cantera/src/transport/MultiTransport.h
	Cantera/src/transport/SimpleTransport.cpp
	Cantera/src/transport/SimpleTransport.h
	Cantera/src/transport/SolidTransport.cpp
	Cantera/src/transport/SolidTransport.h
	Cantera/src/transport/TransportBase.h
	Cantera/src/transport/TransportFactory.cpp
	Cantera/src/transport/TransportFactory.h
	Cantera/src/transport/TransportParams.h
	Cantera/src/transport/WaterTransport.h
	Cantera/src/zeroD/FlowDevice.h
	Cantera/src/zeroD/Reactor.h
	Cantera/src/zeroD/ReactorBase.cpp
	Cantera/src/zeroD/ReactorBase.h
	Cantera/src/zeroD/ReactorNet.h
	Cantera/src/zeroD/Wall.h
	Cantera/user/Makefile.in
	License.rtf
	Makefile.in
	apps/bvp/stagnation.cpp
	configure
	configure.in
	data/transport/misc_tran.dat
	docs/Makefile.in
	docs/install_examples/README.txt
	docs/install_examples/cygwin_gcc434_dbg_f2c_numpy.sh
	docs/install_examples/linux_64_gcc424_dbg_python252_numpy
	docs/install_examples/linux_64_gcc424_opt_python252_numpy
	docs/install_examples/mac_gcc401_python251_numpy
	docs/python/.cvsignore
	ext/Makefile.in
	ext/blas/Makefile.in
	ext/cvode/Makefile.in
	ext/f2c_blas/Makefile.in
	ext/f2c_lapack/Makefile.in
	ext/f2c_math/Makefile.in
	ext/f2c_math/xersve.c
	ext/f2c_recipes/Makefile.in
	ext/lapack/Makefile.in
	ext/math/Makefile.in
	ext/recipes/Makefile.in
	ext/tpx/CarbonDioxide.cpp
	ext/tpx/Makefile.in
	ext/tpx/Sub.cpp
	ext/tpx/utils.cpp
	preconfig
	test_problems/ChemEquil_gri_matrix/gri_matrix.cpp
	test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
	test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
	test_problems/ChemEquil_ionizedGas/runtest
	test_problems/ChemEquil_red1/basopt_red1.cpp
	test_problems/CpJump/CpJump.cpp
	test_problems/Makefile.in
	test_problems/VCSnonideal/Makefile.in
	test_problems/VCSnonideal/NaCl_equil/HMW_NaCl.xml
	test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp
	test_problems/VPsilane_test/silane_equil.cpp
	test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
	test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
	test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
	test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
	test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
	test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml
	test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
	test_problems/cathermo/HMW_dupl_test/TemperatureTable.h
	test_problems/cathermo/HMW_dupl_test/sortAlgorithms.cpp
	test_problems/cathermo/HMW_dupl_test/sortAlgorithms.h
	test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
	test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
	test_problems/cathermo/HMW_graph_CpvT/TemperatureTable.h
	test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.cpp
	test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.h
	test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
	test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
	test_problems/cathermo/HMW_graph_GvI/TemperatureTable.h
	test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.cpp
	test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.h
	test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
	test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
	test_problems/cathermo/HMW_graph_GvT/TemperatureTable.h
	test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.cpp
	test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.h
	test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
	test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
	test_problems/cathermo/HMW_graph_HvT/TemperatureTable.h
	test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.cpp
	test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.h
	test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
	test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
	test_problems/cathermo/HMW_graph_VvT/TemperatureTable.h
	test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.cpp
	test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.h
	test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
	test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
	test_problems/cathermo/Makefile.in
	test_problems/cathermo/VPissp/ISSPTester.cpp
	test_problems/cathermo/ims/IMSTester.cpp
	test_problems/cathermo/issp/ISSPTester.cpp
	test_problems/cathermo/stoichSubSSTP/TemperatureTable.h
	test_problems/cathermo/stoichSubSSTP/sortAlgorithms.cpp
	test_problems/cathermo/stoichSubSSTP/sortAlgorithms.h
	test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
	test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
	test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
	test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
	test_problems/cathermo/wtWater/wtWater.cpp
	test_problems/ck2cti_test/Makefile.in
	test_problems/ck2cti_test/runtest.in
	test_problems/cxx_ex/Makefile.in
	test_problems/cxx_ex/equil_example1.cpp
	test_problems/cxx_ex/example_utils.h
	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/runtest
	test_problems/cxx_ex/rxnpath_example1.cpp
	test_problems/cxx_ex/transport_example1.cpp
	test_problems/cxx_ex/transport_example2.cpp
	test_problems/min_python/Makefile.in
	test_problems/min_python/minDiamond/Makefile.in
	test_problems/min_python/negATest/negATest.cpp
	test_problems/mixGasTransport/runtest
	test_problems/nasa9_reader/Makefile.in
	test_problems/nasa9_reader/runtest.in
	test_problems/negATest/negATest.cpp
	test_problems/printUtilUnitTest/pUtest.cpp
	test_problems/pureFluidTest/testPureWater.cpp
	test_problems/silane_equil/silane_equil.cpp
	test_problems/surfkin/surfdemo.cpp
	tools/Makefile.in
	tools/bin/cvs2cl.pl
	tools/src/ck2cti.cpp
	tools/templates/f77/demo_ftnlib.cpp
	win32/vc7/Sundials/sundials/sundials_config.h
	win32/vc9/Sundials/SUNDIALS_SHARED/sundials_config.h
	winconfig.h
 2012-02-10 03:21:33 +00:00
Ray Speth
a47addf412 Merge remote-tracking branch 'liquidTransportDevelop' 2012-02-09 18:05:01 +00:00
Harry Moffat
39f2e4786a Changed the default number of digits that are saved to an xml file. 
This crucial change is needed if xml files are to be used as restart files,
where we will need close to machine precision.
 2012-02-08 16:00:55 +00:00
Harry Moffat
cb4048249c Added a way to specify weighting norms for the residuals. 2012-02-08 15:59:11 +00:00
Ray Speth
2ad16f1db3 Fix for VS2010 / Matlab 2010a #include compatibility issues 2012-02-04 16:45:26 +00:00
Ray Speth
d29e31b039 ctmatutils.h was missing an #include guard 2012-02-04 16:45:20 +00:00
Ray Speth
7e6b232978 Workaround for char16_t definition when using Matlab2010a and VS2010 2012-02-03 22:54:33 +00:00
Ray Speth
1618de5a24 Added explicit dependency for Matlab extension on clib headers 2012-02-03 19:28:49 +00:00
Ray Speth
93eb3cf033 Quote include and library paths when building Matlab extension 2012-02-02 19:55:35 +00:00
Ray Speth
51a7fc1278 Fixed namespace issues with the Fortran module 2012-01-27 19:31:35 +00:00
Ray Speth
3625c733ea Fixed environment variables used for compiling the Python extension 2012-01-26 18:31:47 +00:00
Ray Speth
1cdec7a851 Fixed Matlab extension compilation 
Added missing namespace qualifiers after removing
"using namespace std" in a previous commit.
 2012-01-26 18:31:41 +00:00
Harry Moffat
fdd37f5f2d Added addNamedFloat Array() to ctml. Easy way to read and write float arrays. 
volt and coulomb added to units
added depth argument to several xml calls.
 2012-01-23 20:59:38 +00:00
Ray Speth
32afe97ebd Removed 'using namespace Cantera' from all header files 2012-01-23 03:37:08 +00:00
Ray Speth
c708682e56 Removed 'using namespace std' from all header files 2012-01-23 03:36:42 +00:00
Ray Speth
ffec1b052a Combined CanteraZeroD and CanteraSpectra namespaces with Cantera 2012-01-23 03:36:13 +00:00
Ray Speth
d832f32625 Eliminated the Cantera_CXX namespace 2012-01-23 03:35:46 +00:00
Ray Speth
cea05ab5a5 Fixed signed/unsigned/size_t warnings in the Matlab toolbox 2012-01-20 23:14:12 +00:00
Ray Speth
f23bb0365a Fixed more signed/unsigned/size_t warnings 
These were warnings that showed up when compiling with the Microsoft
Platform SDK.
 2012-01-20 23:13:54 +00:00
Ray Speth
ea2c3b977c Removed some vector functions that duplicated built-in functionality 2012-01-20 23:13:44 +00:00
Ray Speth
f922a9c348 Removed unnecessary TRUE and FALSE macros 
Replaced with built-in true and false values, and the variables
these were assigned to have been converted from int to bool.
 2012-01-20 23:13:32 +00:00
Ray Speth
4e2a48c4e5 Fixed erroneous inequality comparisons between size_t and 0 2012-01-20 23:13:17 +00:00
Ray Speth
db2b9636bb Removed straggling instance of TYPENAME_KEYWORD 2012-01-19 20:45:23 +00:00
Ray Speth
cd4d4f01b6 Removed some unused preprocessor definitions 2012-01-19 20:30:38 +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
Ray Speth
6798f18c4e Removed #ifdef for TYPENAME_KEYWORD 
This definition was used to remove the "typename" qualifier from some
declarations when using MSVC, but the use of the "typename" keyword in
the contexts where it is used in Cantera are allowed in all versions
of Visual Studio since (at least) VS.NET 2003.
 2012-01-19 20:30:16 +00:00
Ray Speth
afdf3fb2d1 Removed some empty comment lines 2012-01-19 20:30:04 +00:00
Ray Speth
6589eb7f7c Removed some unused numerical integration utilities 2012-01-18 23:44:50 +00:00
Ray Speth
4cdac9a90f Eliminated "heapsort" function in favor of using std::sort 2012-01-18 03:42:52 +00:00
Ray Speth
1ff7c23860 Fixed signed/unsigned equality comparisons 2012-01-17 23:58:48 +00:00
Ray Speth
de7d58805e Removed unused variables identified by compiler warnings 2012-01-17 23:58:38 +00:00
Ray Speth
d4b4cec673 Fixed signed/unsigned comparison warnings in VCS Equilibrium solver 2012-01-17 04:13:11 +00:00
Ray Speth
45eb5702e6 Fixing signed/unsigned comparison warnings in equil (not vcs) 2012-01-17 04:13:09 +00:00
Ray Speth
aeb16e0bc9 Fixed some signed/unsigned comparison warnings 2012-01-17 04:13:04 +00:00
Ray Speth
c2372197de Fixing signed/unsigned comparison warnings in clib 2012-01-17 04:12:58 +00:00
Ray Speth
905117a3e4 Fixing signed/unsigned comparison wartings in Kinetics 2012-01-17 04:12:54 +00:00
Ray Speth
55684b6591 Fixing signed/unsigned comparison warnings in ZeroD 2012-01-17 04:12:49 +00:00
Ray Speth
cfbd76ac02 Fixing signed/unsigned comparison warnings in OneD 2012-01-17 04:12:45 +00:00
Ray Speth
c0dfd33480 Fixed signed/unsigned comparisions in Transport 2012-01-17 04:12:38 +00:00
Ray Speth
9439615c71 Fixed signed/unsigned comparison warnings in Thermo 2012-01-17 04:12:27 +00:00
Ray Speth
e8d895ac26 Fixed MSVC warning LNK4221 by removing a few "empty" source files 2012-01-17 04:12:23 +00:00
Ray Speth
e5d4b58e2a Fix MSVC warning C4290 by removing exception specifications 2012-01-17 04:12:19 +00:00
Ray Speth
bc9ec48516 Fixing compiler warnings, part 5 2012-01-17 04:11:51 +00:00
Ray Speth
e030345e8b Fixed an error in the Python extension introduced by the int -> size_t conversion 2012-01-17 04:11:46 +00:00
Ray Speth
f2bf17e1b7 Fixed some problems with the tests caused by the int to size_t conversion 2012-01-17 04:11:40 +00:00
Ray Speth
9470103bb2 Fixing compiler warnings, part 4 2012-01-17 04:11:20 +00:00
Ray Speth
255f1f9b9f Fixing compiler warnings, part 3 2012-01-17 04:10:43 +00:00
Ray Speth
69bffa3800 Fixing compiler warnings, part 2 2012-01-17 04:10:26 +00:00
Ray Speth
7a30bfc9fd Pass the VS*COMNTOOLS environment variable when building the Python module 2012-01-17 04:10:23 +00:00
Ray Speth
604028d586 Fixed doubly-used index variables in HMWSoln::read methods 2012-01-17 04:10:21 +00:00