Changeset 1172 for trunk/libIGCM

Timestamp:

02/13/15 15:46:55 (9 years ago)

Author:

sdipsl

Message:

• this ins_job dont need w_i_h
• simplify

Location:

trunk/libIGCM

Files:

• ins_job (modified) (6 diffs)
• libIGCM_sys/libIGCM_sys.ksh (modified) (1 diff)

trunk/libIGCM/ins_job

@@ -99 +99 @@
 [[ ! -f ${F_RCI} ]] && { print - "${F_RCI} unreachable"; exit 3; }
 #-
-# Host Name
-#-
-x_t=$(${d_n}/w_i_h) 2>/dev/null;
-{ [[ ${?} != 0 ]] && \
-   { print - "\nw_i_h or uname unreachable\n" 1>&2; exit 1; }; } || \
-  [[ ${x_t} = "Unknown" ]] && \
-   { print - "\nLocal_Host not supported\n" 1>&2; exit 1; };
-#-
-W_W=$(sed -n -e "s/^#-Q-  *\([^ ]*\).*$/\1/p" ${F_JOB} | \
-       sort -u | sed -e "/${x_t}/!d");
-[[ '\?'"${W_W}" != '\?'${x_t} ]] && \
-  {
-   print - "\nHost  "${x_t}"  not supported" 1>&2;
-   print - "'default' will be used" 1>&2;
-   x_t='default'
-  }
-#-
-[[ ${x_v} = 'verbose' ]] && \
- {
-  print - "";
-  print - '--- Host        : '${x_t};
-  print - '--- modipsl     : '${F_MOD};
-  print - '--- libIGCM     : '${libIGCM};
-  print - '--- basic job   : '${F_JOB};
-  print - '--- basic card  : '${F_RCI};
- }
-#-
-[[ ${x_v} = 'verbose' ]] && print - "\nInstallation of jobs for '${x_t}'";
-#-
 # Accessing to functions (without stack)
 #-
@@ -141 +112 @@
 fi
 
+#-
+[[ ${x_v} = 'verbose' ]] && \
+ {
+  print - "";
+  print - '--- Host        : '${SYSTEM};
+  print - '--- modipsl     : '${F_MOD};
+  print - '--- libIGCM     : '${libIGCM};
+  print - '--- basic job   : '${F_JOB};
+  print - '--- basic card  : '${F_RCI};
+ }
+#-
+[[ ${x_v} = 'verbose' ]] && print - "\nInstallation of jobs for '${SYSTEM}'";
+#-
+
 NbErr=0
 
@@ -147 +132 @@
 #-
 if ( ! ${x_p} ) ; then
-  if [ X"${x_t}" == "Xcurie" ] ; then
+  if [ X"${SYSTEM}" == "Xcurie" ] ; then
     ProjectID=$( ccc_myproject | gawk '{ if ( $3 ~ /^project$/ && $4 !~ /^tgcc/ ) { print $4 } }' | head -n 1 )
     ProjectID=${ProjectID:="gen2211"}
@@ -160 +145 @@
   fi
 else
-  if [ X"${x_t}" != "Xcurie" ] ; then
-    print - "\nOption -p invalid with this host (${x_t}): it will be ignored" 1>&2;
+  if [ X"${SYSTEM}" != "Xcurie" ] ; then
+    print - "\nOption -p invalid with this host (${SYSTEM}): it will be ignored" 1>&2;
   fi
 fi
@@ -168 +153 @@
 # Define the pattern string to substitute
 #-
-W_P='#-Q- '; W_W=${W_P}${x_t};
+W_P='#-Q- '; W_W=${W_P}${SYSTEM};
 #-
 # Extract list of 'config.card' files
@@ -310 +295 @@
 # set default_project in libIGCM_sys_curie.ksh too.
 #-
-if [ X"${x_t}" == "Xcurie" ] ; then
+if [ X"${SYSTEM}" == "Xcurie" ] ; then
   i=${libIGCM}/libIGCM_sys/libIGCM_sys_curie.ksh
   sed -i -e "s/::default_project::/${ProjectID}/" ${i}

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -54 +54 @@
         [ ! X${TaskType} = Xchecking ] && echo "sys source ada Intel X-64 lib."
         CENTER=IDRIS
+        SYSTEM=ada
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_ada.ksh;;
     curie*)
         [ ! X${TaskType} = Xchecking ] && echo "sys source curie Intel X-64 lib."
         CENTER=TGCC
+        SYSTEM=curie
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_curie.ksh;;
     airain*)
         [ ! X${TaskType} = Xchecking ] && echo "sys source airain Intel X-64 lib."
         CENTER=TGCC
+        SYSTEM=curie
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_curie.ksh;;
     asterix*|obelix*)
         [ ! X${TaskType} = Xchecking ] && echo "sys source obelix or asterix lib."
         CENTER=LSCE
+        SYSTEM=lxiv8
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_obelix.ksh;;
     iitm*)
         [ ! X${TaskType} = Xchecking ] && echo "sys source iitm lib."
         CENTER=IITM
+        SYSTEM=iitm
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_iitm.ksh;;
     *)
         [ ! X${TaskType} = Xchecking ] && echo "sys source default lib."
         CENTER=DEFAULT
+        SYSTEM=default
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_default.ksh;;
 esac