Changeset 521 for branches/libIGCM_MPI_OpenMP/libIGCM_sys/libIGCM_sys_titane.ksh

Timestamp:

11/22/11 19:03:33 (13 years ago)

Author:

sdipsl

Message:

Dont exit during dmget error (can be ignore most of the time in fact). Stop later if the cp commands fails.
Homogenize commands between titane, cesium and mercure scalaire.

File:

• branches/libIGCM_MPI_OpenMP/libIGCM_sys/libIGCM_sys_titane.ksh (modified) (3 diffs)

branches/libIGCM_MPI_OpenMP/libIGCM_sys/libIGCM_sys_titane.ksh

@@ -928 +928 @@
     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
+#       if [ ! -d ${1} ] ; then
+#           echo "WARNING : IGCM_sys_Get_Dir ${1} DOES NOT EXIST ."
+#           IGCM_debug_PopStack "IGCM_sys_Get_Dir"
+#           return
+#       fi
 
         typeset RET
@@ -940 +940 @@
         #
         #USUAL WAY
+        # add dmget (to demigrate all offline files) to reduce time of this command :
+        dmget $1/*
         \cp -r $1 $2 > out_rsync 2>&1
         RET=$?
@@ -1163 +1165 @@
             echo "IGCM_sys_Get, ERROR : regular file ${dm_liste[0]} DOES NOT EXIST ."
             IGCM_debug_Exit "IGCM_sys_Get"
-            IGCM_debug_PopStack "IGCM_sys_Get"
-            return
-        fi
-
-#       dmget ${dm_liste[*]} > out_rsync 2>&1
-#       RET=$?
-#       if [ ${RET} -gt 0 ] ; then
-#           echo "IGCM_sys_Get : demigration error."
-#           cat out_rsync
-#           IGCM_debug_Exit "IGCM_sys_Get"
-#       fi
+        fi
+
+        dmget ${dm_liste[*]} > out_rsync 2>&1
+        RET=$?
+
+        if [ ${RET} -gt 0 ] ; then
+            echo "WARNING IGCM_sys_Get : demigration error."
+            cat out_rsync
+            echo "WARNING IGCM_sys_Get : will stop later if the cp fails."
+        fi
+
+        #if [ ${RET} -gt 0 ] ; then
+        #    if [ ! "X$( grep "Lost dmusrcmd connection" out_rsync )" = "X" ] ; then
+        #       cat out_rsync
+        #       echo "WARNING IGCM_sys_Get : Lost dmusrcmd connection : "
+        #       sleep 30
+        #       echo "We try another time"
+        #       dmget ${dm_liste[*]} > out_rsync 2>&1
+        #       RET=$?
+        #       if [ ${RET} -gt 0 ] ; then
+        #           echo "ERROR IGCM_sys_Get : again demigration error :"
+        #           cat out_rsync
+        #           IGCM_debug_Exit "IGCM_sys_Get"
+        #       fi
+        #    else
+        #       echo "ERROR IGCM_sys_Get : demigration error :"
+        #       cat out_rsync
+        #       IGCM_debug_Exit "IGCM_sys_Get"
+        #    fi
+        #fi
 
         #USUAL WAY