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
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
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
b88846e5e0
Fixed C++ tests that were failing under Windows
...
Visual Studio defaults to 3-digit exponents when printing in scientific
notation. The tests now use a MSVC-specific function to change this
behavior when necessary.
2012-01-09 17:35:28 +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
35e4c9ea45
Turned on Keyword substition in all files.
2009-11-09 23:36:49 +00:00
Harry Moffat
201117842e
ignore list maintenance.
2009-07-29 15:22:58 +00:00
Harry Moffat
70647c85ed
Initial Import
2009-07-27 23:17:19 +00:00
Harry Moffat
43ec65c716
Changes from old to new style C headers.
2008-12-17 17:31:12 +00:00
Harry Moffat
db08069762
Change in the interface
2008-10-13 21:04:21 +00:00
Harry Moffat
df4b108323
Added and modified a few files for VPSSMgr changes.
2008-08-23 00:55:58 +00:00
Harry Moffat
90f7898970
Updated the dependencies in the Makefiles.
2008-05-07 17:01:03 +00:00
Harry Moffat
c22dfbd9c2
Added a test against build_with_f2c
...
Took out src_dir_tree checks
2008-01-15 16:54:27 +00:00
Dave Goodwin
fea8c985f5
reorganized source tree, changed include files, etc.
2007-05-04 15:18:40 +00:00
Harry Moffat
51a5f82474
Doxygen update:
...
Added info to DebyeHuckel. It's getting to be near a documented state.
test suite fix:
fixed Makefile.in's. The .depends were not being included in the Makefiles.
It should now be more stable.
2007-03-11 19:46:14 +00:00
Harry Moffat
289eb43afb
solaris port
...
added the CXX_DEPENDS variable.
2006-12-14 18:43:08 +00:00
Harry Moffat
2a6c915933
Eliminated unused variables.
2006-11-28 20:13:02 +00:00
Harry Moffat
460a6e50ab
Changed some of the tests so that quantities that are nominally zero
...
should be set to zero exactly if they are below a tolerance.
In this way, unconsequential roundoff errors don't trigger false
results.
2006-07-11 17:13:43 +00:00
Harry Moffat
f01949f8a1
Made the testing process alot less verbose. Hopefully, the bottom
...
line pass/fail result will now be more evident.
2006-07-07 18:09:00 +00:00
Harry Moffat
437d8d92de
Added a test for WaterPDSS object.
2006-07-04 01:04:20 +00:00
