diff --git a/Cantera/clib/src/ctmultiphase.cpp b/Cantera/clib/src/ctmultiphase.cpp index 88ac1517d..67e827f4f 100644 --- a/Cantera/clib/src/ctmultiphase.cpp +++ b/Cantera/clib/src/ctmultiphase.cpp @@ -230,8 +230,9 @@ extern "C" { doublereal rtol, int maxsteps, int maxiter, int loglevel) { try { - return vcs_equilibrate(*_mix(i), XY, estimateEquil, printLvl, solver, - rtol, maxsteps, maxiter, loglevel); + int retn = vcs_equilibrate(*_mix(i), XY, estimateEquil, printLvl, solver, + rtol, maxsteps, maxiter, loglevel); + return (double) retn; } catch (CanteraError) { return DERR; diff --git a/Cantera/cxx/demos/combustor/Makefile.in b/Cantera/cxx/demos/combustor/Makefile.in index 4c3537d33..1a4607055 100644 --- a/Cantera/cxx/demos/combustor/Makefile.in +++ b/Cantera/cxx/demos/combustor/Makefile.in @@ -5,7 +5,7 @@ # ############################################################################# .SUFFIXES : -.SUFFIXES : .cpp .d .o .dh .h +.SUFFIXES : .cpp .d .o .h # the name of the executable program to be created PROG_NAME = combustor diff --git a/Cantera/src/transport/LiquidTransport.cpp b/Cantera/src/transport/LiquidTransport.cpp index c5a6e8e08..03a9a55d4 100644 --- a/Cantera/src/transport/LiquidTransport.cpp +++ b/Cantera/src/transport/LiquidTransport.cpp @@ -884,7 +884,7 @@ namespace Cantera { m_A(i,i) = 0.0; for (j = 0; j < m_nsp; j++){ if (j != i) { - tmp = m_concentrations[j]/ m_DiffCoeff_StefMax(i,j); + tmp = m_concentrations[j] / m_DiffCoeff_StefMax(i,j); m_A(i,i) += tmp; m_A(i,j) = - tmp; } @@ -934,7 +934,7 @@ namespace Cantera { m_A(i,i) = 0.0; for (j = 0; j < m_nsp; j++) { if (j != i) { - tmp = m_concentrations[j]/ m_DiffCoeff_StefMax(i,j); + tmp = m_concentrations[j] / m_DiffCoeff_StefMax(i,j); m_A(i,i) += tmp; m_A(i,j) = - tmp; } diff --git a/configure b/configure index 1764cbc13..0ee6e4edc 100755 --- a/configure +++ b/configure @@ -9479,7 +9479,7 @@ fi - ac_config_files="$ac_config_files Makefile Cantera/Makefile Cantera/src/Makefile Cantera/src/base/Makefile Cantera/src/zeroD/Makefile Cantera/src/oneD/Makefile Cantera/src/converters/Makefile Cantera/src/transport/Makefile Cantera/src/thermo/Makefile Cantera/src/kinetics/Makefile Cantera/src/numerics/Makefile Cantera/src/spectra/Makefile Cantera/src/equil/Makefile Cantera/clib/src/Makefile Cantera/fortran/src/Makefile Cantera/fortran/f77demos/f77demos.mak Cantera/fortran/f77demos/Makefile Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/cxx/demos/combustor/Makefile Cantera/cxx/demos/combustor/Makefile.install Cantera/cxx/demos/flamespeed/Makefile Cantera/cxx/demos/flamespeed/Makefile.install Cantera/cxx/demos/kinetics1/Makefile Cantera/cxx/demos/kinetics1/Makefile.install Cantera/cxx/demos/NASA_coeffs/Makefile Cantera/cxx/demos/NASA_coeffs/Makefile.install Cantera/cxx/demos/rankine/Makefile Cantera/cxx/demos/rankine/Makefile.install Cantera/cxx/include/Cantera.mak Cantera/cxx/include/Cantera_bt.mak Cantera/user/Makefile Cantera/python/src/Makefile Cantera/python/examples/equilibrium/Makefile Cantera/python/examples/fuel_cells/Makefile Cantera/python/examples/kinetics/Makefile Cantera/python/examples/misc/Makefile Cantera/python/examples/transport/Makefile Cantera/python/examples/flames/Makefile Cantera/python/examples/gasdynamics/Makefile Cantera/python/examples/liquid_vapor/Makefile Cantera/python/examples/reactors/Makefile Cantera/python/examples/surface_chemistry/Makefile ext/lapack/Makefile ext/blas/Makefile ext/cvode/Makefile ext/math/Makefile ext/recipes/Makefile ext/tpx/Makefile ext/Makefile ext/f2c_libs/Makefile ext/f2c_blas/Makefile ext/f2c_lapack/Makefile ext/f2c_math/Makefile examples/Makefile examples/cxx/Makefile tools/Makefile tools/doc/Cantera.cfg tools/doc/Makefile tools/src/Makefile tools/src/sample.mak tools/src/finish_install.py tools/src/package4mac tools/templates/f77/demo.mak tools/templates/f90/demo.mak tools/templates/cxx/demo.mak tools/testtools/Makefile data/inputs/Makefile data/inputs/mkxml test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/spectroscopy/Makefile test_problems/surfSolverTest/Makefile test_problems/diamondSurf/Makefile test_problems/diamondSurf_dupl/Makefile test_problems/ChemEquil_gri_matrix/Makefile test_problems/ChemEquil_gri_pairs/Makefile test_problems/ChemEquil_ionizedGas/Makefile test_problems/ChemEquil_red1/Makefile test_problems/CpJump/Makefile test_problems/mixGasTransport/Makefile test_problems/multiGasTransport/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/NASA9poly_test/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/nasa9_reader/Makefile test_problems/nasa9_reader/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/pureFluidTest/Makefile test_problems/rankine_democxx/Makefile test_problems/python/Makefile test_problems/cathermo/Makefile test_problems/cathermo/issp/Makefile test_problems/cathermo/ims/Makefile test_problems/cathermo/stoichSubSSTP/Makefile test_problems/cathermo/testIAPWS/Makefile test_problems/cathermo/testIAPWSPres/Makefile test_problems/cathermo/testIAPWSTripP/Makefile test_problems/cathermo/testWaterPDSS/Makefile test_problems/cathermo/testWaterTP/Makefile test_problems/cathermo/HMW_test_1/Makefile test_problems/cathermo/HMW_test_3/Makefile test_problems/cathermo/HMW_graph_GvT/Makefile test_problems/cathermo/HMW_graph_GvI/Makefile test_problems/cathermo/HMW_graph_HvT/Makefile test_problems/cathermo/HMW_graph_CpvT/Makefile test_problems/cathermo/HMW_graph_VvT/Makefile test_problems/cathermo/DH_graph_1/Makefile test_problems/cathermo/DH_graph_acommon/Makefile test_problems/cathermo/DH_graph_NM/Makefile test_problems/cathermo/DH_graph_Pitzer/Makefile test_problems/cathermo/DH_graph_bdotak/Makefile test_problems/cathermo/HMW_dupl_test/Makefile test_problems/cathermo/VPissp/Makefile test_problems/VCSnonideal/Makefile test_problems/VPsilane_test/Makefile test_problems/VPsilane_test/runtest test_problems/VCSnonideal/NaCl_equil/Makefile bin/install_tsc" + ac_config_files="$ac_config_files Makefile Cantera/Makefile Cantera/src/Makefile Cantera/src/base/Makefile Cantera/src/zeroD/Makefile Cantera/src/oneD/Makefile Cantera/src/converters/Makefile Cantera/src/transport/Makefile Cantera/src/thermo/Makefile Cantera/src/kinetics/Makefile Cantera/src/numerics/Makefile Cantera/src/spectra/Makefile Cantera/src/equil/Makefile Cantera/clib/src/Makefile Cantera/fortran/src/Makefile Cantera/fortran/f77demos/f77demos.mak Cantera/fortran/f77demos/Makefile Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/cxx/demos/combustor/Makefile Cantera/cxx/demos/combustor/Makefile.install Cantera/cxx/demos/flamespeed/Makefile Cantera/cxx/demos/flamespeed/Makefile.install Cantera/cxx/demos/kinetics1/Makefile Cantera/cxx/demos/kinetics1/Makefile.install Cantera/cxx/demos/NASA_coeffs/Makefile Cantera/cxx/demos/NASA_coeffs/Makefile.install Cantera/cxx/demos/rankine/Makefile Cantera/cxx/demos/rankine/Makefile.install Cantera/cxx/include/Cantera.mak Cantera/cxx/include/Cantera_bt.mak Cantera/user/Makefile Cantera/python/src/Makefile Cantera/python/examples/equilibrium/Makefile Cantera/python/examples/equilibrium/adiabatic_flame/Makefile Cantera/python/examples/equilibrium/adiabatic_flame/runtest Cantera/python/examples/equilibrium/multiphase_plasma/Makefile Cantera/python/examples/equilibrium/multiphase_plasma/runtest Cantera/python/examples/equilibrium/simple_test/Makefile Cantera/python/examples/equilibrium/simple_test/runtest Cantera/python/examples/equilibrium/stoich_flame/Makefile Cantera/python/examples/equilibrium/stoich_flame/runtest Cantera/python/examples/gasdynamics/isentropic/Makefile Cantera/python/examples/gasdynamics/isentropic/runtest Cantera/python/examples/gasdynamics/soundSpeed/Makefile Cantera/python/examples/gasdynamics/soundSpeed/runtest Cantera/python/examples/flames/adiabatic_flame/Makefile Cantera/python/examples/flames/adiabatic_flame/runtest Cantera/python/examples/flames/flame1/Makefile Cantera/python/examples/flames/flame1/runtest Cantera/python/examples/flames/flame2/Makefile Cantera/python/examples/flames/flame2/runtest Cantera/python/examples/flames/flame_fixed_T/Makefile Cantera/python/examples/flames/flame_fixed_T/runtest Cantera/python/examples/flames/free_h2_air/Makefile Cantera/python/examples/flames/free_h2_air/runtest Cantera/python/examples/flames/npflame1/Makefile Cantera/python/examples/flames/npflame1/runtest Cantera/python/examples/flames/stflame1/Makefile Cantera/python/examples/flames/stflame1/runtest Cantera/python/examples/fuel_cells/Makefile Cantera/python/examples/fuel_cells/runtest Cantera/python/examples/liquid_vapor/critProperties/Makefile Cantera/python/examples/liquid_vapor/critProperties/runtest Cantera/python/examples/liquid_vapor/rankine/Makefile Cantera/python/examples/liquid_vapor/rankine/runtest Cantera/python/examples/kinetics/Makefile Cantera/python/examples/misc/Makefile Cantera/python/examples/reactors/combustor_sim/Makefile Cantera/python/examples/reactors/combustor_sim/runtest Cantera/python/examples/reactors/functors_sim/Makefile Cantera/python/examples/reactors/functors_sim/runtest Cantera/python/examples/reactors/mix1_sim/Makefile Cantera/python/examples/reactors/mix1_sim/runtest Cantera/python/examples/reactors/mix2_sim/Makefile Cantera/python/examples/reactors/mix2_sim/runtest Cantera/python/examples/reactors/piston_sim/Makefile Cantera/python/examples/reactors/piston_sim/runtest Cantera/python/examples/reactors/reactor1_sim/Makefile Cantera/python/examples/reactors/reactor1_sim/runtest Cantera/python/examples/reactors/reactor2_sim/Makefile Cantera/python/examples/reactors/reactor2_sim/runtest Cantera/python/examples/reactors/sensitivity_sim/Makefile Cantera/python/examples/reactors/sensitivity_sim/runtest Cantera/python/examples/reactors/surf_pfr_sim/Makefile Cantera/python/examples/reactors/surf_pfr_sim/runtest Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile Cantera/python/examples/surface_chemistry/diamond_cvd/runtest Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest Cantera/python/examples/transport/Makefile Cantera/python/examples/transport/runtest Cantera/python/examples/flames/Makefile Cantera/python/examples/gasdynamics/Makefile Cantera/python/examples/liquid_vapor/Makefile Cantera/python/examples/reactors/Makefile Cantera/python/examples/surface_chemistry/Makefile ext/lapack/Makefile ext/blas/Makefile ext/cvode/Makefile ext/math/Makefile ext/recipes/Makefile ext/tpx/Makefile ext/Makefile ext/f2c_libs/Makefile ext/f2c_blas/Makefile ext/f2c_lapack/Makefile ext/f2c_math/Makefile examples/Makefile examples/cxx/Makefile tools/Makefile tools/doc/Cantera.cfg tools/doc/Makefile tools/src/Makefile tools/src/sample.mak tools/src/finish_install.py tools/src/package4mac tools/templates/f77/demo.mak tools/templates/f90/demo.mak tools/templates/cxx/demo.mak tools/testtools/Makefile data/inputs/Makefile data/inputs/mkxml test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/spectroscopy/Makefile test_problems/surfSolverTest/Makefile test_problems/diamondSurf/Makefile test_problems/diamondSurf_dupl/Makefile test_problems/ChemEquil_gri_matrix/Makefile test_problems/ChemEquil_gri_pairs/Makefile test_problems/ChemEquil_ionizedGas/Makefile test_problems/ChemEquil_red1/Makefile test_problems/CpJump/Makefile test_problems/mixGasTransport/Makefile test_problems/multiGasTransport/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/NASA9poly_test/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/nasa9_reader/Makefile test_problems/nasa9_reader/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/pureFluidTest/Makefile test_problems/rankine_democxx/Makefile test_problems/python/Makefile test_problems/cathermo/Makefile test_problems/cathermo/issp/Makefile test_problems/cathermo/ims/Makefile test_problems/cathermo/stoichSubSSTP/Makefile test_problems/cathermo/testIAPWS/Makefile test_problems/cathermo/testIAPWSPres/Makefile test_problems/cathermo/testIAPWSTripP/Makefile test_problems/cathermo/testWaterPDSS/Makefile test_problems/cathermo/testWaterTP/Makefile test_problems/cathermo/HMW_test_1/Makefile test_problems/cathermo/HMW_test_3/Makefile test_problems/cathermo/HMW_graph_GvT/Makefile test_problems/cathermo/HMW_graph_GvI/Makefile test_problems/cathermo/HMW_graph_HvT/Makefile test_problems/cathermo/HMW_graph_CpvT/Makefile test_problems/cathermo/HMW_graph_VvT/Makefile test_problems/cathermo/DH_graph_1/Makefile test_problems/cathermo/DH_graph_acommon/Makefile test_problems/cathermo/DH_graph_NM/Makefile test_problems/cathermo/DH_graph_Pitzer/Makefile test_problems/cathermo/DH_graph_bdotak/Makefile test_problems/cathermo/HMW_dupl_test/Makefile test_problems/cathermo/VPissp/Makefile test_problems/VCSnonideal/Makefile test_problems/VPsilane_test/Makefile test_problems/VPsilane_test/runtest test_problems/VCSnonideal/NaCl_equil/Makefile bin/install_tsc" test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -9991,10 +9991,64 @@ do "Cantera/user/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/user/Makefile" ;; "Cantera/python/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/src/Makefile" ;; "Cantera/python/examples/equilibrium/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/Makefile" ;; + "Cantera/python/examples/equilibrium/adiabatic_flame/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/adiabatic_flame/Makefile" ;; + "Cantera/python/examples/equilibrium/adiabatic_flame/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/adiabatic_flame/runtest" ;; + "Cantera/python/examples/equilibrium/multiphase_plasma/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/multiphase_plasma/Makefile" ;; + "Cantera/python/examples/equilibrium/multiphase_plasma/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/multiphase_plasma/runtest" ;; + "Cantera/python/examples/equilibrium/simple_test/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/simple_test/Makefile" ;; + "Cantera/python/examples/equilibrium/simple_test/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/simple_test/runtest" ;; + "Cantera/python/examples/equilibrium/stoich_flame/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/stoich_flame/Makefile" ;; + "Cantera/python/examples/equilibrium/stoich_flame/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/stoich_flame/runtest" ;; + "Cantera/python/examples/gasdynamics/isentropic/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/isentropic/Makefile" ;; + "Cantera/python/examples/gasdynamics/isentropic/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/isentropic/runtest" ;; + "Cantera/python/examples/gasdynamics/soundSpeed/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/soundSpeed/Makefile" ;; + "Cantera/python/examples/gasdynamics/soundSpeed/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/soundSpeed/runtest" ;; + "Cantera/python/examples/flames/adiabatic_flame/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/adiabatic_flame/Makefile" ;; + "Cantera/python/examples/flames/adiabatic_flame/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/adiabatic_flame/runtest" ;; + "Cantera/python/examples/flames/flame1/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame1/Makefile" ;; + "Cantera/python/examples/flames/flame1/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame1/runtest" ;; + "Cantera/python/examples/flames/flame2/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame2/Makefile" ;; + "Cantera/python/examples/flames/flame2/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame2/runtest" ;; + "Cantera/python/examples/flames/flame_fixed_T/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame_fixed_T/Makefile" ;; + "Cantera/python/examples/flames/flame_fixed_T/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame_fixed_T/runtest" ;; + "Cantera/python/examples/flames/free_h2_air/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/free_h2_air/Makefile" ;; + "Cantera/python/examples/flames/free_h2_air/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/free_h2_air/runtest" ;; + "Cantera/python/examples/flames/npflame1/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/npflame1/Makefile" ;; + "Cantera/python/examples/flames/npflame1/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/npflame1/runtest" ;; + "Cantera/python/examples/flames/stflame1/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/stflame1/Makefile" ;; + "Cantera/python/examples/flames/stflame1/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/stflame1/runtest" ;; "Cantera/python/examples/fuel_cells/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/fuel_cells/Makefile" ;; + "Cantera/python/examples/fuel_cells/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/fuel_cells/runtest" ;; + "Cantera/python/examples/liquid_vapor/critProperties/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/critProperties/Makefile" ;; + "Cantera/python/examples/liquid_vapor/critProperties/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/critProperties/runtest" ;; + "Cantera/python/examples/liquid_vapor/rankine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/rankine/Makefile" ;; + "Cantera/python/examples/liquid_vapor/rankine/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/rankine/runtest" ;; "Cantera/python/examples/kinetics/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/kinetics/Makefile" ;; "Cantera/python/examples/misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/misc/Makefile" ;; + "Cantera/python/examples/reactors/combustor_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/combustor_sim/Makefile" ;; + "Cantera/python/examples/reactors/combustor_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/combustor_sim/runtest" ;; + "Cantera/python/examples/reactors/functors_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/functors_sim/Makefile" ;; + "Cantera/python/examples/reactors/functors_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/functors_sim/runtest" ;; + "Cantera/python/examples/reactors/mix1_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix1_sim/Makefile" ;; + "Cantera/python/examples/reactors/mix1_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix1_sim/runtest" ;; + "Cantera/python/examples/reactors/mix2_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix2_sim/Makefile" ;; + "Cantera/python/examples/reactors/mix2_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix2_sim/runtest" ;; + "Cantera/python/examples/reactors/piston_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/piston_sim/Makefile" ;; + "Cantera/python/examples/reactors/piston_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/piston_sim/runtest" ;; + "Cantera/python/examples/reactors/reactor1_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor1_sim/Makefile" ;; + "Cantera/python/examples/reactors/reactor1_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor1_sim/runtest" ;; + "Cantera/python/examples/reactors/reactor2_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor2_sim/Makefile" ;; + "Cantera/python/examples/reactors/reactor2_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor2_sim/runtest" ;; + "Cantera/python/examples/reactors/sensitivity_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/sensitivity_sim/Makefile" ;; + "Cantera/python/examples/reactors/sensitivity_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/sensitivity_sim/runtest" ;; + "Cantera/python/examples/reactors/surf_pfr_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/surf_pfr_sim/Makefile" ;; + "Cantera/python/examples/reactors/surf_pfr_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/surf_pfr_sim/runtest" ;; + "Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile" ;; + "Cantera/python/examples/surface_chemistry/diamond_cvd/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/diamond_cvd/runtest" ;; + "Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile" ;; + "Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest" ;; "Cantera/python/examples/transport/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/transport/Makefile" ;; + "Cantera/python/examples/transport/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/transport/runtest" ;; "Cantera/python/examples/flames/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/Makefile" ;; "Cantera/python/examples/gasdynamics/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/Makefile" ;; "Cantera/python/examples/liquid_vapor/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/Makefile" ;; @@ -10826,6 +10880,87 @@ fi if test -f "test_problems/VPsilane_test/runtest"; then chmod +x test_problems/VPsilane_test/runtest fi +if test -f "Cantera/python/examples/equilibrium/adiabatic_flame/runtest"; then + chmod +x Cantera/python/examples/equilibrium/adiabatic_flame/runtest +fi +if test -f "Cantera/python/examples/equilibrium/multiphase_plasma/runtest"; then + chmod +x Cantera/python/examples/equilibrium/multiphase_plasma/runtest +fi +if test -f "Cantera/python/examples/equilibrium/simple_test/runtest"; then + chmod +x Cantera/python/examples/equilibrium/simple_test/runtest +fi +if test -f "Cantera/python/examples/equilibrium/stoich_flame/runtest"; then + chmod +x Cantera/python/examples/equilibrium/stoich_flame/runtest +fi +if test -f "Cantera/python/examples/gasdynamics/isentropic/runtest"; then + chmod +x Cantera/python/examples/gasdynamics/isentropic/runtest +fi +if test -f "Cantera/python/examples/gasdynamics/soundSpeed/runtest"; then + chmod +x Cantera/python/examples/gasdynamics/soundSpeed/runtest +fi +if test -f "Cantera/python/examples/flames/adiabatic_flame/runtest"; then + chmod +x Cantera/python/examples/flames/adiabatic_flame/runtest +fi +if test -f "Cantera/python/examples/flames/flame1/runtest"; then + chmod +x Cantera/python/examples/flames/flame1/runtest +fi +if test -f "Cantera/python/examples/flames/flame2/runtest"; then + chmod +x Cantera/python/examples/flames/flame2/runtest +fi +if test -f "Cantera/python/examples/flames/flame_fixed_T/runtest"; then + chmod +x Cantera/python/examples/flames/flame_fixed_T/runtest +fi +if test -f "Cantera/python/examples/flames/free_h2_air/runtest"; then + chmod +x Cantera/python/examples/flames/free_h2_air/runtest +fi +if test -f "Cantera/python/examples/flames/npflame1/runtest"; then + chmod +x Cantera/python/examples/flames/npflame1/runtest +fi +if test -f "Cantera/python/examples/flames/stflame1/runtest"; then + chmod +x Cantera/python/examples/flames/stflame1/runtest +fi +if test -f "Cantera/python/examples/fuel_cells/runtest"; then + chmod +x Cantera/python/examples/fuel_cells/runtest +fi +if test -f "Cantera/python/examples/liquid_vapor/critProperties/runtest"; then + chmod +x Cantera/python/examples/liquid_vapor/critProperties/runtest +fi +if test -f "Cantera/python/examples/liquid_vapor/rankine/runtest"; then + chmod +x Cantera/python/examples/liquid_vapor/rankine/runtest +fi +if test -f "Cantera/python/examples/reactors/combustor_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/combustor_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/mix1_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/mix1_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/mix2_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/mix2_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/piston_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/piston_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/reactor1_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/reactor1_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/reactor2_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/reactor2_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/sensitivity_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/sensitivity_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/surf_pfr_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/surf_pfr_sim/runtest +fi +if test -f "Cantera/python/examples/surface_chemistry/diamond_cvd/runtest"; then + chmod +x Cantera/python/examples/surface_chemistry/diamond_cvd/runtest +fi +if test -f "Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest"; then + chmod +x Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest +fi +if test -f "Cantera/python/examples/transport/runtest"; then + chmod +x Cantera/python/examples/transport/runtest +fi if test -f "bin/install_tsc"; then chmod +x bin/install_tsc fi diff --git a/configure.in b/configure.in index 5388d58f8..0f308f72f 100755 --- a/configure.in +++ b/configure.in @@ -1733,10 +1733,64 @@ AC_OUTPUT(Makefile \ Cantera/user/Makefile \ Cantera/python/src/Makefile \ Cantera/python/examples/equilibrium/Makefile \ + Cantera/python/examples/equilibrium/adiabatic_flame/Makefile \ + Cantera/python/examples/equilibrium/adiabatic_flame/runtest \ + Cantera/python/examples/equilibrium/multiphase_plasma/Makefile \ + Cantera/python/examples/equilibrium/multiphase_plasma/runtest \ + Cantera/python/examples/equilibrium/simple_test/Makefile \ + Cantera/python/examples/equilibrium/simple_test/runtest \ + Cantera/python/examples/equilibrium/stoich_flame/Makefile \ + Cantera/python/examples/equilibrium/stoich_flame/runtest \ + Cantera/python/examples/gasdynamics/isentropic/Makefile \ + Cantera/python/examples/gasdynamics/isentropic/runtest \ + Cantera/python/examples/gasdynamics/soundSpeed/Makefile \ + Cantera/python/examples/gasdynamics/soundSpeed/runtest \ + Cantera/python/examples/flames/adiabatic_flame/Makefile \ + Cantera/python/examples/flames/adiabatic_flame/runtest \ + Cantera/python/examples/flames/flame1/Makefile \ + Cantera/python/examples/flames/flame1/runtest \ + Cantera/python/examples/flames/flame2/Makefile \ + Cantera/python/examples/flames/flame2/runtest \ + Cantera/python/examples/flames/flame_fixed_T/Makefile \ + Cantera/python/examples/flames/flame_fixed_T/runtest \ + Cantera/python/examples/flames/free_h2_air/Makefile \ + Cantera/python/examples/flames/free_h2_air/runtest \ + Cantera/python/examples/flames/npflame1/Makefile \ + Cantera/python/examples/flames/npflame1/runtest \ + Cantera/python/examples/flames/stflame1/Makefile \ + Cantera/python/examples/flames/stflame1/runtest \ Cantera/python/examples/fuel_cells/Makefile \ + Cantera/python/examples/fuel_cells/runtest \ + Cantera/python/examples/liquid_vapor/critProperties/Makefile \ + Cantera/python/examples/liquid_vapor/critProperties/runtest \ + Cantera/python/examples/liquid_vapor/rankine/Makefile \ + Cantera/python/examples/liquid_vapor/rankine/runtest \ Cantera/python/examples/kinetics/Makefile \ Cantera/python/examples/misc/Makefile \ + Cantera/python/examples/reactors/combustor_sim/Makefile \ + Cantera/python/examples/reactors/combustor_sim/runtest \ + Cantera/python/examples/reactors/functors_sim/Makefile \ + Cantera/python/examples/reactors/functors_sim/runtest \ + Cantera/python/examples/reactors/mix1_sim/Makefile \ + Cantera/python/examples/reactors/mix1_sim/runtest \ + Cantera/python/examples/reactors/mix2_sim/Makefile \ + Cantera/python/examples/reactors/mix2_sim/runtest \ + Cantera/python/examples/reactors/piston_sim/Makefile \ + Cantera/python/examples/reactors/piston_sim/runtest \ + Cantera/python/examples/reactors/reactor1_sim/Makefile \ + Cantera/python/examples/reactors/reactor1_sim/runtest \ + Cantera/python/examples/reactors/reactor2_sim/Makefile \ + Cantera/python/examples/reactors/reactor2_sim/runtest \ + Cantera/python/examples/reactors/sensitivity_sim/Makefile \ + Cantera/python/examples/reactors/sensitivity_sim/runtest \ + Cantera/python/examples/reactors/surf_pfr_sim/Makefile \ + Cantera/python/examples/reactors/surf_pfr_sim/runtest \ + Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile \ + Cantera/python/examples/surface_chemistry/diamond_cvd/runtest \ + Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile \ + Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest \ Cantera/python/examples/transport/Makefile \ + Cantera/python/examples/transport/runtest \ Cantera/python/examples/flames/Makefile \ Cantera/python/examples/gasdynamics/Makefile \ Cantera/python/examples/liquid_vapor/Makefile \ @@ -1841,6 +1895,87 @@ fi if test -f "test_problems/VPsilane_test/runtest"; then chmod +x test_problems/VPsilane_test/runtest fi +if test -f "Cantera/python/examples/equilibrium/adiabatic_flame/runtest"; then + chmod +x Cantera/python/examples/equilibrium/adiabatic_flame/runtest +fi +if test -f "Cantera/python/examples/equilibrium/multiphase_plasma/runtest"; then + chmod +x Cantera/python/examples/equilibrium/multiphase_plasma/runtest +fi +if test -f "Cantera/python/examples/equilibrium/simple_test/runtest"; then + chmod +x Cantera/python/examples/equilibrium/simple_test/runtest +fi +if test -f "Cantera/python/examples/equilibrium/stoich_flame/runtest"; then + chmod +x Cantera/python/examples/equilibrium/stoich_flame/runtest +fi +if test -f "Cantera/python/examples/gasdynamics/isentropic/runtest"; then + chmod +x Cantera/python/examples/gasdynamics/isentropic/runtest +fi +if test -f "Cantera/python/examples/gasdynamics/soundSpeed/runtest"; then + chmod +x Cantera/python/examples/gasdynamics/soundSpeed/runtest +fi +if test -f "Cantera/python/examples/flames/adiabatic_flame/runtest"; then + chmod +x Cantera/python/examples/flames/adiabatic_flame/runtest +fi +if test -f "Cantera/python/examples/flames/flame1/runtest"; then + chmod +x Cantera/python/examples/flames/flame1/runtest +fi +if test -f "Cantera/python/examples/flames/flame2/runtest"; then + chmod +x Cantera/python/examples/flames/flame2/runtest +fi +if test -f "Cantera/python/examples/flames/flame_fixed_T/runtest"; then + chmod +x Cantera/python/examples/flames/flame_fixed_T/runtest +fi +if test -f "Cantera/python/examples/flames/free_h2_air/runtest"; then + chmod +x Cantera/python/examples/flames/free_h2_air/runtest +fi +if test -f "Cantera/python/examples/flames/npflame1/runtest"; then + chmod +x Cantera/python/examples/flames/npflame1/runtest +fi +if test -f "Cantera/python/examples/flames/stflame1/runtest"; then + chmod +x Cantera/python/examples/flames/stflame1/runtest +fi +if test -f "Cantera/python/examples/fuel_cells/runtest"; then + chmod +x Cantera/python/examples/fuel_cells/runtest +fi +if test -f "Cantera/python/examples/liquid_vapor/critProperties/runtest"; then + chmod +x Cantera/python/examples/liquid_vapor/critProperties/runtest +fi +if test -f "Cantera/python/examples/liquid_vapor/rankine/runtest"; then + chmod +x Cantera/python/examples/liquid_vapor/rankine/runtest +fi +if test -f "Cantera/python/examples/reactors/combustor_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/combustor_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/mix1_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/mix1_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/mix2_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/mix2_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/piston_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/piston_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/reactor1_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/reactor1_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/reactor2_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/reactor2_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/sensitivity_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/sensitivity_sim/runtest +fi +if test -f "Cantera/python/examples/reactors/surf_pfr_sim/runtest"; then + chmod +x Cantera/python/examples/reactors/surf_pfr_sim/runtest +fi +if test -f "Cantera/python/examples/surface_chemistry/diamond_cvd/runtest"; then + chmod +x Cantera/python/examples/surface_chemistry/diamond_cvd/runtest +fi +if test -f "Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest"; then + chmod +x Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest +fi +if test -f "Cantera/python/examples/transport/runtest"; then + chmod +x Cantera/python/examples/transport/runtest +fi if test -f "bin/install_tsc"; then chmod +x bin/install_tsc fi