*** empty log message ***

2025-02-25 18:55:29 -06:00 · 2008-01-11 21:52:04 +00:00
parent d08fc24fb0
commit 9161e7ab04
11 changed files with 40 additions and 3 deletions
--- a/Cantera/python/examples/flames/Makefile
+++ b/Cantera/python/examples/flames/Makefile
@@ -2,6 +2,7 @@

 PY_DEMOS = flame1.py flame2.py stflame1.py npflame1.py free_h2_air.py \
           adiabatic_flame.py fixed_T_flame.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/Cantera/python/examples/fuel_cells/Makefile
+++ b/Cantera/python/examples/fuel_cells/Makefile
@@ -1,6 +1,7 @@
 #!/bin/sh

 PY_DEMOS = sofc.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/Cantera/python/examples/gasdynamics/Makefile
+++ b/Cantera/python/examples/gasdynamics/Makefile
@@ -1,6 +1,7 @@
 #!/bin/sh

 PY_DEMOS = isentropic.py soundSpeeds.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/Cantera/python/examples/kinetics/Makefile
+++ b/Cantera/python/examples/kinetics/Makefile
@@ -1,6 +1,7 @@
 #!/bin/sh

 PY_DEMOS = ratecoeffs.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/Cantera/python/examples/liquid_vapor/Makefile
+++ b/Cantera/python/examples/liquid_vapor/Makefile
@@ -1,6 +1,7 @@
 #!/bin/sh

 PY_DEMOS = critProperties.py rankine.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/Cantera/python/examples/misc/Makefile
+++ b/Cantera/python/examples/misc/Makefile
@@ -1,6 +1,7 @@
 #!/bin/sh

 PY_DEMOS = rxnpath1.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/Cantera/python/examples/reactors/Makefile
+++ b/Cantera/python/examples/reactors/Makefile
@@ -2,6 +2,7 @@

 PY_DEMOS = combustor.py function1.py mix1.py mix2.py piston.py reactor1.py \
           reactor2.py sensitivity1.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/Cantera/python/examples/surface_chemistry/Makefile
+++ b/Cantera/python/examples/surface_chemistry/Makefile
@@ -1,6 +1,7 @@
 #!/bin/sh

 PY_DEMOS = catcomb.py diamond.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/Cantera/python/examples/transport/Makefile
+++ b/Cantera/python/examples/transport/Makefile
@@ -1,6 +1,7 @@
 #!/bin/sh

 PY_DEMOS = dustygas.py
+PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python

 run:
 	@(for py in $(PY_DEMOS) ; do \
--- a/18
+++ b/18
@@ -3519,7 +3519,7 @@ precompile_headers=no
 # CFLAGS: flags that get attached to the C compiler
 #             statement. AFLAGS are base flags that
 #             get added to compilers and loaders.
-# FFLAGS: flags that get attached to the C compiler
+# FFLAGS: flags that get attached to the Fortran compiler
 #             statement. AFLAGS are base flags that
 #             get added to compilers and loaders.
 #
@@ -9088,6 +9088,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu


 override_f77_libs=0;
+
+if test -n $build_with_f2c_libs; then
+  FFLAGS=
+fi
+
 #case $ac_sys_system in
 #  Darwin*)  FLIBS='-lSystem'; override_f77_libs=1; SHARED_CTLIB=0;;
 #esac
@@ -9405,7 +9410,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/isentropic.dsp Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/matlab/setup_winmatlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/user/Makefile Cantera/python/src/Makefile Cantera/python/examples/equilibrium/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/VCSnonideal/Makefile 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/isentropic.dsp Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/matlab/setup_winmatlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile 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/VCSnonideal/Makefile test_problems/VCSnonideal/NaCl_equil/Makefile bin/install_tsc"


 test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -9906,6 +9911,15 @@ 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/fuel_cells/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/fuel_cells/Makefile" ;;
+  "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/transport/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/transport/Makefile" ;;
+  "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" ;;
+  "Cantera/python/examples/reactors/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/Makefile" ;;
+  "Cantera/python/examples/surface_chemistry/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/Makefile" ;;
  "ext/lapack/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/lapack/Makefile" ;;
  "ext/blas/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/blas/Makefile" ;;
  "ext/cvode/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/cvode/Makefile" ;;
--- a/configure.in
+++ b/configure.in
@@ -1223,7 +1223,7 @@ precompile_headers=no
 # CFLAGS: flags that get attached to the C compiler
 #             statement. AFLAGS are base flags that
 #             get added to compilers and loaders.
-# FFLAGS: flags that get attached to the C compiler
+# FFLAGS: flags that get attached to the Fortran compiler
 #             statement. AFLAGS are base flags that
 #             get added to compilers and loaders.
 #
@@ -1377,6 +1377,11 @@ dnl Checks for libraries.
 AC_F77_LIBRARY_LDFLAGS()

 override_f77_libs=0;
+
+if test -n $build_with_f2c_libs; then
+  FFLAGS=
+fi
+
 #case $ac_sys_system in
 #  Darwin*)  FLIBS='-lSystem'; override_f77_libs=1; SHARED_CTLIB=0;;
 #esac
@@ -1660,6 +1665,15 @@ AC_OUTPUT(Makefile \
 	  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 \