Changeset 1521 for trunk/libIGCM

Timestamp:

02/28/20 15:45:31 (4 years ago)

Author:

aclsce

Message:

• Modified handling of irene machines (irene-skl and irene-amd)

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -11 +11 @@
 #
 #**************************************************************
-
 # bypass specific internationalization (for gawk)
 export LC_ALL="C"
@@ -62 +61 @@
         SYSTEM=curie
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_curie.ksh;;
-    irene170|irene171|irene190|irene191|irene192|irene193)
-        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for irene Intel X-64 at TGCC"
-        CENTER=TGCC
-        SYSTEM=irene
-        . ${libIGCM}/libIGCM_sys/libIGCM_sys_irene.ksh;;
-    irene172|irene173|irene194|irene195)
-               [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for irene AMD X-64 at TGCC"
-        CENTER=TGCC
-        SYSTEM=irene-amd
-        . ${libIGCM}/libIGCM_sys/libIGCM_sys_irene-amd.ksh;;
+    irene*)
+        if [ "${SLURM_JOB_PARTITION}" = "rome" ] || [ "$( hostname -s)" = "irene172" ] || [ "$( hostname -s)" = "irene173" ] || [ "$( hostname -s)" = "irene194" ] || [ "$( hostname -s)" = "irene195" ] ; then
+         [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for irene_amd Intel X-64 at TGCC"
+         CENTER=TGCC
+         SYSTEM=irene-amd
+         . ${libIGCM}/libIGCM_sys/libIGCM_sys_irene-amd.ksh
+        else
+         [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for irene Intel X-64 at TGCC"
+         CENTER=TGCC
+         SYSTEM=irene
+         . ${libIGCM}/libIGCM_sys/libIGCM_sys_irene.ksh
+        fi;;
     airain*)
         [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for airain Intel X-64."