diff --git a/docs/install_examples/cygwin_gcc344_f2c_numeric.sh b/docs/install_examples/cygwin_gcc344_dbg_f2c_numeric.sh similarity index 72% rename from docs/install_examples/cygwin_gcc344_f2c_numeric.sh rename to docs/install_examples/cygwin_gcc344_dbg_f2c_numeric.sh index 71f82d694..9c4450748 100755 --- a/docs/install_examples/cygwin_gcc344_f2c_numeric.sh +++ b/docs/install_examples/cygwin_gcc344_dbg_f2c_numeric.sh @@ -2,24 +2,39 @@ # ------------------------------------------------------------------------------ # # Example Cantera pre-preconfig configuration script +# 10/20/09 # # Platform: cygwin -# Compiler: gcc +# Compiler: gcc v. 3.4.4 +# Optimization: Debug version # python: v. 2.5.2 (full installation) # matlab: no # f2c: yes +# num python numeric # # -# Specific places where the User must custimize the installation -# is indiciated with the USER_INPUT_NEEDED lines. +# --------------------------------------------------------------------------- +# The only place where the User must custimize this installation +# is located at the top here: # +# Specify the installation directory here: # -# Specify the installation directory here: -# USER_INPUT_NEEDED +Cantera_Install_Dir='/cygdrive/c/cygwin_env/arch/cygwin/cantera-1.8_develop' # +# Specify the Sundials installation directory here (leave it as a null script +# if you don't want to link sundials in +# +# Sundials_Home='' +Sundials_Home='/cygdrive/c/cygwin_env/arch/cygwin/sundials-2.3.0_dbg' +# +# Specify the Sundials version number (either 2.2, 2.3, or 2.4) +Sundials_Version='2.3' +# Sundials_Version=2.4' # ----------------------------------------------------------------------------- # -CANTERA_CONFIG_PREFIX=/cygdrive/c/cygwin_env/arch/cygwin/cantera-1.8_develop +# User may optionally customize below this line (but doesn't have to) -- +# +CANTERA_CONFIG_PREFIX=$Cantera_Install_Dir export CANTERA_CONFIG_PREFIX SET_PYTHON_SITE_PACKAGE_TOPDIR=y @@ -128,12 +143,19 @@ export MAKE # # Specify the SUNDIALS option # -USE_SUNDIALS='n' +if test -n "$Sundials_Home" +then + USE_SUNDIALS='y' + SUNDIALS_VERSION=$Sundials_Version +else + USE_SUNDIALS='n' +fi export USE_SUNDIALS +export SUNDIALS_VERSION # # Specify where to find the sundials installation directories # -SUNDIALS_HOME='/cygdrive/c/cygwin_env/libraries/sundials' +SUNDIALS_HOME=$Sundials_Home export SUNDIALS_HOME # # Ok, fire off the main preconfig script diff --git a/docs/install_examples/cygwin_gcc344_dbg_f2c_numpy.sh b/docs/install_examples/cygwin_gcc344_dbg_f2c_numpy.sh new file mode 100755 index 000000000..b00277856 --- /dev/null +++ b/docs/install_examples/cygwin_gcc344_dbg_f2c_numpy.sh @@ -0,0 +1,167 @@ +#!/bin/sh +# ------------------------------------------------------------------------------ +# +# Example Cantera pre-preconfig configuration script +# 10/20/09 +# +# Platform: cygwin +# Compiler: gcc v. 3.4.4 +# Optimization: Debug version +# python: v. 2.5.2 (full installation) +# matlab: no +# f2c: yes +# num python: numpy, which is distributed with cygwin +# +# +# --------------------------------------------------------------------------- +# The only place where the User must custimize this installation +# is located at the top here: +# +# Specify the installation directory here: +# +Cantera_Install_Dir='/cygdrive/c/cygwin_env/arch/cygwin/cantera-1.8_develop' +# +# Specify the Sundials installation directory here (leave it as a null script +# if you don't want to link sundials in +# +# Sundials_Home='' +Sundials_Home='/cygdrive/c/cygwin_env/arch/cygwin/sundials-2.3.0_dbg' +# +# Specify the Sundials version number (either 2.2, 2.3, or 2.4) +Sundials_Version='2.3' +# Sundials_Version=2.4' +# ----------------------------------------------------------------------------- +# +CANTERA_CONFIG_PREFIX=$Cantera_Install_Dir +export CANTERA_CONFIG_PREFIX + +SET_PYTHON_SITE_PACKAGE_TOPDIR=y +export SET_PYTHON_SITE_PACKAGE_TOPDIR + +PYTHON_SITE_PACKAGE_TOPDIR=$CANTERA_CONFIG_PREFIX +export PYTHON_SITE_PACKAGE_TOPDIR + +PYTHON_CMD=/usr/bin/python +export PYTHON_CMD + +# +# The full python package works within cygwin. Minimal is needed at the least +# +PYTHON_PACKAGE='full' +#PYTHON_PACKAGE='minimal' +export PYTHON_PACKAGE + +WITH_IDEAL_SOLUTIONS="y" +export WITH_IDEAL_SOLUTIONS + +WITH_ELECTROLYTES="y" +export WITH_ELECTROLYTES + +WITH_VCSNONIDEAL="y" +export WITH_VCSNONIDEAL + +# +# Matlab on the pc is supported through the windows vc++ 8.0 compilation +# environment. Therefore, we turn it off here. +# +BUILD_MATLAB_TOOLBOX="n" +export BUILD_MATLAB_TOOLBOX + +NUMARRAY_HOME='' +export NUMARRAY_HOME +# +# Turns on extra debugging +# +DEBUG_MODE='y' +export DEBUG_MODE +# +# Numpy must have already been installed in the +# /usr/lib/python2.5/site-packages +# directory before the Cantera installation. If not, you can always +# do a minimal python installation and forego forming Cantera's python interface. +# +USE_NUMPY="y" +export USE_NUMPY +# +# Specify where to find the include files within the numpy distribution +# +NUMPY_INC_DIR="/usr/lib/python2.5/site-packages/numpy/core/include" +export NUMPY_INC_DIR +# +# We use F2C with the cygwin installation. However, the g77 interface should +# work too. +# +BUILD_WITH_F2C="y" +export BUILD_WITH_F2C + +BITCOMPILE="32" +export BITCOMPILE +# +# We use the default gcc compilers that come with cygwin. Currently, this +# is gcc v. 3.4.4. +# +CXX='g++' +export CXX +# +CC='gcc' +export CC +# +F77='g77' +export F77 +# +# Debug options +# +# -DDEBUG_HKM +# -DDEBUG_BASISOPTIMIZE +# -DDEBUG_CHEMEQUIL +# +CXXFLAGS="-g -Wall " +export CXXFLAGS + +CFLAGS=$CXXFLAGS +export CFLAGS + +FFLAGS="-g " +export FFLAGS + +LDFLAGS='-g' +export LDFLAGS + +LCXX_END_LIBS="-lm -lstdc++" +export LCXX_END_LIBS + +# The gcc compiler in cygwin will put a .exe extension on anyway. So, +# we might as well define this field as .exe. cygwin will automagically +# equate executable files with no extension as having an .exe extension. +# This is very mysterious. However, the mystery goes away if you define +# these files to have a .exe suffix from the getgo. +EXE_EXT=".exe" +export EXE_EXT + +EXTRA_LINK="" +export EXTRA_LINK + +MAKE=make +export MAKE +# +# Specify the SUNDIALS option +# +if test -n "$Sundials_Home" +then + USE_SUNDIALS='y' + SUNDIALS_VERSION=$Sundials_Version +else + USE_SUNDIALS='n' +fi +export USE_SUNDIALS +export SUNDIALS_VERSION +# +# Specify where to find the sundials installation directories +# +SUNDIALS_HOME=$Sundials_Home +export SUNDIALS_HOME +# +# Ok, fire off the main preconfig script +# +./preconfig + diff --git a/docs/install_examples/linux.32_gcc343_python235_numeric b/docs/install_examples/linux_32_gcc343_dbg_python235_numeric similarity index 100% rename from docs/install_examples/linux.32_gcc343_python235_numeric rename to docs/install_examples/linux_32_gcc343_dbg_python235_numeric diff --git a/docs/install_examples/linux.32_gcc343_opt_python235_numeric b/docs/install_examples/linux_32_gcc343_opt_python235_numeric similarity index 100% rename from docs/install_examples/linux.32_gcc343_opt_python235_numeric rename to docs/install_examples/linux_32_gcc343_opt_python235_numeric diff --git a/docs/install_examples/linux.64_gcc424_python252_numpy b/docs/install_examples/linux_64_gcc424_dbg_python252_numpy similarity index 100% rename from docs/install_examples/linux.64_gcc424_python252_numpy rename to docs/install_examples/linux_64_gcc424_dbg_python252_numpy diff --git a/docs/install_examples/linux.64_gcc424_opt_python252_numpy b/docs/install_examples/linux_64_gcc424_opt_python252_numpy similarity index 100% rename from docs/install_examples/linux.64_gcc424_opt_python252_numpy rename to docs/install_examples/linux_64_gcc424_opt_python252_numpy diff --git a/docs/install_examples/mac.gcc401_python251_numpy b/docs/install_examples/mac_gcc401_python251_numpy similarity index 100% rename from docs/install_examples/mac.gcc401_python251_numpy rename to docs/install_examples/mac_gcc401_python251_numpy diff --git a/docs/install_examples/sol10_64bit_CC57_py24_numarray b/docs/install_examples/sol10_64bit_CC57_dbg_py24_numarray similarity index 100% rename from docs/install_examples/sol10_64bit_CC57_py24_numarray rename to docs/install_examples/sol10_64bit_CC57_dbg_py24_numarray