Changeset 1031


Ignore:
Timestamp:
07/28/14 12:19:59 (10 years ago)
Author:
sdipsl
Message:

See #187 RebuildFromArchive is deprecated

Location:
trunk/libIGCM
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_clean_month

    r1028 r1031  
    111111  CountRebuildDir=0 
    112112  if [ X${config_Post_RebuildFrequency} != X ] ; then 
    113     if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then 
    114       set +A RebuildDir -- $( IGCM_sys_RshArchive "find ${REBUILD_DIR} -type d -name \"*${PeriodDateBegin}*\" " ) 
    115     else 
    116       set +A RebuildDir -- $( find ${REBUILD_DIR} -type d -name "*${PeriodDateBegin}*" ) 
    117     fi 
     113    set +A RebuildDir -- $( find ${REBUILD_DIR} -type d -name "*${PeriodDateBegin}*" ) 
    118114    CountRebuildDir=${#RebuildDir[@]} 
    119115  fi 
    … …  
    161157      oui|OUI|o|y|yes|YES) 
    162158        echo "OK. It will be erased." 
    163         if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then 
    164           IGCM_sys_RshArchive "find ${REBUILD_DIR} -type d -name \"*${PeriodDateBegin}*\" -exec rm -Rf '{}' \;" 
    165         else 
    166           find ${REBUILD_DIR} -type d -name "*${PeriodDateBegin}*" -exec rm -Rf '{}' \; 
    167         fi 
     159        find ${REBUILD_DIR} -type d -name "*${PeriodDateBegin}*" -exec rm -Rf '{}' \; 
    168160        echo "done." 
    169161        ;; 

  • trunk/libIGCM/AA_clean_year

    r1028 r1031  
    147147    echo "Search directories with ${PeriodDateBegin} in REBUILD_DIR" 
    148148    unset RebuildDir 
    149     if [ X${config_Post_RebuildFromArchive} == Xtrue ] ; then 
    150       set +A RebuildDir -- $( IGCM_sys_RshArchive "find ${REBUILD_DIR} -type d -name \"*${PeriodDateBegin}*\" " ) 
    151     else 
    152       set +A RebuildDir -- $( find ${REBUILD_DIR} -type d -name  "*${PeriodDateBegin}*" ) 
    153     fi 
     149    set +A RebuildDir -- $( find ${REBUILD_DIR} -type d -name  "*${PeriodDateBegin}*" ) 
    154150    CountRebuildDir=${#RebuildDir[@]} 
    155151  fi 
    … …  
    200196 
    201197      oui|OUI|o|y|yes|YES) 
    202         echo "OK. It will be erased." 
    203         if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then 
    204           IGCM_sys_RshArchive "find ${REBUILD_DIR} -type d -name \"*${PeriodDateBegin}*\" -exec rm -Rf '{}' \;" 
    205         else 
    206           find ${REBUILD_DIR} -type d -name "*${PeriodDateBegin}*" -exec rm -Rf '{}' \; 
    207         fi 
     198        echo "OK. It will be erased."         
     199        find ${REBUILD_DIR} -type d -name "*${PeriodDateBegin}*" -exec rm -Rf '{}' \; 
    208200        echo "done." 
    209201        ;; 

  • trunk/libIGCM/AA_create_multi_se

    r929 r1031  
    2626#-Q- ada # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    2727#-Q- ada # @ notification = error 
    28 #-Q- ada # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $MASTER ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER 
     28#-Q- ada # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $POST_DIR ; $MASTER ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER 
    2929#-Q- ada # @ queue 
    3030#-Q- lxiv8 ###################### 

  • trunk/libIGCM/AA_create_se

    r957 r1031  
    2626#-Q- ada # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    2727#-Q- ada # @ notification = error 
    28 #-Q- ada # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $MASTER ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER 
     28#-Q- ada # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $POST_DIR ; $MASTER ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER 
    2929#-Q- ada # @ queue 
    3030#-Q- lxiv8 ###################### 

  • trunk/libIGCM/AA_create_ts

    r932 r1031  
    2626#-Q- ada # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    2727#-Q- ada # @ notification = error 
    28 #-Q- ada # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $MASTER ; $RebuildFrequency ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $CompletedFlag ; $TsTask ; $CompToRead ; $FlagToRead ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER 
     28#-Q- ada # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $POST_DIR ; $MASTER ; $RebuildFrequency ; $DateBegin ; $PeriodDateBegin ; $PeriodDateEnd ; $NbRebuildDir ; $StandAlone ; $CompletedFlag ; $TsTask ; $CompToRead ; $FlagToRead ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; $MASTER 
    2929#-Q- ada # @ queue 
    3030#-Q- lxiv8 ###################### 

  • trunk/libIGCM/AA_move-and-rename

    r1028 r1031  
    231231 
    232232# Define NEW_REBUILD_DIR 
    233 if [ -d ${REBUILD_DIR} ] ; then 
    234   if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then 
    235     NEW_REBUILD_DIR=${NEW_R_SAVE}/TMP 
    236     IGCM_sys_MkdirArchive ${NEW_REBUILD_DIR} 
    237   else 
    238     NEW_REBUILD_DIR=${BIG_DIR}/${config_UserChoices_TagName}/${NEW_JobName} 
    239     IGCM_sys_MkdirWork ${NEW_REBUILD_DIR} 
    240   fi 
     233if [ -d ${REBUILD_DIR} ] ; then   
     234  NEW_REBUILD_DIR=${BIG_DIR}/${config_UserChoices_TagName}/${NEW_JobName} 
     235  IGCM_sys_MkdirWork ${NEW_REBUILD_DIR} 
    241236fi 
    242237 
    … …  
    472467    rebdir=$( basename ${ThisREBDir} ) 
    473468    IGCM_debug_Print 2 "${rebdir}." 
    474     if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then 
    475       IGCM_sys_MkdirArchive ${NEW_REBUILD_DIR}/${rebdir} 
    476     else 
    477       IGCM_sys_MkdirWork ${NEW_REBUILD_DIR}/${rebdir} 
    478     fi 
     469    IGCM_sys_MkdirWork ${NEW_REBUILD_DIR}/${rebdir} 
    479470    REPLACE_sed ${REBUILD_DIR}/${rebdir}/rebuild.ksh ${NEW_REBUILD_DIR}/${rebdir} 
    480471    IGCM_sys_Mv -f ${REBUILD_DIR}/${rebdir}/* ${NEW_REBUILD_DIR}/${rebdir}/ 

  • trunk/libIGCM/AA_rebuild_fromWorkdir

    r1029 r1031  
    3030#-Q- ada # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    3131#-Q- ada # @ notification = error 
    32 #-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 
     32#-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 
    3333#-Q- ada # @ queue 
    3434#-Q- lxiv8 ###################### 
    … …  
    8484MASTER=${MASTER:=ada|curie} 
    8585 
    86 #D- Do we rebuild parallel output from archive or from ${BIGDIR} 
    87 #D- Default : value from AA_job if any 
    88 RebuildFromArchive=${RebuildFromArchive:=false} 
    89  
    9086#D- Directory where files we need to rebuild are store 
    9187#D- Default : value from AA_job if any 
    92 #D- if RebuildFromArchive=true REBUILD_DIR=${DMFDIR}/IGCM_OUT/.../JobName/TMP 
    93 #D- example : /dmnfs09/cont003/p86denv/IGCM_OUT/IPSLCM5/CM5PIRC7/TMP 
    94 #D- if RebuildFromArchive=false REBUILD_DIR=${BIGDIR}/REBUILD/TagName/JobName/ 
     88#D- REBUILD_DIR=${BIGDIR}/REBUILD/TagName/JobName/ 
    9589#D- example : /scratch/cont003/p86denv/REBUILD/IPSLCM5/SCAL-NEW 
    9690REBUILD_DIR=${REBUILD_DIR:=/path/to/your/TMP/REBUILD/FILES} 
    … …  
    169163# ------------------------------------------------------------------ 
    170164IGCM_debug_Verif_Exit_Post 
    171  
    172165# 
    173 if [ ${RebuildFromArchive} = true ] ; then 
    174   ListAllRebuildDir=$( IGCM_sys_RshArchive ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${LastPeriodForRebuild} ) 
    175 else 
    176   ListAllRebuildDir=$( IGCM_sys_RshMaster ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${LastPeriodForRebuild} ) 
    177 fi 
     166ListAllRebuildDir=$( IGCM_sys_RshMaster ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${LastPeriodForRebuild} ) 
    178167# 
    179168 
    180169for directory in ${ListAllRebuildDir} ; do 
    181170  # 
    182   if [ ${RebuildFromArchive} = true ] ; then 
    183     IGCM_sys_Get_Dir ${directory} ${RUN_DIR} 
    184   else 
    185     IGCM_sys_Get_Master ${directory} ${RUN_DIR} 
    186   fi 
     171  IGCM_sys_Get_Master ${directory} ${RUN_DIR} 
    187172  # 
    188173  IGCM_sys_Cd ${RUN_DIR}/$( basename ${directory} ) 
    … …  
    199184  IGCM_sys_Rm -rf $( basename ${directory} ) 
    200185  # remote clean up 
    201   if [ ${RebuildFromArchive} = true ] ; then 
    202     IGCM_sys_RshArchive rm -rf ${directory} 
    203   else 
    204     IGCM_sys_RshMaster rm -rf ${directory} 
    205   fi 
     186  IGCM_sys_RshMaster rm -rf ${directory} 
    206187done 
    207188 

  • trunk/libIGCM/libIGCM_check/libIGCM_check.ksh

    r1024 r1031  
    3939  # What kind of rebuild ? 
    4040  # ---------------------- 
    41   if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then 
    42     RebuildJob="rebuild_fromArchive" 
    43     IGCM_sys_TestDirArchive ${REBUILD_DIR} 
    44     RebuildExists=$? 
    45   else 
    46     RebuildJob="rebuild_fromWorkdir" 
    47     IGCM_sys_TestDir ${REBUILD_DIR} 
    48     RebuildExists=$? 
    49   fi 
     41  RebuildJob="rebuild_fromWorkdir" 
     42  IGCM_sys_TestDir ${REBUILD_DIR} 
     43  RebuildExists=$? 
    5044 
    5145  # Are packs activated or not ? 

  • trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

    r1028 r1031  
    7878  # 
    7979  if [ X${PackDefault} = Xtrue ] ; then 
    80     # If we DO apply pack in this computing center 
    81     IGCM_debug_Print 1 "Due to inodes policy OVERRULE RebuildFromArchive value to NONE" 
    82     config_Post_RebuildFromArchive=NONE 
    8380    if [ X${config_UserChoices_SpaceName} = XTEST ]; then 
    8481      # TEST simulations will not be packed and will stay on SCRATCHDIR filesystem 
    … …  
    128125 
    129126  #==================================================== 
    130   # Define REBUILD_DIR : where we store files needing rebuild process 
    131   if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then 
    132     REBUILD_DIR=${R_SAVE}/REBUILD 
    133     if [ ! X${TaskType} = Xchecking ] ; then 
    134       IGCM_sys_MkdirArchive ${REBUILD_DIR} 
    135     fi 
    136   else 
    137     REBUILD_DIR=${R_BUFR}/REBUILD 
    138     if [ ! X${TaskType} = Xchecking ] ; then 
    139       IGCM_sys_MkdirWork ${REBUILD_DIR} 
    140     fi 
     127  # Define REBUILD_DIR : where we store files needing rebuild process   
     128  REBUILD_DIR=${R_BUFR}/REBUILD 
     129  if [ ! X${TaskType} = Xchecking ] ; then 
     130    IGCM_sys_MkdirWork ${REBUILD_DIR} 
    141131  fi 
    142132 

  • trunk/libIGCM/libIGCM_post/libIGCM_post.ksh

    r985 r1031  
    589589      echo "}                                         " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    590590    fi 
    591     if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then 
    592       IGCM_sys_Put_Dir REBUILD_${PeriodDateBegin} ${REBUILD_DIR} 
    593     else 
    594       IGCM_sys_Mv      REBUILD_${PeriodDateBegin} ${REBUILD_DIR} 
    595     fi 
     591    IGCM_sys_Mv      REBUILD_${PeriodDateBegin} ${REBUILD_DIR} 
    596592  fi 
    597593  # 
    598594  if [ ${RebuildFrequency} = true ] ; then 
    599     if ( [ X${config_Post_RebuildFromArchive} = Xtrue ] ) ; then 
    600       IGCM_debug_Print 1 "REBUILD POST-PROCESSING FROM ARCHIVE" 
    601       echo 
    602     else 
    603       IGCM_debug_Print 1 "REBUILD POST-PROCESSING FROM WORKDIR" 
    604       echo 
    605     fi 
     595    IGCM_debug_Print 1 "REBUILD POST-PROCESSING FROM WORKDIR" 
     596    echo 
    606597    script=rebuild_fromWorkdir 
    607598    # 
    608599    Script_Post_Output=${script}.${PeriodDateEnd} 
    609600    # 
    610     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" 
     601    listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,REBUILD_DIR,POST_DIR,MASTER,DateBegin,PeriodDateBegin,PeriodDateEnd,NbRebuildDir,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_SBG" 
    611602    IGCM_sys_RshPost <<-EOF 
    612603      export DEBUG_debug=${DEBUG_debug} 
    … …  
    618609      export POST_DIR=${POST_DIR} 
    619610      export MASTER=${MASTER} 
    620       export RebuildFromArchive=${config_Post_RebuildFromArchive} 
    621611      export DateBegin=${DateBegin} 
    622612      export PeriodDateBegin=${PeriodDateBegin} 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

    r996 r1031  
    3131# only MAIL working at present due to firewall constraint 
    3232BigBrotherChannel=MAIL 
    33  
    34 # variable that must have lower case value. 
    35 typeset -l config_Post_RebuildFromArchive 
    3633 
    3734# no need to be so verbose in checking mode 
Note: See TracChangeset for help on using the changeset viewer.