*** empty log message ***
This commit is contained in:
Dave Goodwin
parent
bab3b70c5c
commit
9163cfbbd6
9 changed files with 51 additions and 12 deletions
|
|
@ -100,7 +100,7 @@ namespace Cantera {
|
|||
normal_color = "steelblue";
|
||||
dashed_color = "gray";
|
||||
dot_options = "center=1;";
|
||||
m_font = "Helvetica";
|
||||
m_font = RXNPATH_FONT;
|
||||
bold_min = 0.2;
|
||||
dashed_max = 0.0;
|
||||
label_min = 0.0;
|
||||
|
|
|
|||
|
|
@ -49,6 +49,10 @@ typedef int ftnlen; // Fortran hidden string length type
|
|||
// data file search path.
|
||||
#define DARWIN 1
|
||||
|
||||
|
||||
//--------- Fonts for reaction path diagrams ----------------------
|
||||
#define RXNPATH_FONT "Helvetica"
|
||||
|
||||
//--------- Cantera --------------
|
||||
|
||||
|
||||
|
|
|
|||
4
config.h
4
config.h
|
|
@ -49,6 +49,10 @@ typedef int ftnlen; // Fortran hidden string length type
|
|||
// data file search path.
|
||||
#define DARWIN 1
|
||||
|
||||
|
||||
//--------- Fonts for reaction path diagrams ----------------------
|
||||
#define RXNPATH_FONT "Helvetica"
|
||||
|
||||
//--------- Cantera --------------
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,10 @@ typedef int ftnlen; // Fortran hidden string length type
|
|||
// data file search path.
|
||||
#undef DARWIN
|
||||
|
||||
|
||||
//--------- Fonts for reaction path diagrams ----------------------
|
||||
#undef RXNPATH_FONT
|
||||
|
||||
//--------- Cantera --------------
|
||||
|
||||
|
||||
|
|
|
|||
17
config/configure
vendored
17
config/configure
vendored
|
|
@ -271,7 +271,7 @@ PACKAGE_STRING=
|
|||
PACKAGE_BUGREPORT=
|
||||
|
||||
ac_unique_file="Cantera.README"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS local_inst ctversion ct_libdir ct_incdir ct_incroot ct_bindir ct_datadir ct_demodir ct_templdir ct_mandir ct_tutdir ct_docdir ct_dir CANTERA_LIBDIR CANTERA_INCDIR CT_TOOLS_BIN CANTERA_BINDIR CANTERA_EXAMPLES_DIR CANTERA_DATADIR username ctroot build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os buildlib MAKE ARCHIVE SOEXT SHARED PIC LCXX_FLAGS LCXX_END_LIBS USERDIR INCL_USER_CODE KERNEL BUILD_CK LIB_DIR LAPACK_LIBRARY build_lapack BLAS_LIBRARY build_blas LOCAL_LIBS CT_SHARED_LIB BUILD_F90 PYTHON_CMD BUILD_PYTHON BUILD_MATLAB BUILD_CLIB export_name CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CXX_DEPENDS F77 FFLAGS ac_ct_F77 FLIBS OS_IS_DARWIN OS_IS_WIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT local_math_libs math_libs SO LDSHARED LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS local_inst ctversion homedir ct_libdir ct_incdir ct_incroot ct_bindir ct_datadir ct_demodir ct_templdir ct_mandir ct_tutdir ct_docdir ct_dir CANTERA_LIBDIR CANTERA_INCDIR CT_TOOLS_BIN CANTERA_BINDIR CANTERA_EXAMPLES_DIR CANTERA_DATADIR username ctroot build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os buildlib MAKE ARCHIVE SOEXT SHARED PIC LCXX_FLAGS LCXX_END_LIBS USERDIR INCL_USER_CODE KERNEL BUILD_CK LIB_DIR LAPACK_LIBRARY build_lapack BLAS_LIBRARY build_blas LOCAL_LIBS CT_SHARED_LIB BUILD_F90 PYTHON_CMD BUILD_PYTHON BUILD_MATLAB BUILD_CLIB export_name CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CXX_DEPENDS F77 FFLAGS ac_ct_F77 FLIBS OS_IS_DARWIN OS_IS_WIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT local_math_libs math_libs SO LDSHARED LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1299,6 +1299,9 @@ echo "Cantera will be installed in ${prefix}"
|
|||
ctversion=${CANTERA_VERSION}
|
||||
|
||||
|
||||
homedir=${HOME}
|
||||
|
||||
|
||||
if test -z $local_inst; then
|
||||
ct_libdir=${prefix}/lib/cantera-${ctversion}
|
||||
ct_incdir=${prefix}/include/cantera
|
||||
|
|
@ -1453,6 +1456,11 @@ _ACEOF
|
|||
|
||||
fi
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define RXNPATH_FONT "$RPFONT"
|
||||
_ACEOF
|
||||
|
||||
|
||||
if test -z "$MAKE"; then MAKE='make'; fi
|
||||
|
||||
|
||||
|
|
@ -3086,7 +3094,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:3089:" \
|
||||
echo "$as_me:3097:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -3263,7 +3271,7 @@ _ACEOF
|
|||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_verb"
|
||||
(eval echo $as_me:3266: \"$ac_link\") >&5
|
||||
(eval echo $as_me:3274: \"$ac_link\") >&5
|
||||
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$ac_f77_v_output" >&5
|
||||
FFLAGS=$ac_save_FFLAGS
|
||||
|
|
@ -3343,7 +3351,7 @@ _ACEOF
|
|||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
|
||||
(eval echo $as_me:3346: \"$ac_link\") >&5
|
||||
(eval echo $as_me:3354: \"$ac_link\") >&5
|
||||
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$ac_f77_v_output" >&5
|
||||
FFLAGS=$ac_save_FFLAGS
|
||||
|
|
@ -4202,6 +4210,7 @@ s,@ECHO_T@,$ECHO_T,;t t
|
|||
s,@LIBS@,$LIBS,;t t
|
||||
s,@local_inst@,$local_inst,;t t
|
||||
s,@ctversion@,$ctversion,;t t
|
||||
s,@homedir@,$homedir,;t t
|
||||
s,@ct_libdir@,$ct_libdir,;t t
|
||||
s,@ct_incdir@,$ct_incdir,;t t
|
||||
s,@ct_incroot@,$ct_incroot,;t t
|
||||
|
|
|
|||
|
|
@ -55,6 +55,9 @@ AC_SUBST(local_inst)
|
|||
ctversion=${CANTERA_VERSION}
|
||||
AC_SUBST(ctversion)
|
||||
|
||||
homedir=${HOME}
|
||||
AC_SUBST(homedir)
|
||||
|
||||
if test -z $local_inst; then
|
||||
ct_libdir=${prefix}/lib/cantera-${ctversion}
|
||||
ct_incdir=${prefix}/include/cantera
|
||||
|
|
@ -125,6 +128,8 @@ if test -n "${OS_IS_DARWIN}"; then
|
|||
AC_DEFINE(DARWIN)
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(RXNPATH_FONT,"$RPFONT")
|
||||
|
||||
if test -z "$MAKE"; then MAKE='make'; fi
|
||||
AC_SUBST(MAKE)
|
||||
|
||||
|
|
|
|||
13
configure
vendored
13
configure
vendored
|
|
@ -73,6 +73,8 @@ BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"}
|
|||
# located.
|
||||
USER_SRC_DIR="Cantera/user"
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Kernel Configuration
|
||||
#----------------------------------------------------------------------
|
||||
|
|
@ -148,10 +150,10 @@ LAPACK_FTN_TRAILING_UNDERSCORE='y'
|
|||
LAPACK_FTN_STRING_LEN_AT_END='y'
|
||||
|
||||
|
||||
|
||||
#------------------------------------------------------------------
|
||||
# C++ compiler options
|
||||
#------------------------------------------------------------------
|
||||
#
|
||||
|
||||
# the C++ compiler to use.
|
||||
#
|
||||
|
|
@ -174,6 +176,7 @@ PIC=${PIC:=-fPIC}
|
|||
SHARED=${SHARED:="-shared"}
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
# Fortran compiler options
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -201,6 +204,7 @@ FORT_MODULE_DIRECTORY=${FORT_MODULE_DIRECTORY:=$CANTERA_ROOT/include/fortran}
|
|||
FORT_MODULE_PATH_CMD=${FORT_MODULE_PATH_CMD:="-I$FORT_MODULE_DIRECTORY"}
|
||||
|
||||
|
||||
|
||||
#------------------------------------------------------
|
||||
# other programs
|
||||
#------------------------------------------------------
|
||||
|
|
@ -224,6 +228,12 @@ F90_EXT=${F90_EXT:=f90}
|
|||
|
||||
CT_SHARED_LIB=${CT_SHARED_LIB:=clib}
|
||||
|
||||
# The font to use in reaction path diagrams. This must be a font name
|
||||
# recognized by the 'dot' program. On linux systems, this should be
|
||||
# lowercase 'helvetica'.
|
||||
RPFONT=${RPFONT:="Helvetica"}
|
||||
|
||||
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
#------------------- don't change anything below!! ---------------------
|
||||
|
|
@ -277,6 +287,7 @@ export PIC
|
|||
export SHARED
|
||||
export SOEXT
|
||||
export MAKE
|
||||
export RPFONT
|
||||
|
||||
#checkroot="checking whether CANTERA_ROOT is properly set..."
|
||||
#if test "$CANTERA_ROOT_INIT" = "$CANTERA_ROOT"; then
|
||||
|
|
|
|||
|
|
@ -14,8 +14,9 @@ demodir = '/usr/local/cantera/1.5.3/demos'
|
|||
datadir = '/usr/local/cantera/1.5.3/data'
|
||||
templdir = '/usr/local/cantera/1.5.3/templates'
|
||||
ctdir = '/usr/local/cantera/1.5.3'
|
||||
home = '/Users/dgg'
|
||||
|
||||
f = open(ctdir+'/setup_cantera','w')
|
||||
f = open(home+'/setup_cantera','w')
|
||||
f.write('#!/bin/sh\n')
|
||||
f.write('LD_LIBRARY_PATH='+libdir+':$LD_LIBRARY_PATH\nexport LD_LIBRARY_PATH\n')
|
||||
f.write('PATH='+bindir+':$PATH\nexport PATH\n')
|
||||
|
|
@ -120,12 +121,12 @@ else:
|
|||
|
||||
print """
|
||||
|
||||
setup script """+ctdir+"""/setup_cantera
|
||||
setup script """+home+"""/setup_cantera
|
||||
|
||||
The setup script configures the environment for Cantera. It is
|
||||
recommended that you run this script by typing
|
||||
|
||||
source """+ctdir+"""/setup_cantera
|
||||
source """+home+"""/setup_cantera
|
||||
|
||||
before using Cantera, or else
|
||||
include its contents in your shell login script.
|
||||
|
|
|
|||
|
|
@ -14,8 +14,9 @@ demodir = '@ct_demodir@'
|
|||
datadir = '@ct_datadir@'
|
||||
templdir = '@ct_templdir@'
|
||||
ctdir = '@ct_dir@'
|
||||
home = '@homedir@'
|
||||
|
||||
f = open(ctdir+'/setup_cantera','w')
|
||||
f = open(home+'/setup_cantera','w')
|
||||
f.write('#!/bin/sh\n')
|
||||
f.write('LD_LIBRARY_PATH='+libdir+':$LD_LIBRARY_PATH\nexport LD_LIBRARY_PATH\n')
|
||||
f.write('PATH='+bindir+':$PATH\nexport PATH\n')
|
||||
|
|
@ -120,12 +121,12 @@ else:
|
|||
|
||||
print """
|
||||
|
||||
setup script """+ctdir+"""/setup_cantera
|
||||
setup script """+home+"""/setup_cantera
|
||||
|
||||
The setup script configures the environment for Cantera. It is
|
||||
recommended that you run this script by typing
|
||||
|
||||
source """+ctdir+"""/setup_cantera
|
||||
source """+home+"""/setup_cantera
|
||||
|
||||
before using Cantera, or else
|
||||
include its contents in your shell login script.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue