Changeset 1953 for branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE_LOBSTER/scripts/BB_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/CONFIG/GYRE_LOBSTER/scripts/BB_make (modified) (10 diffs)

branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE_LOBSTER/scripts/BB_make

@@ -22 +22 @@
 #-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)
 #-Q- sxdkrz  L_X = $(L_O) -ftrace
-#-Q- eshpux  # Compiler options for NEMO (Earth Simulator)
-#-Q- eshpux  # for super perfs!
-#-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)
-#-Q- eshpux  # regular options!
-#-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)
-#-Q- eshpux  L_X = $(L_O)
+#-Q- es2  # Compiler options for NEMO (Earth Simulator)
+#-Q- es2  # for super perfs!
+#-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)
+#-Q- es2  # regular options!
+#-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)
+#-Q- es2  L_X = $(L_O)
 #-Q- linux  # Compiler options for NEMO (pgf version)
 #-Q- linux  F_O = -Mlist -O3 -byteswapio -r8  -I $(MODDIR) -I$(MODDIR)/oce -I $(NCDF_INC) $(USER_INC)
@@ -62 +62 @@
 #-Q- sx8brodie PREF=i.
 #-Q- sxdkrz PREF=i.
-#-Q- eshpux PREF=i.
+#-Q- es2 PREF=i.
 
 # add suffix to P_P
@@ -585 +585 @@
 #-Q- sx8brodie    -R2 \
 #-Q- sxdkrz    -R2 \
-#-Q- eshpux    -R2 \
+#-Q- es2    -R2 \
 #-Q- aix6      -qsource \
 #-Q- aix    -qsource \
@@ -591 +591 @@
       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
 
@@ -605 +605 @@
 .PRECIOUS : $(MODEL_LIB)
 #-Q- sxdkrz .PRECIOUS : $(SXMODEL_LIB)
-#-Q- eshpux .PRECIOUS : $(SXMODEL_LIB)
+#-Q- es2 .PRECIOUS : $(SXMODEL_LIB)
 
 # library dependancies
@@ -624 +624 @@
 #-Q- sx8brodie    -R2 \
 #-Q- sxdkrz    -R2 \
-#-Q- eshpux    -R2 \
+#-Q- es2    -R2 \
 #-Q- aix    -qsource \
 #-Q- aix6      -qsource \
@@ -630 +630 @@
       $*.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]
@@ -660 +660 @@
 #-Q- sx8brodie    -R2 \
 #-Q- sxdkrz    -R2 \
-#-Q- eshpux    -R2 \
+#-Q- es2    -R2 \
 #-Q- aix    -qsource \
 #-Q- aix6      -qsource \
@@ -672 +672 @@
 #-Q- sx8brodie    -R2 \
 #-Q- sxdkrz    -R2 \
-#-Q- eshpux    -R2 \
+#-Q- es2    -R2 \
 #-Q- aix    -qsource \
 #-Q- aix6      -qsource \
@@ -679 +679 @@
 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]