Changeset 358 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

Timestamp:

09/30/10 17:09:28 (14 years ago)

Author:

sdipsl

Message:

• bug fix in TimeSeries_Checker with uninitialized variable
• remove workaround due to this bug
• on CCRT post-processing machine: put_Out will skip "cp" if file already exist AND are identical, will OVERWRITE otherwise! Ease the rebuild life a lot :-)
• umask set to 0022 by default for all machine. umask is 0027 at CCRT by default
• add a comment in AA_job

File:

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

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -817 +817 @@
             fi
         fi
-        #
-        # USUAL WAY
-        \cp $1 $2 > out_rsync 2>&1
-        RET=$?
+
+        exist=false
+        if [ -f $2 ] ; then
+            IGCM_debug_Print 1 "$2 already exist"
+            dmget $2
+            exist=true
+            if [ ! X$( diff $1 $2 ) = X ] ; then
+                IGCM_debug_Print 2 "$1 and $2 are the same file, we skip the copy"
+                skip=true
+            else
+                IGCM_debug_Print 2 "$1 and $2 are not the same file, we force the copy"
+                skip=false
+            fi
+        fi
+        # 
+        if ( [ X${exist} = Xtrue] && [ X${skip} = Xfalse ] ) ; then
+            IGCM_sys_Chmod u+w $2
+        fi
+        # USUAL WAY
+        if ( [ X${skip} = Xfalse ] ) ; then
+            \cp $1 $2 > out_rsync 2>&1
+            RET=$?
+            if [ ${RET} -gt 0 ] ; then
+                echo "IGCM_sys_Put_Out : error."
+                cat out_rsync
+                IGCM_debug_Exit "IGCM_sys_Put_Out"
+            else
+                rm out_rsync
+            fi
+        fi
 
 #       #RSYNC WITH NETWORK RSH CALL
@@ -836 +862 @@
 #       (( RET=RET+$? ))
 
-        if [ ${RET} -gt 0 ] ; then
-            echo "IGCM_sys_Put_Out : error."
-            cat out_rsync
-            IGCM_debug_Exit "IGCM_sys_Put_Out"
-        else
-            rm out_rsync
-        fi
     else
         ( ${DEBUG_debug} ) && echo "DRYRUN mode = " $DRYRUN >> stack