Changeset 1314

Timestamp:

04/05/16 16:05:18 (8 years ago)

Author:

jgipsl

Message:

Adapted libIGCM to run at climserv (IPSL cluster at Polytechinque). The same libIGCM_sys as for ciclad is used but some changes for the paths are done inside.

For ciclad the variable CENTER change to IPSL-ciclad to be different from the one used for climserv (IPSL-climserv).

The running queue at ciclad also changed in AA_job and some other jobs. Now the default queue is used but the old is kept in comment. This is done to have the same heading running at ciclad and climserv.

Location:

trunk/libIGCM

Files:

• AA_create_multi_se (modified) (1 diff)
• AA_create_se (modified) (1 diff)
• AA_create_ts (modified) (1 diff)
• AA_job (modified) (1 diff)
• libIGCM_sys/libIGCM_sys.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_ciclad.ksh (modified) (3 diffs)

trunk/libIGCM/AA_create_multi_se

@@ -44 +44 @@
 #-Q- ifort_CICLAD #PBS -m a
 #-Q- ifort_CICLAD #PBS -j oe
-#-Q- ifort_CICLAD #PBS -q h12
+#-Q- ifort_CICLAD ###PBS -q h12       # Queue for 12 hours at ciclad only
 #-Q- ifort_CICLAD #PBS -S /bin/ksh
 #-Q- default #!/bin/ksh

trunk/libIGCM/AA_create_se

@@ -44 +44 @@
 #-Q- ifort_CICLAD #PBS -m a
 #-Q- ifort_CICLAD #PBS -j oe
-#-Q- ifort_CICLAD #PBS -q h12
+#-Q- ifort_CICLAD ###PBS -q h12       # Queue for 12 hours at ciclad only
 #-Q- ifort_CICLAD #PBS -S /bin/ksh
 #-Q- default #!/bin/ksh

trunk/libIGCM/AA_create_ts

@@ -44 +44 @@
 #-Q- ifort_CICLAD #PBS -m a
 #-Q- ifort_CICLAD #PBS -j oe
-#-Q- ifort_CICLAD #PBS -q h12
+#-Q- ifort_CICLAD ###PBS -q h12       # Queue for 12 hours at ciclad only
 #-Q- ifort_CICLAD #PBS -S /bin/ksh
 #-Q- default #!/bin/ksh

trunk/libIGCM/AA_job

@@ -59 +59 @@
 #-Q- ifort_CICLAD #PBS -m a
 #-Q- ifort_CICLAD #PBS -j oe
-#-Q- ifort_CICLAD #PBS -q h12
+#-Q- ifort_CICLAD ###PBS -q h12   # Queue for 12 hours at ciclad only
 #-Q- ifort_CICLAD #PBS -o Script_Output_::Jobname::.000001
 #-Q- ifort_CICLAD #PBS -S /bin/ksh

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -72 +72 @@
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_obelix.ksh;;
     ciclad*)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source ciclad lib."
-        CENTER=IPSL
+        [ ! X${TaskType} = Xchecking ] && echo "sys source ciclad lib for running at ciclad."
+        CENTER=IPSL-ciclad
+        SYSTEM=ifort_CICLAD
+        . ${libIGCM}/libIGCM_sys/libIGCM_sys_ciclad.ksh;;
+    camelot*|loholt1*|loholt2*|merlin*)
+        [ ! X${TaskType} = Xchecking ] && echo "sys source ciclad lib for running at climserv."
+        CENTER=IPSL-climserv
         SYSTEM=ifort_CICLAD
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_ciclad.ksh;;

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ciclad.ksh

@@ -96 +96 @@
 # Set environment tools (ferret, nco, cdo, rebuild, ...)
 #====================================================
-. /home/igcmg/.atlas_env_ciclad_ksh
+if [ $CENTER == IPSL-ciclad ] ; then
+    # At ciclad
+    export PATH=${PATH}:/home/igcmg/rebuild/src_X64_CICLAD/modipsl_v2_2_3_netcdf4.2/bin/
+    . /home/igcmg/.atlas_env_ciclad_ksh
+else
+    # At climserv use the same files stored at ciclad but adapt the path
+    export PATH=${PATH}:/ciclad-home/igcmg/rebuild/src_X64_CICLAD/modipsl_v2_2_3_netcdf4.2/bin/
+    . /ciclad-home/igcmg/.atlas_env_ciclad_ksh
+fi
+
 [ ! X${TaskType} = Xchecking ] && IGCM_debug_Print 1 "List of loaded modules:"
 [ ! X${TaskType} = Xchecking ] && module list
-
-export PATH=${PATH}:/home/igcmg/rebuild/src_X64_CICLAD/modipsl_v2_2_3_netcdf4.2/bin/
 
 #====================================================
@@ -134 +141 @@
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
 if [ X${PBS_JOBID} != X ] ; then
-  typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/data/${LOGIN}/RUN_DIR/${PBS_JOBID}_${$}}
+    if [ $CENTER == IPSL-ciclad ] ; then
+        typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/data/${LOGIN}/RUN_DIR/${PBS_JOBID}_${$}}
+    else
+        typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/homedata/${LOGIN}/RUN_DIR/${PBS_JOBID}_${$}}
+    fi
 else
   typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/tmp/tmp$$}
@@ -184 +195 @@
     #====================================================
     #- ARCHIVE (dedicated to large files)
-    ARCHIVE=${ARCHIVE:=/data/${LOGIN}}
+    if [ $CENTER == IPSL-ciclad ] ; then
+        # At ciclad
+        ARCHIVE=${ARCHIVE:=/data/${LOGIN}}
+    else
+        # At climserv
+        ARCHIVE=${ARCHIVE:=/homedata/${LOGIN}}
+    fi
   fi