Changeset 1031 for trunk/libIGCM/AA_rebuild_fromWorkdir

Timestamp:

07/28/14 12:19:59 (10 years ago)

Author:

sdipsl

Message:

See #187 RebuildFromArchive is deprecated

File:

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

trunk/libIGCM/AA_rebuild_fromWorkdir

@@ -30 +30 @@
 #-Q- ada # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.)
 #-Q- ada # @ notification = error
-#-Q- ada # @ 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
+#-Q- ada # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $POST_DIR ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER
 #-Q- ada # @ queue
 #-Q- lxiv8 ######################
@@ -84 +84 @@
 MASTER=${MASTER:=ada|curie}
 
-#D- Do we rebuild parallel output from archive or from ${BIGDIR}
-#D- Default : value from AA_job if any
-RebuildFromArchive=${RebuildFromArchive:=false}
-
 #D- Directory where files we need to rebuild are store
 #D- Default : value from AA_job if any
-#D- if RebuildFromArchive=true REBUILD_DIR=${DMFDIR}/IGCM_OUT/.../JobName/TMP
-#D- example : /dmnfs09/cont003/p86denv/IGCM_OUT/IPSLCM5/CM5PIRC7/TMP
-#D- if RebuildFromArchive=false REBUILD_DIR=${BIGDIR}/REBUILD/TagName/JobName/
+#D- REBUILD_DIR=${BIGDIR}/REBUILD/TagName/JobName/
 #D- example : /scratch/cont003/p86denv/REBUILD/IPSLCM5/SCAL-NEW
 REBUILD_DIR=${REBUILD_DIR:=/path/to/your/TMP/REBUILD/FILES}
@@ -169 +163 @@
 # ------------------------------------------------------------------
 IGCM_debug_Verif_Exit_Post
-
 #
-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
+ListAllRebuildDir=$( IGCM_sys_RshMaster ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${LastPeriodForRebuild} )
 #
 
 for directory in ${ListAllRebuildDir} ; do
   #
-  if [ ${RebuildFromArchive} = true ] ; then
-    IGCM_sys_Get_Dir ${directory} ${RUN_DIR}
-  else
-    IGCM_sys_Get_Master ${directory} ${RUN_DIR}
-  fi
+  IGCM_sys_Get_Master ${directory} ${RUN_DIR}
   #
   IGCM_sys_Cd ${RUN_DIR}/$( basename ${directory} )
@@ -199 +184 @@
   IGCM_sys_Rm -rf $( basename ${directory} )
   # remote clean up
-  if [ ${RebuildFromArchive} = true ] ; then
-    IGCM_sys_RshArchive rm -rf ${directory}
-  else
-    IGCM_sys_RshMaster rm -rf ${directory}
-  fi
+  IGCM_sys_RshMaster rm -rf ${directory}
 done