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

Timestamp:

11/22/10 12:44:59 (14 years ago)

Author:

sdipsl

Message:

• function IGCM_sys_Get_Master on cesium will try 10 times to scp files from master machine. Hopefully the last cesium consolidation
• function IGCM_config_Check will check chunck2D/3D consistency with TimeSeriesFrequency?.
• change the way the output from post-processing script was named. We will now have:

-rebuild_fromWorkdir.20051231.out
-create_ts.20051231.2D.out
-create_ts.20051231.3D.out
-atlas_PISCES.19991231.out
-create_ts.20051231.Chunck2D.ATM.POST_1D_histday.out
-create_ts.20051231.Chunck2D.OCE.POST_1D_grid_T.out

• remove modipsl headers from AA_SE_Checker, AA_TimeSeries_Checker, AA_move-and-rename
  • they check and submit job. They do not use resources and so there is no point to submit them
  • they will be rename shortly SE_Checker.ksh, TimeSeries_Checker.ksh, move-and-rename.ksh
• cosmetics

File:

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

trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

@@ -519 +519 @@
         echo "IGCM_sys_QsubPost :" $@
     fi
-    /usr/local/bin/ccc_msub -o ${POST_DIR}/$1.${PeriodDateEnd}.${TsTask}.${CompToRead}.${FlagToRead}.out -e ${POST_DIR}/$1.${PeriodDateEnd}.${TsTask}.${CompToRead}.${FlagToRead}.e.out -E "-v ${listVarEnv}" ${libIGCM}/$1.job
+    /usr/local/bin/ccc_msub -o ${POST_DIR}/${Script_Post_Output}.out -e ${POST_DIR}/${Script_Post_Output}.e.out -E "-v ${listVarEnv}" ${libIGCM}/$1.job
     if [ $? -gt 0 ] ; then
         echo "IGCM_sys_QsubPost : erreur " $@
@@ -849 +849 @@
     fi
     if [ $DRYRUN = 0 ]; then
+
+        typeset TEST NB_ESSAI DELAI status i
+        
         TEST=$( IGCM_sys_RshMaster [ -d $1 ] && echo 1 || echo 0 )
         if [ ${TEST} -ne 1 ] ; then
@@ -856 +859 @@
         fi
 
-        typeset RET
-        sleep 60
-
-        #USUAL WAY
-        scp -r ${MASTER}:$1 $2 > out_rsync 2>&1
-        RET=$?
-
-        if [ ${RET} -gt 0 ] ; then
+        # number of tentative
+        NB_ESSAI=10
+        # time delay between tentative
+        DELAI=30
+        #
+        sleep ${DELAI}
+        (( i = 0 ))
+        while [ $i -lt $NB_ESSAI ] ; do
+            #USUAL WAY
+            scp -r ${MASTER}:$1 $2 > out_rsync 2>&1
+            status=$?
+            if [ ${status} -gt 0 ]; then
+                IGCM_debug_Print 2 "IGCM_sys_Get_Master : scp failed ${i}/${NB_ESSAI}"
+                IGCM_debug_Print 2 "IGCM_sys_Get_Master : sleep ${DELAI} seconds and try again."
+                sleep $DELAI
+            else
+                break
+            fi
+            (( i = i + 1 ))
+        done
+
+        if [ ${status} -gt 0 ] ; then
             echo "IGCM_sys_Get_Master : error."
             cat out_rsync