Changeset 1953 for branches/DEV_r1784_mid_year_merge_2010/UTIL/fait_AA_make

Timestamp:

2010-06-24T17:27:10+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 3: Add in changes from the trunk between revisions 1784 and 1821. No conflicts so far

File:

• branches/DEV_r1784_mid_year_merge_2010/UTIL/fait_AA_make (modified) (12 diffs)

branches/DEV_r1784_mid_year_merge_2010/UTIL/fait_AA_make

@@ -86 +86 @@
 
 # Agrif library and conv
-libagrif :  \$(call keycompat,key_iomput,key_agrif)
+libagrif :
 ifeq (\$(AGRIF),use)
    @( if [ ! -d OPAFILES ]; then mkdir OPAFILES; fi )
@@ -112 +112 @@
 #-Q- sx8brodie    -R2 \\
 #-Q- sxdkrz    -R2 \\
-#-Q- eshpux    -R2 \\
+#-Q- es2    -R2 \\
 #-Q- aix6      -qsource \\
 #-Q- aix    -qsource \\
@@ -118 +118 @@
       OPAFILES/\$*.F90 || { mv \$(PREF).L \$(TMP) ; false ; exit ; }
 #-Q- sxdkrz    @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
-#-Q- eshpux       @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
+#-Q- es2       @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
 endif
 
@@ -132 +132 @@
 .PRECIOUS : \$(MODEL_LIB)
 #-Q- sxdkrz .PRECIOUS : \$(SXMODEL_LIB)
-#-Q- eshpux .PRECIOUS : \$(SXMODEL_LIB)
+#-Q- es2 .PRECIOUS : \$(SXMODEL_LIB)
 
 # library dependancies
@@ -151 +151 @@
 #-Q- sx8brodie    -R2 \\
 #-Q- sxdkrz    -R2 \\
-#-Q- eshpux    -R2 \\
+#-Q- es2    -R2 \\
 #-Q- aix    -qsource \\
 #-Q- aix6      -qsource \\
@@ -157 +157 @@
       \$*.f90 || { if [ -f \$(PREF)\$*.L ] ; then mv \$(PREF)\$*.L \$(TMP) ; fi ; false ; exit ; }
 #-Q- sxdkrz    @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
-#-Q- eshpux    @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
+#-Q- es2    @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
       @\$(A_C) \$(MODEL_LIB) \$*.o  > /dev/null
       @\$(RM) \$*.[of]
@@ -187 +187 @@
 #-Q- sx8brodie    -R2 \\
 #-Q- sxdkrz    -R2 \\
-#-Q- eshpux    -R2 \\
+#-Q- es2    -R2 \\
 #-Q- aix    -qsource \\
 #-Q- aix6      -qsource \\
@@ -199 +199 @@
 #-Q- sx8brodie    -R2 \\
 #-Q- sxdkrz    -R2 \\
-#-Q- eshpux    -R2 \\
+#-Q- es2    -R2 \\
 #-Q- aix    -qsource \\
 #-Q- aix6      -qsource \\
@@ -206 +206 @@
 endif
 #-Q- sxdkrz    @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
-#-Q- eshpux    @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
+#-Q- es2    @\$(A_X) \$(SXMODEL_LIB) \$*.o  > /dev/null
       @\$(A_C) \$(MODEL_LIB) \$*.o  > /dev/null
       @\$(RM) \$*.[of]
@@ -245 +245 @@
 echo '#-Q- sxdkrz  F_O =  -f2003 nocbind -ew -sx6 -ftrace -C vopt -Wf"-init stack=nan" -Wl"-f nan" -Wf"-P nh -O overlap" -Wf"-pvctl noassume loopcnt=10000" -L transform -I $(MODDIR) -I $(MODDIR)/oce -I $(NCDF_INC) $(USER_INC)'
 echo '#-Q- sxdkrz  L_X = $(L_O) -ftrace'
-echo '#-Q- eshpux  # Compiler options for NEMO (Earth Simulator)'
-echo '#-Q- eshpux  # for super perfs!'
-echo '#-Q- eshpux  # F_O = -f2003 nocbind $(FTRACE) -pi nest=5 line=10000 expin=Fmpplib.F -Wf,-A idbl4 -C hopt -Wf"-P nh -O overlap" -Wf,-pvctl noassume loopcnt=10000 -L transform -I $(MODDIR) -I $(MODDIR)/oce -I $(NCDF_INC) $(USER_INC)'
-echo '#-Q- eshpux  # regular options!'
-echo '#-Q- eshpux  F_O = -f2003 nocbind $(FTRACE) -Wf,-A idbl4 -C vopt -P stack -Wf"-P nh -O overlap" -Wf,-pvctl noassume loopcnt=10000 -L transform -Wf,-pvctl nomsg -Wf"-O nomsg" -I $(MODDIR) -I $(MODDIR)/oce -I $(NCDF_INC) $(USER_INC)'
-echo '#-Q- eshpux  L_X = $(L_O)'
+echo '#-Q- es2  # Compiler options for NEMO (Earth Simulator)'
+echo '#-Q- es2  # for super perfs!'
+echo '#-Q- es2  # F_O = -f2003 nocbind $(FTRACE) -pi nest=5 line=10000 expin=Fmpplib.F -Wf,-A idbl4 -C hopt -Wf"-P nh -O overlap" -Wf,-pvctl noassume loopcnt=10000 -L transform -I $(MODDIR) -I $(MODDIR)/oce -I $(NCDF_INC) $(USER_INC)'
+echo '#-Q- es2  # regular options!'
+echo '#-Q- es2  F_O = -f2003 nocbind $(FTRACE) -Wf,-A idbl4 -C vopt -P stack -Wf"-P nh -O overlap" -Wf,-pvctl noassume loopcnt=10000 -L transform -Wf,-pvctl nomsg -Wf"-O nomsg" -I $(MODDIR) -I $(MODDIR)/oce -I $(NCDF_INC) $(USER_INC)'
+echo '#-Q- es2  L_X = $(L_O)'
 echo '#-Q- linux  # Compiler options for NEMO (pgf version)'
 echo '#-Q- linux  F_O = -Mlist -O3 -byteswapio -r8  -I $(MODDIR) -I$(MODDIR)/oce -I $(NCDF_INC) $(USER_INC)'
@@ -286 +286 @@
 echo '#-Q- sx8brodie PREF=i.'
 echo '#-Q- sxdkrz PREF=i.'
-echo '#-Q- eshpux PREF=i.'
+echo '#-Q- es2 PREF=i.'
 echo ''
 echo '# add suffix to P_P'
@@ -327 +327 @@
 
 echo '#check key compatibility'
-echo 'keycompat=$(if $(and $(findstring $1,$(P_P)),$(findstring $2,$(P_P))),$(error $1 and $2 NOT compatible))'
+echo 'keycompat=$(if $(word 2, $(findstring $1,$(P_P)) $(findstring $2,$(P_P))),$(error $1 and $2 NOT compatible))'
 
 echo ''