Changeset 192 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

Timestamp:

11/03/09 18:44:21 (15 years ago)

Author:

sdipsl

Message:

• Cesium will post-process SX9 simulation
• Big clean in libIGCM_sys
• Testing only for now

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh (modified) (15 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

@@ -78 +78 @@
 typeset -r RSYNC=/usr/bin/rsync
 # RSYNC_opt args to rsync
-typeset -r RSYNC_opt="-Lt -v"
-# RSYNC_opt args to "remote rsync"
+typeset -r RSYNC_opt="-va"
 # ie storage filesystem
-typeset -r RHOST=fer.ccc.cea.fr
-typeset -r REMOTE_RSYNC=/dmnfs/cont003/p86denv/RSYNC/bin/rsync
+typeset -r RHOST=cesium
 
 #====================================================
@@ -142 +140 @@
 
 #====================================================
-#- libIGCM_POST
-typeset -r libIGCM_POST=${libIGCM}
-
-#====================================================
 #- IN
 typeset -r R_IN=${R_IN:=/dmnfs/cont003/p86ipsl/IGCM}
@@ -171 +165 @@
 #D-#==================================================
 #D-function IGCM_sys_RshMaster
-#D-* Purpose: Master rsh command
+#D-* Purpose: Just a fake command to wrapp
+#D-           IGCM_card call in post-treatment
+#D-           Ulam do not see brodie filesystem
+#D-           Cesium do not see all mercure filesystem
+#D-           That's why we need this hack.
 #D-* Examples:
 #D-
@@ -177 +175 @@
     #set -vx
     IGCM_debug_PushStack "IGCM_sys_RshMaster" $@
-    /bin/ksh <<-EOF
-    export libIGCM=${libIGCM}
+    ssh ${MASTER} exec /bin/ksh <<-EOF
+    export libIGCM=${libIGCM_SX}
     export DEBUG_debug=${DEBUG_debug}
-    . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh
-    . ${libIGCM}/libIGCM_card/libIGCM_card.ksh
+    . ${libIGCM_SX}/libIGCM_debug/libIGCM_debug.ksh
+    . ${libIGCM_SX}/libIGCM_card/libIGCM_card.ksh
     ${@}
 EOF
@@ -269 +267 @@
         fi
     fi
-#    vérification ?? :
-#    if [ ! -d ${1} ] ; then
-#       echo "IGCM_sys_MkdirArchive : erreur."
-#       IGCM_debug_Exit "IGCM_sys_MkdirArchive"
-#    fi
     IGCM_debug_PopStack "IGCM_sys_MkdirArchive"
 }
@@ -295 +288 @@
         fi
     fi
-    # vérification ?? :
-    if [ ! -d ${1} ] ; then
-        echo "IGCM_sys_MkdirWork : erreur."
-        IGCM_debug_Exit "IGCM_sys_MkdirWork"
-    fi
     IGCM_debug_PopStack "IGCM_sys_MkdirWork"
 }
-#IGCM_sys_MkdirWork ${RUN_DIR_PATH}
-#echo "RUN_DIR_PATH ${RUN_DIR_PATH} ok."
 
 #D-#==================================================
@@ -492 +478 @@
         echo "IGCM_sys_QsubPost :" $@
     fi
-    /opt/torque/bin/qsub -o ${POST_DIR}/$1.${PeriodDateEnd}.out ${libIGCM_POST}/$1.job -v ${listVarEnv}
+    /usr/local/bin/ccc_msub -o ${POST_DIR}/$1.${PeriodDateEnd}.${TsTask}.${CompToRead}.${FlagToRead}.out -E "-v ${listVarEnv}" ${libIGCM}/$1.job
     if [ $? -gt 0 ] ; then
         echo "IGCM_sys_QsubPost : erreur " $@
@@ -656 +642 @@
     \rm $@ >> out_rsync 2>&1
     RET=$?
-    
+
     if [ ${RET} -gt 0 ] ; then
         echo "IGCM_sys_Rm : error."
@@ -744 +730 @@
     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
@@ -781 +767 @@
     fi
     if [ $DRYRUN = 0 ]; then
-        if [ ! -d ${1} ] ; then
-            echo "WARNING : IGCM_sys_Get_Master ${1} DOES NOT EXIST ."
+        TEST=$( IGCM_sys_RshMaster [ -d $1 ] && echo 1 || echo 0 )
+        if [ ${TEST} -ne 1 ] ; then
+            echo "WARNING : IGCM_sys_Get_Master ${1} DOES NOT EXIST ON ${MASTER}."
             IGCM_debug_PopStack "IGCM_sys_Get_Master"
             return
@@ -791 +778 @@
 
         #USUAL WAY
-        \cp -r $1 $2 > out_rsync 2>&1
+        scp -r ${MASTER}:$1 $2 > out_rsync 2>&1
         RET=$?
 
@@ -835 +822 @@
 
 #       #RSYNC WITH NETWORK RSH CALL
-#       echo ${RSYNC_FRONT} ${RSYNC_opt} --rsync-path=${REMOTE_RSYNC} -e rsh ${RUN_DIR}/$1 ${RHOST}:${2} > out_rsync 2>&1
-#       ${RSYNC_FRONT} ${RSYNC_opt} --rsync-path=${REMOTE_RSYNC} -e rsh ${RUN_DIR}/$1 ${RHOST}:${2} >> out_rsync 2>&1
+#       echo ${RSYNC} ${RSYNC_opt} -e ssh ${RUN_DIR}/$1 ${RHOST}:${2} > out_rsync 2>&1
+#       ${RSYNC} ${RSYNC_opt} -e ssh ${RUN_DIR}/$1 ${RHOST}:${2} >> out_rsync 2>&1
 
 #       #RSYNC WITH NFS USE
-#       echo ${RSYNC_FRONT} ${RSYNC_opt} ${RUN_DIR}/$1 ${2} > out_rsync 2>&1
-#       ${RSYNC_FRONT} ${RSYNC_opt} ${RUN_DIR}/$1 ${2} >> out_rsync 2>&1
+#       echo ${RSYNC} ${RSYNC_opt} ${RUN_DIR}/$1 ${2} > out_rsync 2>&1
+#       ${RSYNC} ${RSYNC_opt} ${RUN_DIR}/$1 ${2} >> out_rsync 2>&1
 
 #       RET=$?
@@ -933 +920 @@
 
 #       #RSYNC WITH NETWORK RSH CALL
-#       echo ${RSYNC_FRONT} ${RSYNC_opt} --rsync-path=${REMOTE_RSYNC} -e rsh ${RHOST}:"${dm_liste}" ${RHOST}:${RUN_DIR}/${DEST} > out_rsync 2>&1
-#       ${RSYNC_FRONT} ${RSYNC_opt} --rsync-path=${REMOTE_RSYNC} -e rsh ${RHOST}:"${dm_liste}" ${RHOST}:${RUN_DIR}/${DEST} >> out_rsync 2>&1
+#       echo ${RSYNC} ${RSYNC_opt} -e ssh ${RHOST}:"${dm_liste}" ${RHOST}:${RUN_DIR}/${DEST} > out_rsync 2>&1
+#       ${RSYNC} ${RSYNC_opt} -e ssh ${RHOST}:"${dm_liste}" ${RHOST}:${RUN_DIR}/${DEST} >> out_rsync 2>&1
 
 #       #RSYNC WITH NFS USE
-#       echo ${RSYNC_FRONT} ${RSYNC_opt} ${dm_liste} ${RUN_DIR}/${DEST} > out_rsync 2>&1
-#       ${RSYNC_FRONT} ${RSYNC_opt} ${dm_liste} ${RUN_DIR}/${DEST} >> out_rsync 2>&1
+#       echo ${RSYNC} ${RSYNC_opt} ${dm_liste} ${RUN_DIR}/${DEST} > out_rsync 2>&1
+#       ${RSYNC} ${RSYNC_opt} ${dm_liste} ${RUN_DIR}/${DEST} >> out_rsync 2>&1
 
 #       RET=$?
@@ -946 +933 @@
 #       (( RET=RET+$? ))
 
-        if [ ${RET} -gt 0 ] ; then
-            echo "IGCM_sys_Get : copy error."
-            cat out_rsync
-            IGCM_debug_Exit "IGCM_sys_Get"
-        fi
     else
         ( ${DEBUG_debug} ) && echo "DRYRUN mode = " $DRYRUN >> stack
@@ -995 +977 @@
 }
 
-############################################################## A REVOIR !!
-
-#D-#==================================================
-#D-function IGCM_sys_Rapatrie
-#D-* Purpose: Rapatrie
-#D-* Examples:
-#D-
-function IGCM_sys_Rapatrie {
-    IGCM_debug_PushStack "IGCM_sys_Rapatrie" $@
-    if ( $DEBUG_sys ) ; then
-        echo "IGCM_sys_Rapatrie :" $@
-    fi
-
-    typeset RET=0
-
-    IGCM_sys_Get ${R_STOCKAGE}/$2 $1 ; 
-    let $(( RET=RET+$? ))
-    IGCM_sys_Cd $1 ; 
-    let $(( RET=RET+$? ))
-    IGCM_sys_UnTar $2 ; 
-    let $(( RET=RET+$? ))
-
-    if [ ${RET} -gt 0 ] ; then
-        echo "IGCM_sys_Rapatrie : erreur."
-        IGCM_debug_Exit "IGCM_sys_Rapatrie"
-    fi
-    IGCM_debug_PopStack "IGCM_sys_Rapatrie"
-}
-
 ############################################################## A FINIR !!