Changeset 343 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_platine.ksh

Timestamp:

09/09/10 10:49:23 (14 years ago)

Author:

mmaipsl

Message:

Suppress out_rsync anoying file if systemfunction is OK.
Correct some little bugs.
Add two DODS functions IGCM_Dods_Rm and IGCM_Dods_Cp on post-treatment systems.

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_platine.ksh (modified) (14 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_platine.ksh

@@ -165 +165 @@
 #D-
 function IGCM_sys_RshMaster {
-    #set -vx
     IGCM_debug_PushStack "IGCM_sys_RshMaster" $@
     /bin/ksh <<-EOF
@@ -415 +414 @@
 function IGCM_sys_TestFileArchive {
     IGCM_debug_PushStack "IGCM_sys_TestFileArchive" $@
+    if ( $DEBUG_sys ) ; then
+        echo "IGCM_sys_TestFileArchive :" $@
+    fi
     typeset ExistFlag
     ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 )
@@ -662 +664 @@
         cat out_rsync
         IGCM_debug_Exit "IGCM_sys_Cp"
+     else
+         rm out_rsync
     fi
     IGCM_debug_PopStack "IGCM_sys_Cp"
@@ -687 +691 @@
         cat out_rsync
         IGCM_debug_Exit "IGCM_sys_Rm"
+    else
+        out_rsync
     fi
     IGCM_debug_PopStack "IGCM_sys_Rm"
@@ -729 +735 @@
             cat out_rsync
             IGCM_debug_Exit "IGCM_sys_Mv"
+        else
+            rm out_rsync
         fi
     else
@@ -767 +775 @@
             cat out_rsync
             IGCM_debug_Exit "IGCM_sys_Put_Dir"
+        else
+            rm out_rsync
         fi
     else
@@ -804 +814 @@
             cat out_rsync
             IGCM_debug_Exit "IGCM_sys_Get_Dir"
+        else
+            rm out_rsync
         fi
     else
@@ -893 +905 @@
             cat out_rsync
             IGCM_debug_Exit "IGCM_sys_Put_Rest"
+        else
+            rm out_rsync
         fi
     else
@@ -949 +963 @@
             cat out_rsync
             IGCM_debug_Exit "IGCM_sys_Put_Out"
+        else
+            rm out_rsync
         fi
     else
@@ -1047 +1063 @@
             cat out_rsync
             IGCM_debug_Exit "IGCM_sys_Get"
+        else
+            rm out_rsync
         fi
     else
@@ -1052 +1070 @@
     fi
     IGCM_debug_PopStack "IGCM_sys_Get"
+}
+
+#D-#==================================================
+#D-function IGCM_sys_Dods_Rm
+#D-* Purpose: DO NOTHING ! Put $(ARCHIVE) files on DODS internet protocole.
+#D-* Examples:
+#D-
+function IGCM_sys_Dods_Rm {
+    if ( $DEBUG_sys ) ; then
+        echo "IGCM_sys_Dods_Rm :" $@
+    fi
+    typeset RET
+    RET=0
+    if [ $DRYRUN = 0 ]; then
+        if [ ! -d /dmnfs/cont003/dods/public/${LOGIN}/${R_DODS}/${1} ] ; then
+            echo "WARNING : IGCM_sys_Dods_Rm /dmnfs/cont003/dods/public/${LOGIN}/${R_DODS}/${1} DOES NOT EXIST ."
+            echo "Nothing has been done."
+            return
+        fi
+        dods_rm public/${LOGIN}/${R_DODS}/${1} > out_dods_rm 2>&1
+        RET=$?
+        
+        if [ ${RET} -gt 0 ] ; then
+            echo "IGCM_sys_Put_Dods : error."
+            cat out_dods_rm
+            IGCM_debug_Exit "IGCM_sys_Dods_Rm"
+        else
+            rm out_dods_rm
+        fi
+    else
+        ( ${DEBUG_debug} ) && echo "DRYRUN mode = " $DRYRUN >> stack
+    fi
+    return $RET
+}
+
+
+#D-#==================================================
+#D-function IGCM_sys_Dods_Cp
+#D-* Purpose: Copy $(ARCHIVE) files on DODS internet protocole.
+#D-* Examples:
+#D-
+function IGCM_sys_Dods_Cp {
+    if ( $DEBUG_sys ) ; then
+        echo "IGCM_sys_Dods_Cp :" $@
+    fi
+    typeset RET
+    RET=0
+    if [ $DRYRUN = 0 ]; then
+        if [ ! -d ${R_SAVE}/${1} ] ; then
+            echo "WARNING : IGCM_sys_Dods_Cp ${R_SAVE}/${1} DOES NOT EXIST ."
+            echo "Nothing has been done."
+            return
+        fi
+        #
+        dods_cp ${1} public/${LOGIN}/${R_DODS} > out_dods_cp 2>&1
+        RET=$?
+        
+        if [ ${RET} -gt 0 ] ; then
+            echo "IGCM_sys_Dods_Cp : error."
+            cat out_dods_cp
+            IGCM_debug_Exit "IGCM_sys_Dods_Cp"
+        else
+            rm out_dods_cp
+        fi
+    else
+        ( ${DEBUG_debug} ) && echo "DRYRUN mode = " $DRYRUN >> stack
+    fi
+    return $RET
 }
 
@@ -1074 +1160 @@
         #
         cd ${R_SAVE}
-        dods_rm public/${LOGIN}/${R_DODS}/${1} > /dev/null 2>&1
-        dods_cp ${1} public/${LOGIN}/${R_DODS} > /dev/null 2>&1
+        IGCM_sys_Dods_Rm ${1}
+        IGCM_sys_Dods_Cp ${1}
         RET=0
 
@@ -1115 +1201 @@
     fi
     IGCM_debug_PopStack "IGCM_sys_FichArchive"
+}
+
+##############################################################
+# REBUILD OPERATOR
+
+function IGCM_sys_rebuild {
+    IGCM_debug_PushStack "IGCM_sys_rebuild" -- $@
+    if ( $DEBUG_sys ) ; then
+        echo "IGCM_sys_rebuild :" $@
+    fi
+    /home/cont003/p86ipsl/IA64/bin/rebuild -f -o $@
+    if [ $? -gt 0 ] ; then
+       echo "IGCM_sys_rebuild : erreur ${@}."
+       IGCM_debug_Exit "rebuild"
+    fi
+
+    IGCM_debug_PopStack "IGCM_sys_rebuild"
 }
 
@@ -1305 +1408 @@
 
 ##############################################################
-# REBUILD OPERATOR
-
-function IGCM_sys_rebuild {
-    IGCM_debug_PushStack "IGCM_sys_rebuild" -- $@
-    if ( $DEBUG_sys ) ; then
-        echo "IGCM_sys_rebuild :" $@
-    fi
-    /home/cont003/p86ipsl/IA64/bin/rebuild -f -o $@
-    if [ $? -gt 0 ] ; then
-       echo "IGCM_sys_rebuild : erreur ${@}."
-       IGCM_debug_Exit "rebuild"
-    fi
-
-    IGCM_debug_PopStack "IGCM_sys_rebuild"
+# CDO OPERATOR
+
+function IGCM_sys_cdo {
+    IGCM_debug_PushStack "IGCM_sys_cdo" -- $@
+
+    \cdo $@
+    if [ $? -gt 0 ] ; then
+       echo "IGCM_sys_cdo : erreur ${@}."
+#       IGCM_debug_Exit "cdo"
+    fi
+
+    IGCM_debug_PopStack "IGCM_sys_cdo"
 }