From aeffcf60d6614d008e1de2b8c6ee5a18cbf0fb3c Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Fri, 7 Jul 2006 18:07:53 +0000 Subject: [PATCH] Turned on and documented the DEBUG_MODE capability. It will now create a config.h entry, and a Makefile.in substitution variable, CANTERA_DEBUG_MODE, which can be used in the test suite. --- config.h.in | 3 +++ configure | 33 +++++++++++++++++++++++++++++---- configure.in | 21 +++++++++++++++++++++ preconfig | 10 +++++++++- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/config.h.in b/config.h.in index f24ad0e82..82f97bedf 100755 --- a/config.h.in +++ b/config.h.in @@ -12,6 +12,9 @@ #define DEV_EQUIL +// Compile in additional debug printing where available. +// Note, the printing may need to be turned on via a switch. +// This just compiles in the code. #undef DEBUG_MODE //------------------------ Fortran settings -------------------// diff --git a/configure b/configure index 21d550208..1941e8d88 100755 --- a/configure +++ b/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -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 BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB USERDIR INCL_USER_CODE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT use_sundials CVODE_LIBS sundials_include phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CXX CXXFLAGS ac_ct_CXX CPP EGREP SOEXT SHARED PIC CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 FLIBS F90 BUILD_F90 F90FLAGS F90BUILDFLAGS precompile_headers CXX_DEPENDS OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs 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 BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB USERDIR INCL_USER_CODE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT use_sundials CVODE_LIBS sundials_include CANTERA_DEBUG_MODE phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CXX CXXFLAGS ac_ct_CXX CPP EGREP SOEXT SHARED PIC CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 FLIBS F90 BUILD_F90 F90FLAGS F90BUILDFLAGS precompile_headers CXX_DEPENDS OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -2745,6 +2745,24 @@ fi ######################################################### # The Cantera Kernel ######################################################### +# +# DEBUG_MODE: Specify that additional code be compiled in +# that allows more debug printing where available. +# default = "y" +# +DEBUG_MODE=${DEBUG_MODE:="y"} +CANTERA_DEBUG_MODE=1 +if test "$DEBUG_MODE" = "y" -o "$DEBUG_MODE" = "Y" ; then + cat >>confdefs.h <<\_ACEOF +#define DEBUG_MODE 1 +_ACEOF + + CANTERA_DEBUG_MODE="1" +else + CANTERA_DEBUG_MODE="0" +fi + + KERNEL='base' KERNEL_OBJ='$(BASE_OBJ)' BUILD_CK= @@ -2903,6 +2921,12 @@ fi # echo " " echo "Config SUMMARY OF INCLUDED/EXCLUDED CAPABILITIES:" + +if test "$CANTERA_DEBUG_MODE" = "1" ; then + echo " Cantera Debug Mode = ON" +else + echo " Cantera Debug Mode = OFF" +fi if test "$NEED_TRANSPORT" = "1" ; then echo " Calculation of Transport Props = ON" else @@ -8513,7 +8537,7 @@ fi # Provide some information about the compiler. -echo "$as_me:8516:" \ +echo "$as_me:8540:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -8716,7 +8740,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_verb" -(eval echo $as_me:8719: \"$ac_link\") >&5 +(eval echo $as_me:8743: \"$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 @@ -8794,7 +8818,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_cv_prog_f77_v" -(eval echo $as_me:8797: \"$ac_link\") >&5 +(eval echo $as_me:8821: \"$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 @@ -9954,6 +9978,7 @@ s,@OBJEXT@,$OBJEXT,;t t s,@use_sundials@,$use_sundials,;t t s,@CVODE_LIBS@,$CVODE_LIBS,;t t s,@sundials_include@,$sundials_include,;t t +s,@CANTERA_DEBUG_MODE@,$CANTERA_DEBUG_MODE,;t t s,@phase_object_files@,$phase_object_files,;t t s,@phase_header_files@,$phase_header_files,;t t s,@COMPILE_IDEAL_SOLUTIONS@,$COMPILE_IDEAL_SOLUTIONS,;t t diff --git a/configure.in b/configure.in index c5b760ac1..8f254912e 100755 --- a/configure.in +++ b/configure.in @@ -324,6 +324,21 @@ AC_SUBST(sundials_include) ######################################################### # The Cantera Kernel ######################################################### +# +# DEBUG_MODE: Specify that additional code be compiled in +# that allows more debug printing where available. +# default = "y" +# +DEBUG_MODE=${DEBUG_MODE:="y"} +CANTERA_DEBUG_MODE=1 +if test "$DEBUG_MODE" = "y" -o "$DEBUG_MODE" = "Y" ; then + AC_DEFINE(DEBUG_MODE) + CANTERA_DEBUG_MODE="1" +else + CANTERA_DEBUG_MODE="0" +fi +AC_SUBST(CANTERA_DEBUG_MODE) + KERNEL='base' KERNEL_OBJ='$(BASE_OBJ)' BUILD_CK= @@ -461,6 +476,12 @@ AC_SUBST(LIB_DIR) # echo " " echo "Config SUMMARY OF INCLUDED/EXCLUDED CAPABILITIES:" + +if test "$CANTERA_DEBUG_MODE" = "1" ; then + echo " Cantera Debug Mode = ON" +else + echo " Cantera Debug Mode = OFF" +fi if test "$NEED_TRANSPORT" = "1" ; then echo " Calculation of Transport Props = ON" else diff --git a/preconfig b/preconfig index edf153607..d9b5e3bae 100755 --- a/preconfig +++ b/preconfig @@ -156,7 +156,14 @@ F90FLAGS=${F90FLAGS:='-O3'} # for C++ applications. USER_SRC_DIR="Cantera/user" # don't change this - +# In some cases, extra printing has been put into the code to aid +# in debugging and verification. In order for the printing to occur +# an additional switch must be turned on. However, compilation +# of the printing is affected by the following DEBUG_MODE option. +# This is turned on here by default. However, for a speedier executable +# compilation of these statements may be turned off by setting +# the parameter to "n". +DEBUG_MODE="y" #---------------------------------------------------------------------- # Kernel Configuration @@ -390,6 +397,7 @@ CANTERA_VERSION=${CANTERA_VERSION:="1.6.0"} export CANTERA_VERSION export USER_SRC_DIR +export DEBUG_MODE export ARCHIVE export RANLIB export BITCOMPILE