/[MITgcm]/MITgcm/tools/genmake2
ViewVC logotype

Diff of /MITgcm/tools/genmake2

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

revision 1.185 by jmc, Fri Mar 27 20:18:07 2009 UTC revision 1.187 by jmc, Wed Apr 15 22:21:03 2009 UTC
# Line 611  Usage: "$0" [OPTIONS] Line 611  Usage: "$0" [OPTIONS]
611            set to PATH. i.e. Include files from \$PATH/include, link to libraries            set to PATH. i.e. Include files from \$PATH/include, link to libraries
612            from \$PATH/lib and use binaries from \$PATH/bin.            from \$PATH/lib and use binaries from \$PATH/bin.
613    
614        -omp | --omp
615              Activate OpenMP code + use Compiler option OMPFLAG
616        -omp=OMPFLAG | --omp=OMPFLAG
617              Activate OpenMP code + use Compiler option OMPFLAG
618    
619      -es | --es | -embed-source | --embed-source      -es | --es | -embed-source | --embed-source
620            Embed a tarball containing the full source code            Embed a tarball containing the full source code
621            (including the Makefile, etc.) used to build the            (including the Makefile, etc.) used to build the
# Line 1058  NOOPTFILES= Line 1063  NOOPTFILES=
1063  NOOPTFLAGS=  NOOPTFLAGS=
1064  MPI=  MPI=
1065  MPIPATH=  MPIPATH=
1066    OMP=
1067    OMPFLAG=
1068  TS=  TS=
1069  PAPIS=  PAPIS=
1070  PCLS=  PCLS=
# Line 1125  TAMC_EXTRA= Line 1132  TAMC_EXTRA=
1132    
1133  #  The following state can be set directly by command-line switches  #  The following state can be set directly by command-line switches
1134  gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE"  gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE"
1135  gm_s2="FC CPP IEEE TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL MPI JAM DUMPSTATE STANDARDDIRS"  gm_s2="FC CPP IEEE TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL MPI OMP DUMPSTATE STANDARDDIRS"
1136    
1137  #  The following state is not directly set by command-line switches  #  The following state is not directly set by command-line switches
1138  gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM FEXTRAFLAGS"  gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM FEXTRAFLAGS"
# Line 1326  for ac_option in "$@" ; do Line 1333  for ac_option in "$@" ; do
1333              MPIPATH=$ac_optarg              MPIPATH=$ac_optarg
1334              MPI=true ;;              MPI=true ;;
1335                    
1336  #       -jam | --jam)          -omp | --omp)
1337  #           JAM=1 ;;              OMP=true ;;
1338  #       -nojam | --nojam)          -omp=* | --omp=*)
1339  #           JAM=0 ;;              OMPFLAG=$ac_optarg
1340                OMP=true ;;
1341                    
1342          -ds | --ds)          -ds | --ds)
1343              DUMPSTATE=t ;;              DUMPSTATE=t ;;
# Line 1567  if test ! "x$MPI" = x ; then Line 1575  if test ! "x$MPI" = x ; then
1575        echo "  Turning on MPI cpp macros"        echo "  Turning on MPI cpp macros"
1576        DEFINES="$DEFINES -DALLOW_USE_MPI -DALWAYS_USE_MPI"        DEFINES="$DEFINES -DALLOW_USE_MPI -DALWAYS_USE_MPI"
1577  fi  fi
1578    if test ! "x$OMP" = x ; then
1579          echo "  Add OMPFLAG and turn on OpenMP cpp macros"
1580          FFLAGS="$FFLAGS $OMPFLAG"
1581          F90FLAGS="$F90FLAGS $OMPFLAG"
1582          DEFINES="$DEFINES -DUSE_OMP_THREADING"
1583    fi
1584    
1585  if test ! "x$TS" = x ; then  if test ! "x$TS" = x ; then
1586        echo "  Turning on timing per timestep"        echo "  Turning on timing per timestep"
# Line 1807  for d in $MODS ; do Line 1821  for d in $MODS ; do
1821              if test -L $name ; then              if test -L $name ; then
1822                cmp $d/$ii $name > /dev/null 2>&1                cmp $d/$ii $name > /dev/null 2>&1
1823                RETVAL=$?                RETVAL=$?
1824                xx=`echo $MPI_LNKF | grep -c $name`                yy=0 ;
1825                if test "x$RETVAL" != x0 -a $xx == 0 ; then                for xx in $MPI_LNKF ; do if test $xx = $name ; then yy=1 ; fi ; done
1826                  if test "x$RETVAL" != x0 -a $yy = 0 ; then
1827                # remove sym-link if different and has not just been linked                # remove sym-link if different and has not just been linked
1828                  printf "Un-link + "                  printf "Un-link + "
1829                  rm -f $name                  rm -f $name
# Line 1821  for d in $MODS ; do Line 1836  for d in $MODS ; do
1836              if ! test -f $name ; then              if ! test -f $name ; then
1837                # make sym-link and keep record of it                # make sym-link and keep record of it
1838                  printf "Linking $ii to $name ; "                  printf "Linking $ii to $name ; "
1839                  ln -s $d/$ii $name                  ln -sf $d/$ii $name
1840                  MPI_LNKF="$MPI_LNKF $name"                  MPI_LNKF="$MPI_LNKF $name"
1841              fi              fi
1842            fi            fi
# Line 1830  for d in $MODS ; do Line 1845  for d in $MODS ; do
1845      fi      fi
1846  done  done
1847  echo  echo
1848    #echo "MPI_LNKF='$MPI_LNKF'"
1849    
1850  if test "x${PLATFORM}" = x ; then  if test "x${PLATFORM}" = x ; then
1851      PLATFORM=$p_PLATFORM      PLATFORM=$p_PLATFORM
# Line 2570  else Line 2586  else
2586      echo "EMBEDDED_FILES = " >>$MAKEFILE      echo "EMBEDDED_FILES = " >>$MAKEFILE
2587  fi  fi
2588    
 #  Note: figure out some way to add Hyades JAM libraries here  
2589  cat >>$MAKEFILE <<EOF  cat >>$MAKEFILE <<EOF
2590  # Unix ln (link)  # Unix ln (link)
2591  LN = ${LN}  LN = ${LN}
# Line 2769  EOF Line 2784  EOF
2784  #===  Automatic Differentiation Rules  ===  #===  Automatic Differentiation Rules  ===
2785  #===  for TAMC/TAF  ======================  #===  for TAMC/TAF  ======================
2786    
2787  if test "x$OPENAD" == x ; then  if test "x$OPENAD" = x ; then
2788    
2789  cat >>$MAKEFILE <<EOF  cat >>$MAKEFILE <<EOF
2790    

Legend:
Removed from v.1.185  
changed lines
  Added in v.1.187

  ViewVC Help
Powered by ViewVC 1.1.22