Changeset 792 for trunk/libIGCM

Timestamp:

02/13/13 12:29:15 (11 years ago)

Author:

sdipsl

Message:

Bugfixes ada.

• R_FIG was wrong
• Some adaptation for the test case

File:

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

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -142 +142 @@
 #====================================================
 #- R_FIG (hosting figures : monitoring and atlas, and/or small files)
-typeset R_FIG=${STORAGE}/IGCM_OUT
+typeset R_FIG=${ARCHIVE}/IGCM_OUT
 
 #====================================================
@@ -189 +189 @@
   IGCM_debug_PushStack "IGCM_sys_ChangeArchive"
 
-  R_OUT=${SCRATCHDIR}/IGCM_OUT
-  R_FIG=${SCRATCHDIR}/IGCM_OUT
+  R_OUT=${WORKDIR}/IGCM_OUT
+  R_FIG=${WORKDIR}/IGCM_OUT
 
   IGCM_debug_Print 1 "R_OUT   has been redefined = ${R_OUT}"
@@ -920 +920 @@
     #IGCM_sys_TestDirArchive $( dirname $2 )
     #
-    #USUAL WAY
-    rcp -r $1 ${STOREHOST}:$2 > out_rsync 2>&1
-    status=$?
-
-    if [ ${status} -gt 0 ] ; then
-      echo "IGCM_sys_Put_Dir : error code ${status}"
+    #Command depends on targeted file system
+    IGCM_sys_IsFileArchived $1
+    if [ $? = 0 ] ; then
+      \rcp -r $1 ${STOREHOST}:$2 > out_rsync 2>&1
+      status=$?
+    else
+      \cp -r $1 $2 > out_rsync 2>&1 
+      status=$?
+    fi
+
+    if [ ${status} -gt 0 ] ; then
+      IGCM_debug_Print 2 "IGCM_sys_Put_Dir : rcp or cp failed error code ${status}"
       cat out_rsync
       IGCM_debug_Exit "IGCM_sys_Put_Dir"
@@ -969 +975 @@
     i=0
     while [ $i -lt $NB_ESSAI ] ; do
-      rcp -rp ${STOREHOST}:$1 $2 > out_rsync 2>&1
+      \rcp -rp ${STOREHOST}:$1 $2 > out_rsync 2>&1
       status=$?
       if [ ${status} -gt 0 ]; then
-        IGCM_debug_Print 2 "IGCM_sys_Get_Dir : cp failed error code ${status} ${i}/${NB_ESSAI}"
+        IGCM_debug_Print 2 "IGCM_sys_Get_Dir : rcp failed error code ${status} ${i}/${NB_ESSAI}"
         IGCM_debug_Print 2 "IGCM_sys_Get_Dir : sleep ${DELAI} seconds and try again."
         sleep $DELAI
@@ -1076 +1082 @@
     #IGCM_sys_MkdirArchive $( dirname $2 )
     #
-    #USUAL WAY
-    mfput $1 $2 > out_rsync 2>&1
-    status=$?
+    #Command depends on targeted file system
+    IGCM_sys_IsFileArchived $1
+    if [ $? = 0 ] ; then
+      mfput $1 $2 > out_rsync 2>&1
+      status=$?
+    else
+      \cp $1 $2 > out_rsync 2>&1
+      status=$?
+    fi
 
 #       #RSYNC WITH NETWORK RSH CALL
@@ -1095 +1107 @@
 
     if [ ${status} -gt 0 ] ; then
-      echo "IGCM_sys_Put_Rest : mfput failed error code ${status}"
+      echo "IGCM_sys_Put_Rest : mfput or cp failed error code ${status}"
       cat out_rsync
       IGCM_debug_Exit "IGCM_sys_Put_Rest"
@@ -1180 +1192 @@
     #IGCM_sys_MkdirArchive $( dirname $2 )
     #
-    #USUAL WAY
-    mfput $1 $2 > out_rsync 2>&1
-    status=$?
+    #Command depends on targeted file system
+    IGCM_sys_IsFileArchived $1
+    if [ $? = 0 ] ; then
+      mfput $1 $2 > out_rsync 2>&1
+      status=$?
+    else
+      \cp $1 $2 > out_rsync 2>&1
+      status=$?
+    fi
 
 #       #RSYNC WITH NETWORK RSH CALL
@@ -1199 +1217 @@
 
     if [ ${status} -gt 0 ] ; then
-      echo "IGCM_sys_Put_Out : error."
+      IGCM_debug_Print 2 "IGCM_sys_Put_Out : mfput or cp failed error code ${status}"
       cat out_rsync
       IGCM_debug_Exit "IGCM_sys_Put_Out"
@@ -1333 +1351 @@
     fi
 
-    #USUAL WAY
-    mfget ${dm_liste[*]} ${DEST} > out_rsync 2>&1
-    status=$?
+    #Command depends on targeted file system
+    IGCM_sys_IsFileArchived ${dm_liste[0]}
+    if [ $? = 0 ] ; then
+      mfget ${dm_liste[*]} ${DEST} > out_rsync 2>&1
+      status=$?
+    else
+      \cp ${dm_liste[*]} ${DEST} > out_rsync 2>&1
+      status=$?
+    fi
 
 #       #RSYNC WITH NETWORK RSH CALL
@@ -1352 +1376 @@
 
     if [ ${status} -gt 0 ] ; then
-      echo "IGCM_sys_Get : copy error."
+      IGCM_debug_Print 2 "IGCM_sys_Get : mfget or cp failed error code ${status}"
       cat out_rsync
       IGCM_debug_Exit "IGCM_sys_Get"