--- MITgcm/tools/genmake	2001/08/13 19:34:57	1.41
+++ MITgcm/tools/genmake	2001/09/10 02:28:20	1.51
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.41 2001/08/13 19:34:57 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.51 2001/09/10 02:28:20 adcroft Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -10,6 +10,7 @@
 
 # Default lists
 set DISABLE = ( aim autodiff cal cost ctrl ecco exf grdchk )
+set DEFINES = ( )
 set ENABLE  = ( )
 set MODS  = ( )
 
@@ -171,10 +172,10 @@
 # source code in the standard directories
 if (! $?MODS) then
  set SOURCEDIRS  = ( )
- set INCLUDEDIRS = ( . )
+ set INCLUDEDIRS = ( )
 else
  set SOURCEDIRS  = ( $MODS )
- set INCLUDEDIRS = ( . $MODS )
+ set INCLUDEDIRS = ( $MODS )
 endif
 if (! $?BUILDDIR) set BUILDDIR = ( . )
 if (! -d $BUILDDIR) then
@@ -253,6 +254,14 @@
     set INCLUDEDIRS = ($INCLUDEDIRS $adr)
   else
     echo "                                      *" Package \"$dr\" NOT enabled.
+    switch ($dr)
+      case mom_fluxform:
+        set DEFINES = ($DEFINES '-DDISABLE_MOM_FLUXFORM'); breaksw
+      case mom_vecinv:
+        set DEFINES = ($DEFINES '-DDISABLE_MOM_VECINV'); breaksw
+      default:
+        breaksw
+    endsw
   endif
 end
 if (! $?STANDARDDIRS) set STANDARDDIRS=(eesupp model)
@@ -274,10 +283,10 @@
 set KPP        = (  )
 set FC         = ( 'f77' )
 set LINK       = ( 'f77' )
-set DEFINES    = (  )
-set INCLUDES   = (  )
+set INCLUDES   = ( -I. )
 set FFLAGS     = (  )
 set FOPTIM     = (  )
+set CFLAGS     = (  )
 set KFLAGS1    = (  )
 set KFLAGS2    = (  )
 set LIBS       = (  )
@@ -377,22 +386,23 @@
     set LN         = ( '/usr/bin/ln -s' )
     set CPP        = ( '/usr/ccs/lib/cpp -P' )
     set DEFINES    = ( ${DEFINES} '-DTARGET_SUN -DWORDLENGTH=4' )
-    set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar')
-    set FOPTIM     = ( '-fast -O3' )
-    set NOOPTFLAGS = ( '-O0' )
-    set NOOPTFILES = ( 'barrier.F different_multiple.F external_fields_load.F ini_vertical_grid.F ini_spherical_polar_grid.F ini_cori.F')
+    set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar -xtypemap=real:64,double:64,integer:32 -fsimple=0' )
+    set FOPTIM     = ( '-dalign -O3 -xarch=v9' )
+    set CFLAGS     = ( '-dalign -O3 -xarch=v9' )
+    set NOOPTFLAGS = ( '-dalign -O0 -xarch=v9' )
+    set NOOPTFILES = ( 'barrier.F different_multiple.F external_fields_load.F ini_vertical_grid.F ini_spherical_polar_grid.F ini_cori.F mon_printstats_rl.F mon_printstats_rs.F aim_aim2dyn.F aim_dyn2aim.F aim_aim2dyn_exchanges.F aim_external_fields_load.F aim_calc_diags.F aim_external_forcing.F aim_do_atmos_physics.F aim_write_diags.F aim_do_inphys.F ')
     breaksw
   case SunOS+mpi:
     set LN         = ( '/usr/bin/ln -s' )
     set CPP        = ( '/usr/ccs/lib/cpp -P' )
     set DEFINES    = ( ${DEFINES} '-DTARGET_SUN -DWORDLENGTH=4' )
     set INCLUDES   = ( '-I/usr/local/mpi/include' )
-    set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar')
-    set FOPTIM     = ( '-fast -O3' )
-    set NOOPTFLAGS = ( '-O0' )
     set LIBS       = ( '-L/usr/local/mpi/lib/solaris/ch_shmem -lmpi -lthread' \
+    set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar -xtypemap=real:64,double:64,integer:32 -fsimple=0' )
+    set FOPTIM     = ( '-dalign -O3 -xarch=v9' )
+    set NOOPTFLAGS = ( '-dalign -O0 -xarch=v9' )
                        '-lsocket -lnsl' )
-    set NOOPTFILES = ( 'barrier.F different_multiple.F external_fields_load.F ini_vertical_grid.F ini_spherical_polar_grid.F ini_cori.F')
+    set NOOPTFILES = ( 'barrier.F different_multiple.F external_fields_load.F ini_vertical_grid.F ini_spherical_polar_grid.F ini_cori.F mon_printstats_rl.F mon_printstats_rs.F')
     breaksw
   case IRIX32:
     echo "Configuring for SGI ONYX running IRIX64"
@@ -507,7 +517,7 @@
 echo -n 'SRCFILES = ' > srclist.inc
 echo -n 'CSRCFILES = ' > csrclist.inc
 echo -n 'HEADERFILES = ' > hlist.inc
-foreach dr ($SOURCEDIRS $INCLUDEDIRS)
+foreach dr ($SOURCEDIRS $INCLUDEDIRS .)
  set deplist=( )
  foreach srcfile (`cd $dr; ls *.[hcF]`)
   if (! -r .links.tmp/$srcfile) then
@@ -648,6 +658,8 @@
 # Optim./debug for FC
 FFLAGS = ${FFLAGS}
 FOPTIM = ${FOPTIM}
+# Flags for CC
+CFLAGS = ${CFLAGS}
 # Files that should not be optimized
 NOOPTFILES = ${NOOPTFILES}
 NOOPTFLAGS = ${NOOPTFLAGS}
@@ -662,7 +674,7 @@
 echo 'F77FILES =  $(SRCFILES:.F=.f)'                    >> ${mfile}
 echo 'OBJFILES =  $(SRCFILES:.F=.o) $(CSRCFILES:.c=.o)' >> ${mfile}
 
-rm -f srclist.inc csrclist.inc flist.tmp clist.tmp
+rm -f srclist.inc csrclist.inc hlist.inc flist.tmp clist.tmp
 
 cat >> ${mfile} <<EOF
 
@@ -680,6 +692,10 @@
 
 small_f: \$(F77FILES)
 
+output.txt: \$(EXECUTABLE)
+	@printf 'running ... '
+	@\$(EXECUTABLE) > \$@
+
 clean:
 	-rm -rf *.o *.f *.p ${RMFILES}
 Clean:
@@ -702,6 +718,8 @@
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
 .f.o:
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
+.c.o:
+	\$(CC) \$(CFLAGS) -c \$<
 
 # Special exceptions that use the ( .F - .p - .f - .o ) rule-chain
 .F.p: