/[MITgcm]/MITgcm/tools/genmake2

Diff of /MITgcm/tools/genmake2

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.236 by jmc,
Fri Aug 24 23:07:27 2012 UTC
+revision 1.242 by heimbach,
Thu Sep 20 23:12:47 2012 UTC
 Line 17 
 Usage: "$0" [OPTIONS]
    where [OPTIONS] can be:
      -help | --help | -h | --h
            Print this help message and exit.
      -adoptfile NAME | --adoptfile NAME | -adof NAME | --adof NAME
        -adoptfile=NAME | --adoptfile=NAME | -adof=NAME | --adof=NAME
            Use "NAME" as the adoptfile.  By default, the file at
            "tools/adjoint_options/adjoint_default" will be used.
      -nooptfile | --nooptfile
        -optfile NAME | --optfile NAME | -of NAME | --of NAME
        -optfile=NAME | --optfile=NAME | -of=NAME | --of=NAME
            Use "NAME" as the optfile.  By default, an attempt will be
            made to find an appropriate "standard" optfile in the
            tools/build_options/ directory.
      -pdepend NAME | --pdepend NAME
        -pdepend=NAME | --pdepend=NAME
            Get package dependency information from "NAME".
      -pgroups NAME | --pgroups NAME
        -pgroups=NAME | --pgroups=NAME
            Get the package groups information from "NAME".
      -bash NAME
            Explicitly specify the Bourne or BASH shell to use
      -make NAME | -m NAME
        --make=NAME | -m=NAME
            Use "NAME" for the MAKE program. The default is "make" but
            many platforms, "gmake" is the preferred choice.
      -makefile NAME | -mf NAME
        --makefile=NAME | -mf=NAME
            Call the makefile "NAME".  The default is "Makefile".
      -makedepend NAME | -md NAME
        --makedepend=NAME | -md=NAME
            Use "NAME" for the MAKEDEPEND program.
      -rootdir NAME | --rootdir NAME | -rd NAME | --rd NAME
        -rootdir=NAME | --rootdir=NAME | -rd=NAME | --rd=NAME
            Specify the location of the MITgcm ROOTDIR as "NAME".
            By default, genamke will try to find the location by
            looking in parent directories (up to the 5th parent).
      -mods NAME | --mods NAME | -mo NAME | --mo NAME
        -mods=NAME | --mods=NAME | -mo=NAME | --mo=NAME
            Here, "NAME" specifies a list of directories that are
            used for additional source code.  Files found in the
            "mods list" are given preference over files of the same
            name found elsewhere.
      -disable NAME | --disable NAME
        -disable=NAME | --disable=NAME
            Here "NAME" specifies a list of packages that we don't
            want to use.  If this violates package dependencies,
            genamke will exit with an error message.
      -enable NAME | --enable NAME
        -enable=NAME | --enable=NAME
            Here "NAME" specifies a list of packages that we wish
            to specifically enable.  If this violates package
            dependencies, genamke will exit with an error message.
      -standarddirs NAME | --standarddirs NAME
        -standarddirs=NAME | --standarddirs=NAME
            Here, "NAME" specifies a list of directories to be
            used as the "standard" code.
      -fortran NAME | --fortran NAME | -fc NAME | --fc NAME
        -fc=NAME | --fc=NAME
            Use "NAME" as the fortran compiler.  By default, genmake
            will search for a working compiler by trying a list of
            "usual suspects" such as g77, f77, etc.
      -cc NAME | --cc NAME | -cc=NAME | --cc=NAME
            Use "NAME" as the C compiler.  By default, genmake
            will search for a working compiler by trying a list of
            "usual suspects" such as gcc, c89, cc, etc.
      -use_real4 | -use_r4 | -ur4 | --use_real4 | --use_r4 | --ur4
            Use "real*4" type for _RS variable (#undef REAL4_IS_SLOW)
            *only* works if CPP_EEOPTIONS.h allows this.
      -ignoretime | -ignore_time | --ignoretime | --ignore_time
            Ignore all the "wall clock" routines entirely.  This will
            not in any way hurt the model results -- it simply means
            that the code that checks how long the model spends in
            various routines will give junk values.
      -ts | --ts
            Produce timing information per timestep
      -papis | --papis
            Produce summary MFlop/s (and IPC) with PAPI per timestep
      -pcls | --pcls
            Produce summary MFlop/s etc. with PCL per timestep
      -foolad | --foolad
            Fool the AD code generator
      -papi | --papi
            Performance analysis with PAPI
      -pcl | --pcl
            Performance analysis with PCL
      -hpmt | --hpmt
            Performance analysis with the HPM Toolkit
      -ieee | --ieee
            use IEEE numerics.  Note that this option *only* works
            if it is supported by the OPTFILE that is being used.
      -devel | --devel
            Add additional warning and debugging flags for development
            (if supported by the OPTFILE); also switch to IEEE numerics.
      -gsl | --gsl
            Use GSL to control floating point rounding and precision
      -mpi | --mpi
            Include MPI header files and link to MPI libraries
      -mpi=PATH | --mpi=PATH
            Include MPI header files and link to MPI libraries using MPI_ROOT
            set to PATH. i.e. Include files from \$PATH/include, link to libraries
            from \$PATH/lib and use binaries from \$PATH/bin.
      -omp | --omp
            Activate OpenMP code + use Compiler option OMPFLAG
      -omp=OMPFLAG | --omp=OMPFLAG
            Activate OpenMP code + use Compiler option OMPFLAG
      -es | --es | -embed-source | --embed-source
            Embed a tarball containing the full source code
            (including the Makefile, etc.) used to build the
            executable [off by default]
      -ds | --ds
            Report genmake internal variables status (DUMPSTATE)
            to file "genmake_state" (for debug purpose)
    While it is most often a single word, the "NAME" variables specified
    above can in many cases be a space-delimited string such as:
 Line 174 
 EOF
  test_for_package_in_cpp_options() {
      cpp_options=$1
      pkg=$2
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg[ ]"
+     test_for_string_in_file $cpp_options "^ *# *define *\<ALLOW_$pkg\>"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg[ ]"
+     test_for_string_in_file $cpp_options "^ *# *undef *\<ALLOW_$pkg\>"
-     test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg[ ]"
+     test_for_string_in_file $cpp_options "^ *# *define *\<DISABLE_$pkg\>"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg[ ]"
+     test_for_string_in_file $cpp_options "^ *# *undef *\<DISABLE_$pkg\>"
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg$"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg$"
-     test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg$"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg$"
  }
  # Search for particular CPP #cmds associated with MPI
  # usage: test_for_mpi_in_cpp_eeoptions CPP_file
  test_for_mpi_in_cpp_eeoptions() {
      cpp_options=$1
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_USE_MPI[ ]"
+     test_for_string_in_file $cpp_options "^ *# *define *\<ALLOW_USE_MPI\>"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI[ ]"
+     test_for_string_in_file $cpp_options "^ *# *undef *\<ALLOW_USE_MPI\>"
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI[ ]"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI[ ]"
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_USE_MPI$"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI$"
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI$"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI$"
  }
  # Search for particular string in a file. Return 1 if detected, 0 if not
-Line 203 
 test_for_mpi_in_cpp_eeoptions() {
+Line 193 
 test_for_mpi_in_cpp_eeoptions() {
  test_for_string_in_file() {
      file=$1
      strng=$2
-     grep -i "$strng" $file > /dev/null 2>&1
+     grep "$strng" $file > /dev/null 2>&1
      RETVAL=$?
      if test "x${RETVAL}" = x0 ; then
          printf "Error: In $file there is an illegal line: "
          grep -i "$strng" $file
          exit 99
      fi
      return 0
-Line 411 
 build_cyrus_makedepend()  {
+Line 401 
 build_cyrus_makedepend()  {
      (
          cd $ROOTDIR/tools/cyrus-imapd-makedepend  \
              &&  ./configure > /dev/null 2>&1  \
-             &&  make > /dev/null 2>&1
+             &&  $MAKE > /dev/null 2>&1
          if test -x ./makedepend.exe ; then
              $LN ./makedepend.exe ./makedepend
          fi
-Line 435 
 build_embed_encode()
+Line 425 
 build_embed_encode()
  {
      printf "  building the embed-encode utility...  "
      if test ! -e "$ROOTDIR/tools/embed_encode/encode_files" ; then
          if test ! -d "$ROOTDIR/tools/embed_encode" ; then
              echo
              echo "    Error: can't locate \"$ROOTDIR/tools/embed_encode\""
              echo
              EMBED_SRC=f
              return 1
          fi
          clist="cc gcc c89 $CC"
          for ic in $clist ; do
              comm="$ic -o encode_files encode_files.c"
-Line 596 
 Error: No options file was found in:  $R
+Line 586 
 Error: No options file was found in:  $R
  EOF
          exit 1
      fi
- #     # look for possible MPI libraries
- #     mpi_libs=
- #     mpi_fort=`which mpif77 2>/dev/null`
- #     RETVAL=$?
- #     if test "x${RETVAL}" = x0 ; then
- #       cat >>test.f <<EOF
- #       PROGRAM HELLO
- #       DO 10, I=1,10
- #       PRINT *,'Hello World'
- #    10 CONTINUE
- #       STOP
- #       END
- # EOF
- #       eval "$mpi_fort -showme test.f > out"
- #       RETVAL=$?
- #       if test "x${RETVAL}" = x0 ; then
- #           a=`cat out`
- #           for i in $a ; do
- #               case $i in
- #                   -*)
- #                       mpi_libs="$mpi_libs $i" ;;
- #               esac
- #           done
- #           echo "The MPI libs appear to be:"
- #           echo "  "$mpi_libs
- #       fi
- #       rm -f test.f out
- #     fi
  }
  #  Parse the package dependency information
-Line 1206 
 SOURCEDIRS=
+Line 1167 
 SOURCEDIRS=
  INCLUDEDIRS=
  STANDARDDIRS="USE_THE_DEFAULT"
+ #- local config file
+ gm_local="genmake_local"
  G2ARGS=
  BASH=
  PWD=`pwd`
-Line 1242 
 SVD_TAMC_FLAGS=
+Line 1206 
 SVD_TAMC_FLAGS=
  TAMC_EXTRA=
  #  The following state can be set directly by command-line switches
- gm_s1="OPTFILE PKG_DEPEND PKG_GROUPS DISABLE ENABLE MAKEFILE MAKEDEPEND PLATFORM"
+ gm_s1="ROOTDIR STANDARDDIRS MODS PKG_DEPEND PKG_GROUPS DISABLE ENABLE"
- gm_s2="FC CC MPI OMP USE_R4 TS PAPIS PCLS PAPI PCL HPMT IEEE DEVEL GSL FEXTRAFLAGS"
+ gm_s2="PLATFORM OPTFILE MAKE MAKEFILE MAKEDEPEND FC CC MPI OMP USE_R4"
- gm_s3="ROOTDIR STANDARDDIRS MODS DUMPSTATE"
+ gm_s3="FEXTRAFLAGS IEEE DEVEL GSL TS PAPIS PCLS PAPI PCL HPMT DUMPSTATE"
  #  The following state is not directly set by command-line switches
- gm_s4="LN S64 LINK MAKE PACKAGES INCLUDES FFLAGS FOPTIM"
+ gm_s4="LN S64 LINK PACKAGES INCLUDES FFLAGS FOPTIM"
  gm_s5="CFLAGS LIBS KPP KFLAGS1 KFLAGS2 KPPFILES NOOPTFILES NOOPTFLAGS"
  gm_s6="TOOLSDIR SOURCEDIRS INCLUDEDIRS EXEDIR EXECUTABLE EXEHOOK"
  gm_s7="PWD THISHOST THISUSER THISDATE THISVER MACHINE"
-Line 1277 
 LOGFILE="genmake.log"
+Line 1241 
 LOGFILE="genmake.log"
  rm -f genmake_state genmake_*optfile $LOGFILE
  echo "===  Processing options files and arguments  ==="
- gm_local="genmake_local"
- printf "  getting local config information:  "
- if test -f $gm_local ; then
-     echo "using $gm_local"
-     . $gm_local
-     # echo "DISABLE=$DISABLE"
-     # echo "ENABLE=$ENABLE"
- else
-     echo "none found"
- fi
  #echo "$0::$1:$2:$3:$4:$5:$6:$7:"
  #parse_options
-Line 1346 
 for ac_option in "$@" ; do
+Line 1300 
 for ac_option in "$@" ; do
          -makedepend=* | --makedepend=* | -md=* | --md=*)
              MAKEDEPEND=$ac_optarg ;;
-         -makefile | --makefile | -ma | --ma)
+         -makefile | --makefile | -mf | --mf)
              ac_prev=MAKEFILE ;;
-         -makefile=* | --makefile=* | -ma=* | --ma=*)
+         -makefile=* | --makefile=* | -mf=* | --mf=*)
              MAKEFILE=$ac_optarg ;;
          -platform | --platform | -pl | --pl | -platform=* | --platform=* | -pl=* | --pl=*)
-Line 1415 
 for ac_option in "$@" ; do
+Line 1369 
 for ac_option in "$@" ; do
              IEEE=true ;;
          -noieee | --noieee)
              echo "Warning: ignore option '$ac_option' (default is already without '-ieee')" ;;
          -devel | --devel)
              IEEE=true ; DEVEL=true ;;
          -gsl | --gsl)
              GSL=true ;;
          -ts | --ts)
-Line 1485 
 for ac_option in "$@" ; do
+Line 1439 
 for ac_option in "$@" ; do
  done
+ printf "  getting local config information:  "
+ if test -f $gm_local ; then
+     echo "using $gm_local"
+     . $gm_local
+ else
+     echo "none found"
+ fi
  if test -f ./.genmakerc ; then
      echo
      echo "WARNING: genmake2 has detected a copy of the old-style \"./.genmakerc\""
-Line 1696 
 check_for_broken_Ff
+Line 1658 
 check_for_broken_Ff
  if test ! "x$MPI" = x ; then
        echo "  Turning on MPI cpp macros"
-       DEFINES="$DEFINES -DALLOW_USE_MPI -DALWAYS_USE_MPI"
+       DEFINES="$DEFINES -DALLOW_USE_MPI"
  fi
  if test ! "x$OMP" = x ; then
        echo "  Add OMPFLAG and turn on OpenMP cpp macros"
-Line 1771 
 if test ! "x$HPMT" = x ; then
+Line 1733 
 if test ! "x$HPMT" = x ; then
        if test ! "x$PAPI" = x ; then
            echo "  PAPI and the HPM Toolkit cannot co-exist!"
            echo "  Sticking with PAPI!"
-       else if test ! "x$PCL" = x ; then
+       else
+         if test ! "x$PCL" = x ; then
            echo "  PCL and the HPM Toolkit cannot co-exist!"
            echo "  Sticking with PCL!"
-       else
+         else
            echo "  Turning on performance analysis with the HPM Toolkit"
            echo "  Please make sure HPMTINC, HPMTLIB are defined"
            DEFINES="$DEFINES -DUSE_LIBHPM"
            INCLUDES="$INCLUDES $HPMTINC"
            LIBS="$LIBS $HPMTLIB"
-       fi
+         fi
        fi
  fi
  if test ! "x$GSL" = x ; then
-Line 2105 
 else
+Line 2068 
 else
          exit 1
      else
          echo "    using PKG_LIST=\"$PKG_LIST\""
          #  Strip the comments and add all the names
          pkg_list=`cat $PKG_LIST | sed -e 's/#.*$//g' | $AWK '(NF>0){print $0}'`
          RETVAL=$?
          if test "x${RETVAL}" != x0 ; then
-Line 2200 
 else
+Line 2163 
 else
          echo "Error: problem encountered while building source files in pkg/mnc:"
          cat make_mnc.errors 1>&2
          if test "x$mnc_in" = x0 ; then
              exit 1
          else
              DISABLE="$DISABLE mnc"
          fi
-Line 2519 
 if test "x$OPENAD" != x ; then
+Line 2482 
 if test "x$OPENAD" != x ; then
      OAD_DONT_TRANSFORM="/dev/null"
      OAD_KEEP_ORIGINAL="/dev/null"
      OAD_CB2M_FILES="/dev/null"
+     OADTOOLS="$TOOLSDIR/OAD_support"
+     test -f "oadtempflile"  &&  \rm -f "oadtempflile"
+ cat >> "oadtempflile" <<EOF
+ $OADTOOLS
+ EOF
      echo "  looking for dontCompile file:  "
      for i in "." $MODS ; do
          if test -r $i"/dontCompile" ; then
-Line 2679 
 echo "" >> ad_flow_files.tmp
+Line 2647 
 echo "" >> ad_flow_files.tmp
  CMDLINE=$0
  for xx in "$@" ; do nw=`echo $xx | wc -w`
      if test $nw = '1' ; then CMDLINE="$CMDLINE $xx"
                          else CMDLINE="$CMDLINE '$xx'" ; fi
  done
  if test -f $MAKEFILE ; then
-Line 2713 
 cat >>$MAKEFILE <<EOF
+Line 2681 
 cat >>$MAKEFILE <<EOF
  # INCLUDES     : Directories searched for header files
  # DEFINES      : Macro definitions for CPP
  # MAKEDEPEND   : Dependency generator
- # KPP          : Special preprocessor command (specific to platform)
- # KFLAGS       : Flags for KPP
  # FC           : Fortran compiler command
  # FFLAGS       : Configuration/debugging options for FC
  # FOPTIM       : Optimization options for FC
-Line 2728 
 INCLUDEDIRS = ${INCLUDEDIRS}
+Line 2694 
 INCLUDEDIRS = ${INCLUDEDIRS}
  EXEDIR      = ${EXEDIR}
  EXECUTABLE  = \$(EXEDIR)/${EXECUTABLE}
  TOOLSDIR    = ${TOOLSDIR}
+ OADTOOLS    = ${OADTOOLS}
  #eh3  new defines for the adjoint work
  AUTODIFF    = ${ROOTDIR}/pkg/autodiff
-Line 2751 
 fi
+Line 2718 
 fi
  cat >>$MAKEFILE <<EOF
  # Unix ln (link)
  LN = ${LN}
- # C preprocessor
- CPP = cat \$< | ${S64} | ${CPP}
  # Dependency generator
  MAKEDEPEND = ${MAKEDEPEND}
  # Special preprocessor (KAP on DECs, FPP on Crays)
-Line 2788 
 NOOPTFLAGS = ${NOOPTFLAGS}
+Line 2753 
 NOOPTFLAGS = ${NOOPTFLAGS}
  # Flags and libraries needed for linking
  LIBS = ${LIBS}
  # Name of the makefile
- MAKEFILE=${MAKEFILE}
+ MAKEFILE = ${MAKEFILE}
+ # Name of the make program
+ MAKE = ${MAKE}
  EOF
-Line 2819 
 echo '.SUFFIXES: .o .'$FS' .p .F .c .f'$
+Line 2786 
 echo '.SUFFIXES: .o .'$FS' .p .F .c .f'$
  cat >>$MAKEFILE <<EOF
- all: \$(EXECUTABLE)
+ all: fwd_exe_target
+ fwd_exe_target:
+         @echo Update AD_CONFIG.h and make \$(EXECUTABLE)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Forward version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
+         @cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+         @-rm -f ad_config.template
+         \$(MAKE) -f \$(MAKEFILE) \$(EXECUTABLE)
  \$(EXECUTABLE): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(OBJFILES) \$(EMBEDDED_FILES)
          @echo Creating \$@ ...
          \$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
  depend:
-         @make -f \$(MAKEFILE) links
+         @\$(MAKE) -f \$(MAKEFILE) links
          \$(MAKEDEPEND) -f \$(MAKEFILE) -o .$FS \$(DEFINES) \$(INCLUDES) \$(F77_SRC_FILES)
          \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
          -rm -f makedepend.out
-Line 2855 
 clean:
+Line 2829 
 clean:
  # remove most of the files that "make" and "make depend" generate
  Clean:
-         @make -f \$(MAKEFILE) clean
+         @\$(MAKE) -f \$(MAKEFILE) clean
-         @make -f \$(MAKEFILE) cleanlinks
+         @\$(MAKE) -f \$(MAKEFILE) cleanlinks
          -rm -f \$(SPECIAL_FILES) f90mkdepend.log $MAKEFILE.old
          -rm -f taf_command taf_output taf_ad.log taf_ad_flow.log taf_ftl.log
          -rm -f genmake_warnings genmake_errors make.log
-Line 2864 
 Clean:
+Line 2838 
 Clean:
  # remove also the executable, files that "genmake2" generates (except Makefile)
  #         and output from a run (plus log files from testreport)
  CLEAN:
-         @make -f \$(MAKEFILE) Clean
+         @\$(MAKE) -f \$(MAKEFILE) Clean
          -rm -f \$(EXECUTABLE) \$(EXE_AD) \$(EXE_FTL) *.bak
          -rm -f $LOGFILE genmake_state genmake_*optfile
          -rm -f SIZE.h.mpi genmake.tr_log make.tr_log
-Line 2883 
 cleanlinks:
+Line 2857 
 cleanlinks:
  # Special targets (SPECIAL_FILES) which are created by make
  ${PACKAGES_DOT_H}:
          @echo Creating \$@ ...
-         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@
  AD_CONFIG.h:
          @echo Creating \$@ ...
-         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > \$@
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Default version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > \$@
  FC_NAMEMANGLE.h:
          @echo Creating \$@ ...
          echo "$FC_NAMEMANGLE" > \$@
-Line 2926 
 cat >>$MAKEFILE <<EOF
+Line 2900 
 cat >>$MAKEFILE <<EOF
  ## This nullifies any default implicit rules concerning these two file types:
  ## %.o : %.F
+ # C preprocessing and replacing the _d in constants:
+ CPPCMD = cat \$< | ${CPP} \$(DEFINES) \$(INCLUDES) | ${S64}
  .F.$FS:
-         \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+         \$(CPPCMD)  > \$@
  .$FS.o:
          \$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
  .F.o:
          \$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
  .F90.$FS90:
-         \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+         \$(CPPCMD)  > \$@
  .FF90.f$FS90:
-         \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+         \$(CPPCMD)  > \$@
  .$FS90.o:
          \$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$<
  .f$FS90.o:
-Line 2944 
 cat >>$MAKEFILE <<EOF
+Line 2921 
 cat >>$MAKEFILE <<EOF
  .c.o:
          \$(CC) \$(CFLAGS) \$(DEFINES) \$(INCLUDES) -c \$<
  .flow.flowdir:
-         \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+         \$(CPPCMD) > \$@
  # Special exceptions that use the ( .F - .p - .$FS - .o ) rule-chain
  .F.p:
-         \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+         \$(CPPCMD) > \$@
  .p.$FS:
          \$(KPP) \$(KFLAGS1)\$@ \$(KFLAGS2) \$<
-Line 2995 
 rm -f adSrcFiles.tmp
+Line 2972 
 rm -f adSrcFiles.tmp
  cat >>$MAKEFILE <<EOF
  # ... AD ...
- adall: \$(EXE_AD)
+ adall: ad_exe_target
  adtaf: ad_taf_output.$FS
  adtamc: ad_tamc_output.$FS
- ad_input_code.$FS: \$(AD_FILES) \$(H_SRC_FILES) \$(AD_FLOW_FILES)
+ ad_exe_target:
-         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
+         @echo Update AD_CONFIG.h and make \$(EXE_AD)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Adjoint version" -bAD_CONFIG_H -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
+         @cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+         @-rm -f ad_config.template
+         \$(MAKE) -f \$(MAKEFILE) \$(EXE_AD)
+ ad_input_code.$FS: \$(AD_FILES) \$(AD_FLOW_FILES)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Adjoint version" -bAD_CONFIG_H -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
          cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
-         -rm -f ad_config.template
+         @-rm -f ad_config.template
-         @make -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
+         @\$(MAKE) -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
-         @make -f \$(MAKEFILE) \$(FLOWFILES)
+         @\$(MAKE) -f \$(MAKEFILE) \$(FLOWFILES)
          cat \$(FLOWFILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ad_input_code.$FS
  ad_taf_output.$FS: ad_input_code.$FS
-Line 3017 
 adtafonly:
+Line 3001 
 adtafonly:
          ls -l ad_input_code_ad.$FS
          cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
- \${EXE_AD}: ad_taf_output.o \$(OBJFILES)
+ \$(EXE_AD): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) ad_taf_output.o \$(OBJFILES) \$(EMBEDDED_FILES)
          \$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS)
  ad_tamc_output.$FS: ad_input_code.$FS
-Line 3036 
 adtrick:
+Line 3020 
 adtrick:
  adobj: ad_taf_output.o \$(OBJFILES)
  # ... FTL ...
- ftlall: \$(EXE_FTL)
+ ftlall: ftl_exe_target
  ftltaf: ftl_taf_output.$FS
  ftltamc: ftl_tamc_output.$FS
- ftl_input_code.$FS: \$(AD_FILES) \$(H_SRC_FILES)
+ ftl_exe_target:
-         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ftl_config.template
+         @echo Update AD_CONFIG.h and make \$(EXE_FTL)
-         cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "TangLin version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ad_config.template
-         -rm -f ftl_config.template
+         @cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
-         @make -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
+         @-rm -f ad_config.template
-         @make -f \$(MAKEFILE) \$(AD_FLOW_FILES)
+         \$(MAKE) -f \$(MAKEFILE) \$(EXE_FTL)
+ ftl_input_code.$FS: \$(AD_FILES)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "TangLin version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ad_config.template
+         cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+         @-rm -f ad_config.template
+         @\$(MAKE) -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
+         @\$(MAKE) -f \$(MAKEFILE) \$(AD_FLOW_FILES)
          cat \$(AD_FLOW_FILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ftl_input_code.$FS
  ftl_taf_output.$FS: ftl_input_code.$FS
-Line 3058 
 ftltafonly:
+Line 3049 
 ftltafonly:
          ls -l ftl_input_code_ftl.$FS
          cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
- \${EXE_FTL}: ftl_taf_output.o \$(OBJFILES)
+ \$(EXE_FTL): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) ftl_taf_output.o \$(OBJFILES) \$(EMBEDDED_FILES)
          \$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS)
  ftl_tamc_output.$FS: ftl_input_code.$FS
-Line 3088 
 svd_touch:
+Line 3079 
 svd_touch:
          touch ad_taf_output.$FS ftl_taf_output.$FS
          \$(FC) \$(FFLAGS) \$(FOPTIM) -c ad_taf_output.$FS
          \$(FC) \$(FFLAGS) \$(FOPTIM) -c ftl_taf_output.$FS
-         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ftl_config.template
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "SVD version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ad_config.template
-         cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
+         cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
-         -rm -f ftl_config.template
+         @-rm -f ad_config.template
  EOF
-Line 3200 
 AD_OBJ_FILES_S2=\$(AD_OBJ_FILES_S1) \$(N
+Line 3191 
 AD_OBJ_FILES_S2=\$(AD_OBJ_FILES_S1) \$(N
          \$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(AD_OBJ_FILES_S2) \$(LIBS)
  # create sources files modules from header files containing common blocks
- %_mod.FF90 : %.h ../OAD_support/cb2mGetModules.csh ../OAD_support/cb2mGetModules.awk
+ %_mod.FF90 : %.h \${OADTOOLS}/cb2mGetModules.csh \${OADTOOLS}/cb2mGetModules.awk
-         ../OAD_support/cb2mGetModules.csh $< ../OAD_support/cb2mGetModules.awk
+         \${OADTOOLS}/cb2mGetModules.csh $< \${OADTOOLS}/cb2mGetModules.awk
  # create new header files with USE statements for the new modules made above
- %_mod.h : %.h ../OAD_support/cb2mGetHeaders.csh ../OAD_support/cb2mGetHeaders.awk
+ %_mod.h : %.h \${OADTOOLS}/cb2mGetHeaders.csh \${OADTOOLS}/cb2mGetHeaders.awk
-         ../OAD_support/cb2mGetHeaders.csh $< ../OAD_support/cb2mGetHeaders.awk \$(CB2M_F90_SRC_NAMES)
+         \${OADTOOLS}/cb2mGetHeaders.csh $< \${OADTOOLS}/cb2mGetHeaders.awk \$(CB2M_F90_SRC_NAMES)
  # change the include directives of everybody to refer to  the new header files with the USE statements
- %_cb2m.FF90 : %.F ../OAD_support/cb2mUseModules.bash
+ %_cb2m.FF90 : %.F \${OADTOOLS}/cb2mUseModules.bash
-         ../OAD_support/cb2mUseModules.bash $< ${MPI}
+         \${OADTOOLS}/cb2mUseModules.bash $< ${MPI}
  # makefile debug rule
  small_f: \$(CB2M_F90_PP_SRC_FILES)
-Line 3231 
 ad_input_code_sf.pre.f90 : \$(CB2M_AD_FI
+Line 3222 
 ad_input_code_sf.pre.f90 : \$(CB2M_AD_FI
  # replace stop statements (to avoid the implied unstructured control flow)  with print statements
  ad_input_code_sf.pre.s2p.f90 : ad_input_code_sf.pre.f90
-         cat \$< | sed -f ../OAD_support/stop2print.sed > ad_input_code_sf.pre.s2p.f90
+         cat \$< | sed -f \${OADTOOLS}/stop2print.sed > ad_input_code_sf.pre.s2p.f90
  # F -> WHIRL
  ad_input_code_sf.pre.s2p.B: ad_input_code_sf.pre.s2p.f90
-Line 3254 
 ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS
+Line 3245 
 ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS
          \${OPEN64ROOT}/whirl2f/whirl2f -FLIST:ftn_file=\$@ -openad \$<
  # insert template directives
- ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90: ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS90 ../OAD_support/insertTemplateDir.bash
+ ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90: ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS90 \${OADTOOLS}/insertTemplateDir.bash
-         ../OAD_support/insertTemplateDir.bash \$< \$@
+         \${OADTOOLS}/insertTemplateDir.bash \$< \$@
- PPEXTRAS=\$(wildcard ../OAD_support/ad_template.*.F) ../OAD_support/ad_inline.F
+ PPEXTRAS=\$(wildcard \${OADTOOLS}/ad_template.*.F) \${OADTOOLS}/ad_inline.F
  # postprocess F'
  postProcess.tag: ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90 \$(PPEXTRAS:.F=.f) | w2f__types.f90
-         \${OPENADFORTTK_BASE}/tools/SourceProcessing/postProcess.py --progress --timing --infoUnitFile w2f__types.f90 --outputFormat=fixed --separateOutput --pathSuffix "" --filenameSuffix "_oad" -m r -i ../OAD_support/ad_inline.f \$<
+         \${OPENADFORTTK_BASE}/tools/SourceProcessing/postProcess.py --progress --timing --infoUnitFile w2f__types.f90 --outputFormat=fixed --separateOutput --pathSuffix "" --filenameSuffix "_oad" -m r -i \${OADTOOLS}/ad_inline.f \$<
          # the target is a placeholder to trigger a single execution of the rule
          touch \$@
  # put this so make knows about the postprocessing output
-Line 3272 
 OAD_intrinsics_oad.f \$(CB2M_AD_FILES:.f
+Line 3263 
 OAD_intrinsics_oad.f \$(CB2M_AD_FILES:.f
  # link the support files:
  \$(OPENAD_SUPPORT_F90_SRC_FILES) \$(OPENAD_SUPPORT_C_SRC_FILES):
-         \$(LN) ../OAD_support/\$@ .
+         \$(LN) \${OADTOOLS}/\$@ .
- AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.tag \$(PPEXTRAS:.F=.f)
+ AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.tag oadtempflile \$(PPEXTRAS:.F=.f)
  # ============ end OpenAD specific section ==============
-Line 3319 
 printf "\n\n# DO NOT DELETE\n" >> $MAKEF
+Line 3310 
 printf "\n\n# DO NOT DELETE\n" >> $MAKEF
  printf "\n===  Done  ===\n"
  # Create special header files
- $BASH $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" $DISABLED_PACKAGES " " "Enabled packages:" $ENABLED_PACKAGES > $PACKAGES_DOT_H".tmp"
+ $BASH $TOOLSDIR/convert_cpp_cmd2defines -bPACKAGES_CONFIG_H "Disabled packages:" $DISABLED_PACKAGES " " "Enabled packages:" $ENABLED_PACKAGES > $PACKAGES_DOT_H".tmp"
  if test ! -f $PACKAGES_DOT_H ; then
      mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
  else
-Line 3333 
 else
+Line 3324 
 else
      fi
  fi
  if test ! -f AD_CONFIG.h ; then
-     $BASH $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > AD_CONFIG.h
+     $BASH $TOOLSDIR/convert_cpp_cmd2defines "Default version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > AD_CONFIG.h
  fi
  #  Write the "state" for future records

 Legend:



Removed from v.1.236
 


changed lines


 
Added in v.1.242
 Legend:



Removed from v.1.236
 


changed lines


 
Added in v.1.242
-Removed from v.1.236
+Added in v.1.242

	ViewVC Help
Powered by ViewVC 1.1.22