Changeset 1178 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

Timestamp:

03/30/15 14:17:55 (9 years ago)

Author:

sdipsl

Message:

house keeping in libIGCM_sys (first pass). Will ease #248

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh (modified) (15 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

@@ -213 +213 @@
 function IGCM_sys_RshMaster {
   IGCM_debug_PushStack "IGCM_sys_RshMaster" $@
-  /bin/ksh  <<-EOF
+  /bin/ksh <<-EOF
     export libIGCM=${libIGCM}
     export DEBUG_debug=${DEBUG_debug}
@@ -246 +246 @@
 
 #D-#==================================================
+#D-function IGCM_sys_RshArchive_NoError
+#D-* Purpose: Archive rsh command, without error
+#D-*          used only in monitoring.job
+#D-* Examples:
+#D-
+function IGCM_sys_RshArchive_NoError {
+  IGCM_debug_PushStack "IGCM_sys_RshArchive_NoError" $@
+  /bin/ksh <<-EOF
+    ${@} 2> \dev\null
+EOF
+  IGCM_debug_PopStack "IGCM_sys_RshArchive_NoError"
+}
+
+#D-#==================================================
 #D-function IGCM_sys_RshPost
 #D-* Purpose: Post-process rsh command
@@ -255 +269 @@
     echo "IGCM_sys_RshPost :" $@
   fi
-
   # keep standard input (stdin) for the loop onto temporary file
-  cat >tmp_IGCM_sys_RshPost_$$
-
-# ============ FRONTEND START ============ #
-
-  /bin/ksh <tmp_IGCM_sys_RshPost_$$
+  cat >/tmp/tmp_IGCM_sys_RshPost_$$_${LOGNAME}
+
+  /bin/ksh </tmp/tmp_IGCM_sys_RshPost_$$_${LOGNAME}
   if [ $? -gt 0 ] ; then
     echo "IGCM_sys_RshPost : erreur."
@@ -267 +278 @@
   fi
   # delete temporary file
-  \rm tmp_IGCM_sys_RshPost_$$
+  \rm /tmp/tmp_IGCM_sys_RshPost_$$_${LOGNAME}
   IGCM_debug_PopStack "IGCM_sys_RshPost"
 }
@@ -299 +310 @@
 
   if [ ! -z ${config_UserChoices_MailName} ] ; then
-    mailx -s "${config_UserChoices_JobName} ${status}" ${config_UserChoices_MailName} < mail.txt
+    mailx -s "${config_UserChoices_JobName} ${status}" ${config_UserChoices_MailName} <  mail.txt
   elif [ -f ~/.forward ] ; then
     mailx -s "${config_UserChoices_JobName} ${status}" $( cat ~/.forward ) < mail.txt
@@ -347 +358 @@
   #- creation de repertoire sur le serveur fichier
   if [ ! -d ${1} ]; then
-    mkdir -p $1
+    \mkdir -p $1
     status=$?
 
@@ -930 +941 @@
   fi
   if [ $DRYRUN = 0 ]; then
-    if [ ! -d ${1} ] ; then
-      echo "WARNING : IGCM_sys_Get_Dir ${1} DOES NOT EXIST ."
-      IGCM_debug_PopStack "IGCM_sys_Get_Dir"
-      return
-    fi
-
     typeset status
 
@@ -1026 +1031 @@
     typeset status
     #
-    if [ X${JobType} = XRUN ] ; then
-      IGCM_sys_Chmod 444 ${1}
-    fi
-    #
-    # Only if we use rsync
-    #IGCM_sys_MkdirArchive $( dirname $2 )
-    #
-    #USUAL WAY
-    \cp $1 $2 > /tmp/out_command_${LOGIN}.$$ 2>&1
+    # USUAL WAY
+    \cp $1 $2 > /tmp/out_command.$$ 2>&1
     status=$?
 
@@ -1053 +1051 @@
     if [ ${status} -gt 0 ] ; then
       echo "IGCM_sys_Put_Rest : cp failed error code ${status}"
-      cat /tmp/out_command_${LOGIN}.$$
+      [ -f ${1} ] && ls -l ${1}
+      [ -f ${2} ] && ls -l ${2}
+      [ -f ${2}/${1} ] && ls -l ${2}/${1}
+      cat /tmp/out_command.$$
       IGCM_debug_Exit "IGCM_sys_Put_Rest"
     else
-      \rm /tmp/out_command_${LOGIN}.$$
+
+      if [ X${JobType} = XRUN ] ; then
+        [ -f ${2} ] && IGCM_sys_Chmod 444 ${2}
+        [ -f ${2}/${1} ] && IGCM_sys_Chmod 444 ${2}/${1}
+      fi
+
+      \rm /tmp/out_command.$$
     fi
   fi
@@ -1080 +1087 @@
 
     typeset status
-    #
-    if [ X${JobType} = XRUN ] ; then
-      IGCM_sys_Chmod 444 ${1}
-    fi
-
     #
     # USUAL WAY
@@ -1097 +1099 @@
       IGCM_debug_Exit "IGCM_sys_PutBuffer_Rest"
     else
-      \rm /tmp/out_command_${LOGIN}.$$
+
+      if [ X${JobType} = XRUN ] ; then
+        [ -f ${2} ] && IGCM_sys_Chmod 444 ${2}
+        [ -f ${2}/${1} ] && IGCM_sys_Chmod 444 ${2}/${1}
+      fi
+
+      \rm /tmp/out_command.$$
     fi
   fi
@@ -1213 +1221 @@
       i=0
       while [ $i -lt $NB_ESSAI ] ; do
-        # USUAL WAY
-        \cp $1 $2 > /tmp/out_command_${LOGIN}.$$ 2>&1
-        status=$?
+        if [ $( stat -c %d $1 ) -ne $( stat -c %d $( dirname $2 ) ) ] ; then
+          # USUAL WAY
+          \cp $1 $2 > /tmp/out_command.$$ 2>&1
+          status=$?
+        else
+          # NOT SO USUAL WAY
+          \mv $1 $2 > /tmp/out_command.$$ 2>&1
+          status=$?
+        fi
         if [ ${status} -gt 0 ]; then
           IGCM_debug_Print 2 "IGCM_sys_PutBuffer_Out : cp failed error code ${status} ${i}/${NB_ESSAI}"
@@ -1233 +1247 @@
       [ -f ${2} ] && ls -l ${2}
       [ -f ${2}/${1} ] && ls -l ${2}/${1}
-      cat /tmp/out_command_${LOGIN}.$$
+      cat /tmp/out_command.$$
       IGCM_debug_Exit "IGCM_sys_PutBuffer_Out"
     else
@@ -1387 +1401 @@
     echo "IGCM_sys_GetDate_FichWork :" $@
   fi
+
+  if [ $# -ge 3 ] ; then
+    mode=$3
+    TimeStyle=$4
+  else
+    mode="default"
+    TimeStyle="%Y%m%d%H%M%S"
+  fi
+
   typeset dateF
-  set +A dateF -- $( ls -l --full-time --time-style='+%Y%m%d%H%M%S' ${1} )
-  eval ${2}=${dateF[5]}
+  set +A dateF -- $( ls -l --full-time --time-style=+"${TimeStyle}" ${1} )
+
+  case $mode in
+    "default")
+      eval ${2}=${dateF[5]}
+      ;;
+    "SplitFields")
+      eval ${2}="${dateF[5]}\ ${dateF[6]}"
+      ;;
+  esac
+
 
   # donne la date filesys d'un fichier sur la machine work
@@ -1577 +1609 @@
   #  0  118 110.0000000000000   87.46478873239437
   #  1  40  4.999999999999995   51.97183098591550
+
 #  typeset iStation iProc list_opt file_in file_out prefix_invert
 #  typeset -Z4 j4