Changeset 236 for trunk/libIGCM/AA_rebuild_fromWorkdir

Timestamp:

03/01/10 16:59:54 (14 years ago)

Author:

sdipsl

Message:

• Slight modification in the way we read and interpret card for post-processing. Actual card will not work with this revision

List=(histmth.nc, ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc, Post_1M_histmth), \

(histday.nc, ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc, Post_1D_histday), \
(histhf.nc, ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc, Post_HF_histhf)

• ChunckJob2D, ChunckJob3d have control over TS, with the folliwing keywords :

OFF (TimeSeries? not active), NONE (TimeSeries? active but without chunck), 10Y (TimeSeries? active, but produce as many as needed 10 years lenght time series)

• Seasonnal (ON/OFF), have control over SE files production.
• Patch can be applied systematicaly even if no Time Series or Seasonal post-proceesing are required
• A first step towards the merge between rebuildFromArchive and rebuildFrowWorkdir jobs
• We may change rebuildFromArchive job name as it is not that meaningful in this context
• We may change ChunckJob2D/ChunckJob3D as it is not that meaningful in this context
• Some bugfix and optimisation

• For testing purpose only (still try to have backward compatibility)

Exemple :

[Post_1D_histday]
Patches= (Patch_20091030_histcom_time_axis)
GatherWithInternal? = (lon, lat, presnivs, time_counter)
TimeSeriesVars2D = (bils, cldh, ...)
ChunckJob2D = 50Y
TimeSeriesVars3D = (temp, theta, ovap, ovapinit, geop, ...)
ChunckJob3D = OFF
Seasonal=OFF

File:

• trunk/libIGCM/AA_rebuild_fromWorkdir (modified) (4 diffs)

trunk/libIGCM/AA_rebuild_fromWorkdir

@@ -22 +22 @@
 #-Q- sx8brodie # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.)
 #-Q- sx8brodie # @ notification = error
-#-Q- sx8brodie # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER ; $config_UserChoices_JobName ; $R_SAVE
+#-Q- sx8brodie # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER ; $RebuildFromArchive ; $config_UserChoices_JobName ; $R_SAVE
 #-Q- sx8brodie # @ queue
 #-Q- aix6 #!/bin/ksh
@@ -39 +39 @@
 #-Q- aix6 # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.)
 #-Q- aix6 # @ notification = error
-#-Q- aix6 # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER ; $config_UserChoices_JobName ; $R_SAVE
+#-Q- aix6 # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER ; $RebuildFromArchive ; $config_UserChoices_JobName ; $R_SAVE
 #-Q- aix6 # @ queue
 #-Q- sx8mercure #!/bin/ksh
@@ -181 +181 @@
 #set -vx
 
-#RUN_DIR=${REBUILD_DIR}
 RUN_DIR=${RUN_DIR_PATH}
 IGCM_sys_MkdirWork ${RUN_DIR}
 IGCM_sys_Cd ${RUN_DIR}
 #
-ListAllRebuildDir=$( IGCM_sys_RshMaster ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${LastPeriodForRebuild} )
+if [ ${RebuildFromArchive} = true ] ; then
+    ListAllRebuildDir=$( IGCM_sys_RshArchive ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${LastPeriodForRebuild} )
+else
+    ListAllRebuildDir=$( IGCM_sys_RshMaster ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${LastPeriodForRebuild} )
+fi
 #
+
 for directory in ${ListAllRebuildDir} ; do
     #
-    IGCM_sys_Get_Master ${directory} ${RUN_DIR}
+    if [ ${RebuildFromArchive} = true ] ; then
+        IGCM_sys_Get_Dir ${directory} ${RUN_DIR}
+    else
+        IGCM_sys_Get_Master ${directory} ${RUN_DIR}
+    fi
     #
     IGCM_sys_Cd ${RUN_DIR}/$( basename ${directory} )
@@ -202 +210 @@
     IGCM_sys_Cd ${RUN_DIR}
     # Clean Up
-    IGCM_sys_Rm -rf ${directory}
+    if [ ${RebuildFromArchive} = true ] ; then
+        IGCM_sys_RshArchive rm -rf ${directory}
+    else
+        IGCM_sys_Rm -rf ${directory}
+    fi
 done