Changeset 400

Timestamp:

09/29/08 09:24:26 (16 years ago)

Author:

mafoipsl

Message:

First implementation for vargas : AIX6 and ax6_mono
Not fully tested.

Location:

modipsl/trunk/util

Files:

• AA_make.gdef (modified) (2 diffs)
• ins_script (modified) (3 diffs)
• w_i_h (modified) (1 diff)

modipsl/trunk/util/AA_make.gdef

@@ -82 +82 @@
 #-Q- aix      NCDF_LIB = -L/usr/local/pub/lib -lnetcdf
 #-Q- aix      #-
+#-Q- aix6     #- Global definitions for IBM AIX Power6 (MPP)
+#-Q- aix6     LIB_MPI = MPI1
+#-Q- aix6     LIB_MPI_BIS = MPI1
+#-Q- aix6     PRISM_ARCH = AIX6
+#-Q- aix6     PRISM_NAME = vargas
+#-Q- aix6     FCM_ARCH = AIX6_VARGAS
+#-Q- aix6     M_K = gmake
+#-Q- aix6     P_C = /usr/lib/cpp
+#-Q- aix6     P_O = -P -C $(P_P:-WF,-D%=-D%)
+#-Q- aix6     F_C = mpxlf90_r -c
+#-Q- aix6     #-D- MD    F_D =
+#-Q- aix6     #-D- MN    F_D =
+#-Q- aix6     #-P- I4R4  F_P = -qrealsize=4
+#-Q- aix6     #-P- I4R8  F_P = -qrealsize=8
+#-Q- aix6     #-P- I8R8  F_P =
+#-Q- aix6     w_w = $(F_P) -O3 -qsuffix=f=f90
+#-Q- aix6     F_O = $(w_w) -I$(MODDIR) -qmoddir=$(MODDIR)
+#-Q- aix6     F_L = mpxlf90_r
+#-Q- aix6     M_M = 0
+#-Q- aix6     L_X = 0
+#-Q- aix6     L_O = $(F_P) -q64 -bmaxdata:2000000000 -O3
+#-Q- aix6     A_C = ar -rs -X64
+#-Q- aix6     A_G = ar -x -X64
+#-Q- aix6     C_C = cc -c
+#-Q- aix6     C_O = -O
+#-Q- aix6     C_L = cc
+#-Q- aix6     #-
+#-Q- aix6     NCDF_INC = /usr/local/pub/NetCDF/3.6.2/include
+#-Q- aix6     NCDF_LIB = -L/usr/local/pub/NetCDF/3.6.2/lib -lnetcdf
+#-Q- aix6     #-
 #-Q- ax_mono  #- Global definitions for IBM AIX (monoprocessing)
 #-Q- ax_mono  M_K = gmake
@@ -107 +137 @@
 #-Q- ax_mono  NCDF_LIB = -L/usr/local/pub/lib -lnetcdf
 #-Q- ax_mono  #-
+#-Q- ax6_mono #- Global definitions for IBM AIX Power6 (monoprocessing)
+#-Q- ax6_mono M_K = gmake
+#-Q- ax6_mono P_C = /usr/lib/cpp
+#-Q- ax6_mono P_O = -P -I/usr/lpp/ppe.poe/include/thread64 -C $(P_P:-WF,-D%=-D%)
+#-Q- ax6_mono F_C = xlf90_r -c
+#-Q- ax6_mono #-D- MD    F_D =
+#-Q- ax6_mono #-D- MN    F_D =
+#-Q- ax6_mono #-P- I4R4  F_P = -qrealsize=4
+#-Q- ax6_mono #-P- I4R8  F_P = -qrealsize=8
+#-Q- ax6_mono #-P- I8R8  F_P =
+#-Q- ax6_mono w_w = $(F_P) -O3 -qsuffix=f=f90
+#-Q- ax6_mono F_O = $(w_w) -I$(MODDIR) -qmoddir=$(MODDIR)
+#-Q- ax6_mono F_L = xlf90_r
+#-Q- ax6_mono M_M = 0
+#-Q- ax6_mono L_X = 0
+#-Q- ax6_mono L_O = $(F_P) -q64 -bmaxdata:2000000000 -O3
+#-Q- ax6_mono A_C = ar -rs -X64
+#-Q- ax6_mono A_G = ar -x -X64
+#-Q- ax6_mono C_C = cc -c
+#-Q- ax6_mono C_O = -O
+#-Q- ax6_mono C_L = cc
+#-Q- ax6_mono #-
+#-Q- ax6_mono NCDF_INC = /usr/local/pub/NetCDF/3.6.2/include
+#-Q- ax6_mono NCDF_LIB = -L/usr/local/pub/NetCDF/3.6.2/lib -lnetcdf
+#-Q- ax6_mono #-
 #-Q- babel    #- Global definitions for IBM Blue Gene 
 #-Q- babel    M_K = gmake

modipsl/trunk/util/ins_script

@@ -52 +52 @@
    b_n_atlas=$(basename $HOME)
    d_n_atlas=$(dirname $HOME | sed 's/home/u/')
-elif [ "$x_t" = "aix" ]; then
+elif [ "$x_t" = "aix" -o "$x_t" = "aix6" ]; then
    b_n_atlas=$LOGIN
    d_n_atlas="/u/"$(dirname $HOME | awk -F\/ '{print $3"/"$4}')
@@ -77 +77 @@
 
 case ${x_t} in
-  ( aix | babel | cray | fjvpp | linux | lxiv7 | lxiv8 | osf1 | \
+  ( aix* | babel | cray | fjvpp | linux | lxiv7 | lxiv8 | osf1 | \
     solaris | t3e | sx8brodie | sx6nec | sx8mercure | unix ) ;;
   (*)
@@ -101 +101 @@
 if   [ ${W_OS}  = "sx8brodie" ]; then
    format='\s'
-elif [ ${W_OS}  = "aix" ]; then
+elif [ ${W_OS}  = "aix" -o ${W_OS}  = "aix6" ]; then
    format='\s'
 elif [ ${W_OS}  = "babel" ]; then

modipsl/trunk/util/w_i_h

@@ -15 +15 @@
   { case ${u_n} in
      ( zahir* )                 DSYS="aix";;
+     ( vargas* )                DSYS="aix6";;
      ( * )                      DSYS="ax_mono";
     esac