Changeset 387 for trunk/libIGCM/libIGCM_post

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_post/libIGCM_post.ksh (modified) (15 diffs)

trunk/libIGCM/libIGCM_post/libIGCM_post.ksh

@@ -121 +121 @@
 
 
-        listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,POST_DIR,MASTER,RebuildFrequency,DateBegin,PeriodDateEnd,StandAlone,CompletedFlag,TsTask,CompToRead,FlagToRead,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_SBG"
+        listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,POST_DIR,MASTER,RebuildFrequency,DateBegin,PeriodDateEnd,StandAlone,CompletedFlag,TsTask,CompToRead,FlagToRead,NameToRead,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_SBG"
         #
         jLoop=${#ListDimension[*]}
@@ -135 +135 @@
                 if [ X${Dimension} = X ] ; then
                     TsTask="empty"
+                    Script_Post_Output=create_ts.${PeriodDateEnd}
                 else
                     TsTask=${Dimension}
+                    Script_Post_Output=create_ts.${PeriodDateEnd}.${TsTask}
                 fi
                 #
@@ -162 +164 @@
                         echo "export RESOL_SBG=${RESOL_SBG}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                         echo "export listVarEnv=${listVarEnv}              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                        echo "export Script_Post_Output=${Script_Post_Output}" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                         echo "IGCM_sys_MkdirWork ${POST_DIR}               " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                         echo "IGCM_debug_Verif_Exit                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
@@ -190 +193 @@
                     export RESOL_SBG=${RESOL_SBG}
                     export listVarEnv=${listVarEnv}
+                    export Script_Post_Output=${Script_Post_Output}
                     . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
                     . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh
@@ -214 +218 @@
                     CompToRead=$( eval echo \${CHUNCK${Dimension}_COMP[\${i}]} )
                     FlagToRead=$( eval echo \${CHUNCK${Dimension}_FLAG[\${i}]} )
+                    NameToRead=$( eval echo \${CHUNCK${Dimension}_NAME[\${i}]} )
                     ChunckSize=$( eval echo \${CHUNCK${Dimension}_SIZE[\${i}]} )
                     # Chunck Length (mandatory in Year)
@@ -229 +234 @@
                     # Starting date of the current chunck
                     ChunckTsDateBegin=${ChunckTsYearBegin}${MonthBegin}01
+                    #
+                    Script_Post_Output=create_ts.${PeriodDateEnd}.${TsTask}.${CompToRead}.${NameToRead}
                     #
                     if [ ${RebuildFrequency} = true ] && [ ${DRYRUN} -le 1 ] ; then
@@ -248 +255 @@
                             echo "export CompToRead=${CompToRead}              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "export FlagToRead=${FlagToRead}              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                            echo "export NameToRead=${NameToRead}              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "export RESOL_ATM=${RESOL_ATM}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "export RESOL_OCE=${RESOL_OCE}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
@@ -255 +263 @@
                             echo "export RESOL_SBG=${RESOL_SBG}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "export listVarEnv=${listVarEnv}              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                            echo "export Script_Post_Output=${Script_Post_Output}" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "IGCM_sys_MkdirWork ${POST_DIR}               " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "IGCM_debug_Verif_Exit                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
@@ -278 +287 @@
                         export CompToRead=${CompToRead}
                         export FlagToRead=${FlagToRead}
+                        export NameToRead=${NameToRead}
                         export RESOL_ATM=${RESOL_ATM}
                         export RESOL_OCE=${RESOL_OCE}
@@ -285 +295 @@
                         export RESOL_SBG=${RESOL_SBG}
                         export listVarEnv=${listVarEnv}
+                        export Script_Post_Output=${Script_Post_Output}
                         . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
                         . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh
@@ -309 +320 @@
         IGCM_debug_Print 2 "SEASONNAL POST-TREATMENT :"
         echo
+        #
+        Script_Post_Output=create_se.${PeriodDateEnd}
         #
         listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,POST_DIR,MASTER,RebuildFrequency,DateBegin,PeriodDateEnd,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_SBG"
@@ -332 +345 @@
             echo "export RESOL_SBG=${RESOL_SBG}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
             echo "export listVarEnv=${listVarEnv}              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+            echo "export Script_Post_Output=${Script_Post_Output}" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
             echo "IGCM_sys_MkdirWork ${POST_DIR}               " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
             echo "IGCM_debug_Verif_Exit                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
@@ -357 +371 @@
             export RESOL_SBG=${RESOL_SBG}
             export listVarEnv=${listVarEnv}
+            export Script_Post_Output=${Script_Post_Output}
             . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
             . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh
@@ -395 +410 @@
             script=rebuild_fromWorkdir
         fi
-
+        #
+        Script_Post_Output=${script}.${PeriodDateEnd}
+        #
         listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,REBUILD_DIR,POST_DIR,MASTER,RebuildFromArchive,DateBegin,PeriodDateBegin,PeriodDateEnd,NbRebuildDir,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_SBG"
         IGCM_sys_RshPost <<-EOF
@@ -419 +436 @@
         export RESOL_SBG=${RESOL_SBG}
         export listVarEnv=${listVarEnv}
+        export Script_Post_Output=${Script_Post_Output}
         . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
         . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh