diff --git a/Cantera/python/Cantera/OneD/onedim.py b/Cantera/python/Cantera/OneD/onedim.py index 24ffb8b97..dfee04a7d 100644 --- a/Cantera/python/Cantera/OneD/onedim.py +++ b/Cantera/python/Cantera/OneD/onedim.py @@ -144,7 +144,7 @@ class Domain1D: d[b] = tol[b] for b in d.keys(): n = self.componentIndex(b) - print 'setting tol for ',b,' itime = ',itime + # print 'setting tol for ',b,' itime = ',itime _cantera.domain_setTolerances(self._hndl, n, d[b][0], d[b][1], itime) diff --git a/Makefile.in b/Makefile.in index 4877ffd62..eeba02cbd 100755 --- a/Makefile.in +++ b/Makefile.in @@ -155,16 +155,18 @@ ifneq ($(build_python),0) cd Cantera/python; @MAKE@ install ifeq ($(build_python),2) @(for exdir in $(PY_EXAMPLES) ; do \ - @INSTALL@ -d @ct_demodir@/python/$${exdir} ; \ + @INSTALL@ -d @ct_demodir@/python/$${exdir} ; \ (for ihhh in Cantera/python/examples/$${exdir}/*.py ; do \ - @INSTALL@ $${ihhh} @ct_demodir@/python/$${exdir} ; \ + @INSTALL@ $${ihhh} @ct_demodir@/python/$${exdir} ; \ echo "@INSTALL@ $${ihhh} @ct_demodir@/python/$${exdir}" ; \ - done ) \ + done ) ; \ + @INSTALL@ Cantera/python/examples/$${exdir}/Makefile @ct_demodir@/python/$${exdir} ; \ done) @(for ihhh in Cantera/python/examples/flames/*.dat ; do \ @INSTALL@ $${ihhh} @ct_demodir@/python/flames ; \ echo "@INSTALL@ $${ihhh} @ct_demodir@/python/flames" ; \ done ) + @INSTALL@ Cantera/python/examples/Makefile @ct_demodir@/python @INSTALL@ -d @ct_tutdir@/python @(for ihhh in Cantera/python/tutorial/*.py ; do \ @INSTALL@ $${ihhh} @ct_tutdir@/python ; \ diff --git a/ext/f2c_libs/arith.h b/ext/f2c_libs/arith.h index 508eb414f..9841db38a 100644 --- a/ext/f2c_libs/arith.h +++ b/ext/f2c_libs/arith.h @@ -1,4 +1,3 @@ -#define IEEE_MC68k -#define Arith_Kind_ASL 2 -#define Double_Align +#define IEEE_8087 +#define Arith_Kind_ASL 1 #define NANCHECK diff --git a/preconfig b/preconfig index 8765de604..0dba81804 100755 --- a/preconfig +++ b/preconfig @@ -254,14 +254,14 @@ USE_SUNDIALS=${USE_SUNDIALS:='default'} # This is where you installed sundials if you used the --prefix option # when you configured sundials. If you didn't use the prefix option, # then comment this line out. -SUNDIALS_HOME=${SUNDIALS_HOME:=$HOME/sundials} +SUNDIALS_HOME=${SUNDIALS_HOME:=$HOME/sundials23} # It is recommended that you install the newest release of sundials # (currently 2.3.0) before building Cantera. But if you want to use an # older version, set SUNDIALS_VERSION to the version you have. # Acceptable values are '2.2' and '2.3' only; anything else will cause # Cantera to not use sundials. -SUNDIALS_VERSION=${SUNDIALS_VERSION:='2.2'} +SUNDIALS_VERSION=${SUNDIALS_VERSION:='2.3'} #----------------------------------------------------------------- # BLAS and LAPACK