Changeset 1180 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

Timestamp:

03/30/15 17:18:46 (9 years ago)

Author:

sdipsl

Message:

house keeping in libIGCM_sys (third pass). Will ease #248 and #251

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh (modified) (6 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -83 +83 @@
 # ie storage filesystem
 typeset -r STOREHOST=ergon
-typeset -r REMOTE_RSYNC=/u/rech/ces/rces452/RSYNC/bin/rsync
+typeset -r REMOTE_RSYNC=/usr/bin/rsync
 
 #====================================================
-# Set environment tools (ferret, nco, cdo)
+# Set environment tools (ferret, nco, cdo, rebuild, ...)
 #====================================================
 source /smplocal/pub/Modules/default/init/ksh
@@ -136 +136 @@
 
 #====================================================
-#- set PackDefault true on ada
+#- set PackDefault to true on ada
 PackDefault=true
 
@@ -951 +951 @@
     fi
   fi
-
   IGCM_debug_PopStack "IGCM_sys_Mv"
 }
@@ -1343 +1342 @@
       i=0
       while [ $i -lt $NB_ESSAI ] ; do
-        # USUAL WAY
-        \cp $1 $2 > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
-        status=$?
+        if [ $( stat -c %d $1 ) -ne $( stat -c %d $( dirname $2 ) ) ] ; then
+          # USUAL WAY
+          \cp $1 $2 > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
+          status=$?
+        else
+          # NOT SO USUAL WAY
+          \mv $1 $2 > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 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}"
@@ -1995 +2000 @@
     fi
 
-  else # Only one executable. (SPMD mode).
+  # Only one executable (SPMD mode).
+  else
 
     for comp in ${config_ListOfComponents[*]} ; do
@@ -2092 +2098 @@
 
   eval ${3}=${ID}
-
   IGCM_debug_PopStack "IGCM_sys_GetJobID"
 }