--- MITgcm/tools/genmake2 2005/09/14 17:57:54 1.131 +++ MITgcm/tools/genmake2 2007/05/25 14:56:36 1.163 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.131 2005/09/14 17:57:54 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.163 2007/05/25 14:56:36 mlosch Exp $ # # Makefile generator for MITgcm UV codes # created by cnh 03/98 @@ -13,20 +13,28 @@ test_for_package_in_cpp_options() { cpp_options=$1 pkg=$2 - test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg" || exit 99 - test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg" || exit 99 - test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg" || exit 99 - test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg" || exit 99 + 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[ ]" + 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" || exit 99 - test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI" || exit 99 - test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI" || exit 99 - test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI" || exit 99 + 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[ ]" + 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 @@ -39,7 +47,7 @@ if test "x${RETVAL}" = x0 ; then printf "Error: In $file there is an illegal line: " grep -i "$strng" $file - return 1 + exit 99 fi return 0 } @@ -248,6 +256,41 @@ fi } + +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" + ( cd $ROOTDIR/tools/embed_encode && $comm ) > /dev/null 2>&1 + RETVAL=$? + if test "x$RETVAL" = x0 ; then + echo "OK" + DEFINES="$DEFINES -DHAVE_EMBED_SRC" + return 0 + fi + done + echo + echo " Error: unable to build $ROOTDIR/embed_encode/encode_files" + echo " so it has been disabled" + echo + EMBED_SRC=f + return 1 + fi + echo "OK" + DEFINES="$DEFINES -DHAVE_EMBED_SRC" +} + + # Guess possible config options for this host find_possible_configs() { @@ -282,7 +325,7 @@ #================================================================ # look for possible C compilers - tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc" + tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc icc" p_CC= for c in $tmp ; do rm -f ./genmake_hello.c ./genmake_hello @@ -321,7 +364,7 @@ #================================================================ # look for possible FORTRAN compilers - tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95 gfortran" + tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc ifort f90 f95 mpif77 mpf77 mpxlf95 gfortran g95" p_FC= for c in $tmp ; do rm -f ./hello.f ./hello @@ -353,10 +396,18 @@ else echo " The possible FORTRAN compilers found in your path are:" echo " "$p_FC - if test "x$FC" = x ; then - FC=`echo $p_FC | $AWK '{print $1}'` - echo " Setting FORTRAN compiler to: "$FC - fi + fi + + # Use the first of the compilers found in the current PATH + # that has a correctly-named optfile + if test "x$OPTFILE" = x -a "x$FC" = x ; then + for i in $p_FC ; do + OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i + if test -r $OPTFILE ; then + echo " Setting OPTFILE to: "$OPTFILE + break + fi + done fi if test "x$OPTFILE" = x ; then @@ -527,8 +578,31 @@ *only* works if it is supported by the OPTFILE that is being used. + -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 + + -gsl | --gsl + Use GSL to control floating point rounding and precision + -devel | --devel + Add additional warning and debugging flags for development -mpi | --mpi Include MPI header files and link to MPI libraries @@ -537,6 +611,11 @@ set to PATH. i.e. Include files from \$PATH/include, link to libraries from \$PATH/lib and use binaries from \$PATH/bin. + -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] + -bash NAME Explicitly specify the Bourne or BASH shell to use @@ -601,7 +680,7 @@ call tsub( string ) end EOF - $FC $FFLAGS $DEFINES -c genmake_tcomp.$FS >> genmake_warnings 2>&1 + $FC $FFLAGS -c genmake_tcomp.$FS >> genmake_warnings 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm @@ -677,7 +756,9 @@ print *," HELLO WORLD", wtime end EOF - $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_warnings 2>&1 + COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" + echo $COMM >> genmake_warnings + $COMM >> genmake_warnings 2>&1 RET_F=$? test -x ./genmake_tc && ./genmake_tc >> genmake_warnings 2>&1 RETVAL=$? @@ -689,7 +770,74 @@ } +check_HAVE_SIGREG() { + if test ! "x$HAVE_SIGREG" = x ; then + return + fi + get_fortran_c_namemangling + cat < genmake_tc_1.c +$FC_NAMEMANGLE +#include +#include +#include +#include +#include + +int * ip; + +static void killhandler( + unsigned int sn, siginfo_t si, struct ucontext *sc ) +{ + *ip = *ip + 1; + return; +} + +void FC_NAMEMANGLE(sigreg) (int * aip) +{ + struct sigaction s; + ip = aip; + s.sa_flags = SA_SIGINFO; + s.sa_sigaction = (void *)killhandler; + if(sigaction (SIGTERM,&s,(struct sigaction *)NULL)) { + printf("Sigaction returned error = %d\n", errno); + exit(0); + } + return; +} +EOF + make genmake_tc_1.o >> genmake_warnings 2>&1 + RET_C=$? + cat < genmake_tc_2.$FS + program hello + integer anint + common /iv/ anint + external sigreg + call sigreg(anint) + end +EOF + echo >> genmake_warnings + echo "running: check_HAVE_SIGREG()" >> genmake_warnings + cat genmake_tc_2.$FS >> genmake_warnings + COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" + echo $COMM >> genmake_warnings + $COMM >> genmake_warnings 2>&1 + RETVAL=$? + if test "x$RETVAL" = x0 ; then + HAVE_SIGREG=t + DEFINES="$DEFINES -DHAVE_SIGREG" + fi + rm -f genmake_tc* +} + + check_HAVE_SETRLSTK() { + if test "x$HAVE_SETRLSTK" = xt ; then + DEFINES="$DEFINES -DHAVE_SETRLSTK" + return + fi + if test ! "x$HAVE_SETRLSTK" = x ; then + return + fi get_fortran_c_namemangling cat < genmake_tc_1.c $FC_NAMEMANGLE @@ -713,9 +861,12 @@ call setrlstk() end EOF - $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_warnings 2>&1 - RET_F=$? - test -x ./genmake_tc && ./genmake_tc >> genmake_warnings 2>&1 + echo >> genmake_warnings + echo "running: check_HAVE_SETRLSTK()" >> genmake_warnings + cat genmake_tc_2.$FS >> genmake_warnings + COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" + echo $COMM >> genmake_warnings + $COMM >> genmake_warnings 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_SETRLSTK=t @@ -755,9 +906,12 @@ print *," HELLO WORLD", nbyte end EOF - $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_tc.log 2>&1 - RET_F=$? - test -x ./genmake_tc && ./genmake_tc >> genmake_tc.log 2>&1 + echo >> genmake_warnings + echo "running: check_HAVE_STAT()" >> genmake_warnings + cat genmake_tc_2.$FS >> genmake_warnings + COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" + echo $COMM >> genmake_warnings + $COMM >> genmake_tc.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_STAT=t @@ -771,7 +925,8 @@ if test ! "x$SKIP_NETCDF_CHECK" = x ; then return fi - echo "" > genmake_tnc.log + echo >> genmake_warnings + echo "running: check_netcdf_libs()" >> genmake_warnings cat < genmake_tnc.F program fgennc #include "netcdf.inc" @@ -789,24 +944,25 @@ IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret) end EOF - echo "Executing:" > genmake_tnc.log - echo " $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS" \ - > genmake_tnc.log + echo "=== genmake_tnc.F ===" > genmake_tnc.log + cat genmake_tnc.F >> genmake_tnc.log + echo "=== genmake_tnc.F ===" >> genmake_tnc.log RET_CPP=f - $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null \ - && RET_CPP=t + COMM="cat genmake_tnc.F | $CPP $DEFINES $INCLUDES" + echo "$COMM" >> genmake_tnc.log + eval $COMM > genmake_tnc.$FS 2>/dev/null && RET_CPP=t if test "x$RET_CPP" = xf ; then echo " WARNING: CPP failed to pre-process the netcdf test." \ - > genmake_tnc.log + >> genmake_tnc.log echo " Please check that \$INCLUDES is properly set." \ - > genmake_tnc.log + >> genmake_tnc.log fi - echo "Executing:" > genmake_tnc.log - echo " $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS" > genmake_tnc.log - echo " $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log + echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log + echo " && $LINK $FFLAGS $FOPTIM -o genmake_tnc.o $LIBS" >> genmake_tnc.log $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1 \ - && $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1 + && $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1 RET_COMPILE=$? + cat genmake_tnc.log >> genmake_warnings #EH3 Remove test program execution for machines that either disallow #EH3 execution or cannot support it (eg. cross-compilers) @@ -819,15 +975,33 @@ HAVE_NETCDF=t else # try again with "-lnetcdf" added to the libs - $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null \ + echo "try again with added '-lnetcdf'" > genmake_tnc.log + echo "cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS \ " >> genmake_tnc.log + echo " && $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log + echo " && $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log + cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS 2>/dev/null \ && $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1 \ - && $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1 + && $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1 RET_COMPILE=$? + cat genmake_tnc.log >> genmake_warnings if test "x$RET_COMPILE" = x0 ; then LIBS="$LIBS -lnetcdf" HAVE_NETCDF=t else + # try again with "-lnetcdff" added to the libs + echo "try again with added '-lnetcdff -lnetcdf'" > genmake_tnc.log + echo "cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS \ " >> genmake_tnc.log + echo " && $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log + echo " && $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log + cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS 2>/dev/null \ + && $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1 \ + && $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdff -lnetcdf >> genmake_tnc.log 2>&1 + RET_COMPILE=$? cat genmake_tnc.log >> genmake_warnings + if test "x$RET_COMPILE" = x0 ; then + LIBS="$LIBS -lnetcdff -lnetcdf" + HAVE_NETCDF=t + fi fi fi rm -f genmake_tnc* @@ -874,6 +1048,14 @@ MPI= MPIPATH= TS= +PAPIS= +PCLS= +FOOLAD= +PAPI= +PCL= +HPMT= +GSL= +DEVEL= HAVE_TEST_L= # DEFINES checked by test compilation or command-line @@ -881,7 +1063,7 @@ HAVE_FDATE= FC_NAMEMANGLE= HAVE_CLOC= -HAVE_SETRLSTK= +# HAVE_SETRLSTK= HAVE_STAT= HAVE_NETCDF= HAVE_ETIME= @@ -898,6 +1080,7 @@ PWD=`pwd` test "x$MAKE" = x && MAKE=make test "x$AWK" = x && AWK=awk +EMBED_SRC= THISHOST=`hostname` THISCWD=`pwd` THISDATE=`date` @@ -931,7 +1114,7 @@ # The following state can be set directly by command-line switches gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE" -gm_s2="FC CPP IEEE TS MPI JAM DUMPSTATE STANDARDDIRS" +gm_s2="FC CPP IEEE TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL MPI JAM DUMPSTATE STANDARDDIRS" # The following state is not directly set by command-line switches gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM " @@ -1113,6 +1296,24 @@ -ts | --ts) TS=true ;; + -papis | --papis) + PAPIS=true ;; + -pcls | --pcls) + PCLS=true ;; + -foolad | --foolad) + FOOLAD=true ;; + -papi | --papi) + PAPI=true ;; + -pcl | --pcl) + PCL=true ;; + -hpmt | --hpmt) + HPMT=true ;; + + -gsl | --gsl) + GSL=true ;; + + -devel | --devel) + DEVEL=true ;; -mpi | --mpi) MPI=true ;; @@ -1141,6 +1342,9 @@ -ignoretime | -ignore_time | --ignoretime | --ignore_time) IGNORE_TIME="-DIGNORE_TIME" ;; + -es | --es | -embed-source | --embed-source) + EMBED_SRC=t ;; + -*) echo "Error: unrecognized option: "$ac_option usage @@ -1159,19 +1363,18 @@ if test -f ./.genmakerc ; then echo echo "WARNING: genmake2 has detected a copy of the old-style \"./.genmakerc\"" - echo " file. This file format is no longer supported. Please see:" - echo + echo " file. This file format is no longer supported. For directions on" + echo " how to setup and use the new \"genmake2\" script, please see:" echo " http://mitgcm.org/devel_HOWTO/" - echo - echo " for directions on how to setup and use the new \"genmake2\" input" - echo " files and send an email to MITgcm-support@mitgcm.org if you want help." + echo " and send an email to MITgcm-support@mitgcm.org if you need help." + echo "WARNING: ignore \"./.genmakerc\" and continue." echo fi # Find the MITgcm ${ROOTDIR} if test "x${ROOTDIR}" = x ; then tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'` - if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then + if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesupp -a -d ../pkg ; then ROOTDIR=".." else for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do @@ -1356,7 +1559,80 @@ if test ! "x$TS" = x ; then echo " Turning on timing per timestep" - DEFINES="$DEFINES -DTIME_PER_TIMESTEP" + if test ! "x$FOOLAD" = x ; then + DEFINES="$DEFINES -DTIME_PER_TIMESTEP_SFP" + else + DEFINES="$DEFINES -DTIME_PER_TIMESTEP" + fi +fi +if test ! "x$PAPIS" = x ; then + echo " Turning on PAPI flop summary per timestep" + echo " Please make sure PAPIINC, PAPILIB are defined" + if test ! "x$FOOLAD" = x ; then + DEFINES="$DEFINES -DUSE_PAPI_FLOPS_SFP" + else + DEFINES="$DEFINES -DUSE_PAPI_FLOPS" + fi + INCLUDES="$INCLUDES $PAPIINC" + LIBS="$LIBS $PAPILIB" +fi +if test ! "x$PCLS" = x ; then + echo " Turning on PCL counter summary per timestep" + echo " Please make sure PCLINC, PCLLIB are defined" + if test ! "x$FOOLAD" = x ; then + DEFINES="$DEFINES -DUSE_PCL_FLOPS_SFP" + else + DEFINES="$DEFINES -DUSE_PCL_FLOPS" + fi + INCLUDES="$INCLUDES $PCLINC" + LIBS="$LIBS $PCLLIB" +fi +if test ! "x$PAPI" = x ; then + if test ! "x$PAPIS" = x ; then + echo " PAPI performance analysis and flop summary per timestep cannot co-exist!" + echo " Sticking with PAPI flop summary per timestep!" + else + echo " Turning on performance analysis with PAPI" + echo " Please make sure PAPIINC, PAPILIB are defined" + DEFINES="$DEFINES -DUSE_PAPI" + INCLUDES="$INCLUDES $PAPIINC" + LIBS="$LIBS $PAPILIB" + fi +fi +if test ! "x$PCL" = x ; then + if test ! "x$PCLS" = x ; then + echo " PCL performance analysis and flop summary per timestep cannot co-exist!" + echo " Sticking with PCL flop summary per timestep!" + else + echo " Turning on performance analysis with PCL" + echo " Please make sure PCLINC, PCLLIB are defined" + DEFINES="$DEFINES -DUSE_PCL" + INCLUDES="$INCLUDES $PCLINC" + LIBS="$LIBS $PCLLIB" + fi +fi +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 + echo " PCL and the HPM Toolkit cannot co-exist!" + echo " Sticking with PCL!" + 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 +if test ! "x$GSL" = x ; then + echo " Turning on use of GSL to control floating point calculations" + echo " Please make sure GSLINC, GSLLIB are defined" + DEFINES="$DEFINES -DUSE_GSL_IEEE" + INCLUDES="$INCLUDES $GSLINC" + LIBS="$LIBS $GSLLIB" fi printf "\n=== Checking system libraries ===\n" @@ -1366,7 +1642,7 @@ call system('echo hi') end EOF -$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 +$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_SYSTEM=t @@ -1387,7 +1663,7 @@ print *, string end EOF -$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 +$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_FDATE=t @@ -1409,7 +1685,7 @@ print *, tarray end EOF -$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 +$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_ETIME=t @@ -1427,12 +1703,26 @@ echo "yes" else echo "no" + if test "x$EMBED_SRC" = xt ; then + echo " WARNING: you requested file embedding but it has" + echo " been disabled since C code cannot be called" + EMBED_SRC= + fi fi rm -f genmake_t* printf " Can we unlimit the stack size using $FC... " check_HAVE_SETRLSTK -if test "x$HAVE_SETRLSTK" != x ; then +if test "x$HAVE_SETRLSTK" = xt ; then + echo "yes" +else + echo "no" +fi +rm -f genmake_t* + +printf " Can we register a signal handler using $FC... " +check_HAVE_SIGREG +if test "x$HAVE_SIGREG" = xt ; then echo "yes" else echo "no" @@ -1457,6 +1747,14 @@ fi DEFINES="$DEFINES $IGNORE_TIME" +if test "x$EMBED_SRC" = xt ; then + build_embed_encode +fi +if test "x$EMBED_SRC" = xt ; then + ENABLE="$ENABLE embed_files" +fi + + printf "\n=== Setting defaults ===\n" printf " Adding MODS directories: " for d in $MODS ; do @@ -1542,19 +1840,21 @@ fi fi -#same for exch2 -if test -r $ROOTDIR"/pkg/exch2/Makefile" ; then - echo " Making source files in exch2 from templates" - ( cd $ROOTDIR"/pkg/exch2/" && $MAKE ) > make_exch2.errors 2>&1 - RETVAL=$? - if test "x${RETVAL}" = x0 ; then - rm -f make_exch2.errors - else - echo "Error: problem encountered while building source files in exch2:" - cat make_exch2.errors 1>&2 - exit 1 +#same for pkg/exch2 and pkg/regrid +for pdir in exch2 regrid ; do + if test -r $ROOTDIR"/pkg/${pdir}/Makefile" ; then + echo " Making source files in pkg/${pdir} from templates" + ( cd $ROOTDIR"/pkg/"${pdir} && $MAKE ) > make_${pdir}.errors 2>&1 + RETVAL=$? + if test "x${RETVAL}" = x0 ; then + rm -f make_${pdir}.errors + else + echo "Error: problem encountered while building source files in pkg/${pdir}:" + cat make_${pdir}.errors 1>&2 + exit 1 + fi fi -fi +done printf "\n=== Determining package settings ===\n" if test "x${PDEPEND}" = x ; then @@ -1665,8 +1965,8 @@ rm -f ./.tmp_pack echo " packages are: $PACKAGES" -# Check availability of NetCDF and then either build the MNC template -# files or delete mnc from the list of available packages. +# Check for package MNC: if NetCDF is available, then build the MNC +# template files ; otherwise, delete mnc from the list of packages. echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then @@ -1700,13 +2000,38 @@ fi fi +# Check for package PROFILES: if NetCDF is not available, +# then delete profiles from the list of available packages. +echo $PACKAGES | grep ' profiles ' > /dev/null 2>&1 +RETVAL=$? +if test "x$RETVAL" = x0 ; then + if test "x$HAVE_NETCDF" != xt ; then + cat < srclinks.tmp echo "" >> srclinks.tmp printf 'SRCFILES = ' > srclist.inc @@ -1929,12 +2298,19 @@ ignore_f=f case $d/$sf in ./$PACKAGES_DOT_H) + ignore_f=t ;; ./AD_CONFIG.h) + ignore_f=t ;; ./FC_NAMEMANGLE.h) + ignore_f=t ;; ./BUILD_INFO.h) + ignore_f=t + ;; + ./EMBEDDED_FILES.h) + ignore_f=t ;; *) # For the local directory *ONLY*, @@ -2047,11 +2423,15 @@ # These files are created by Makefile SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h BUILD_INFO.h - EOF -# Note: figure out some way to add Hyades JAM libraries here - +if test "x$EMBED_SRC" = xt ; then + echo "EMBEDDED_FILES = EMBEDDED_FILES.h" >>$MAKEFILE +else + echo "EMBEDDED_FILES = " >>$MAKEFILE +fi + +# Note: figure out some way to add Hyades JAM libraries here cat >>$MAKEFILE <>$MAKEFILE <> \$(MAKEFILE) -rm -f makedepend.out +lib: libmitgcmuv.a + +libmitgcmuv.a: \$(OBJFILES) + ar rcv libmitgcmuv.a \$(OBJFILES) + ar d libmitgcmuv.a main.o + links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES) small_f: \$(F77FILES) \$(F90FILES) @@ -2131,7 +2517,9 @@ @\$(EXECUTABLE) > \$@ clean: - -rm -rf *.o *.$FS *.p *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template + -rm -rf *.p *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template + -rm -rf *.o + -rm -rf *.$FS Clean: @make clean @make cleanlinks @@ -2142,7 +2530,8 @@ -find \$(EXEDIR) -name "*.meta" -exec rm {} \; -find \$(EXEDIR) -name "*.data" -exec rm {} \; -find \$(EXEDIR) -name "fort.*" -exec rm {} \; - -rm -f \$(EXECUTABLE) output.txt STD* + -rm -f \$(EXECUTABLE) \$(EXE_AD) *.txt STD* *diagnostics.log datetime + -rm -rf mnc_test_* #eh3 Makefile: makefile makefile: @@ -2170,6 +2559,25 @@ test ! "x$THISDATE" = x && echo " -echo \"#define THISDATE '$THISDATE'\" >> \$@" >> $MAKEFILE test ! "x$THISHOST" = x && echo " -echo \"#define THISHOST '$THISHOST'\" >> \$@" >> $MAKEFILE +if test "x$EMBED_SRC" = xt ; then + cat >>$MAKEFILE <>$MAKEFILE < \$@ .$FS.o: \$(FC) \$(FFLAGS) \$(FOPTIM) -c \$< -.F90.$FS90: - \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@ -.$FS90.o: +.F90.o: \$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$< .c.o: - \$(CC) \$(CFLAGS) -c \$< + \$(CC) \$(CFLAGS) \$(DEFINES) \$(INCLUDES) -c \$< # Special exceptions that use the ( .F - .p - .$FS - .o ) rule-chain .F.p: @@ -2210,10 +2616,10 @@ ad_vars="$ad_vars SVD_TAMC_FLAGS SVD_TAF_FLAGS" for i in $ad_vars ; do name=$i - t1="t2=\$"`echo $i` + t1="t2=\$"`echo "$i"` eval $t1 printf "%-20s = " $name >> $MAKEFILE - echo $t2 >> $MAKEFILE + echo "$t2" | sed -e 's| \+| |g' >> $MAKEFILE done echo " Add the source list for AD code generation" @@ -2230,7 +2636,7 @@ cat >>$MAKEFILE < ad_taf_output.$FS -ad_taf: ad_taf_output.o \$(OBJFILES) - \$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS) +\${EXE_AD}: ad_taf_output.o \$(OBJFILES) + \$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS) ad_tamc_output.$FS: ad_input_code.$FS \$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.$FS