Changeset 634


Ignore:
Timestamp:
04/05/12 10:43:14 (12 years ago)
Author:
sdipsl
Message:
  • Final tweak with respect to pack flag.
  • On titane switch nco to the nco/3.9.4_netcdf4 version (with ncap2) only when running in mono classes (short term hack waiting better option)
Location:
trunk/libIGCM
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_clean_month

    r627 r634  
    7474IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    7575IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     76 
     77#================================== 
     78# Define default value to keep compatibility with previous card: means before changes due to TGCC 
     79if [ X${PackDefault} = Xtrue ] ; then 
     80  [ X${config_Post_PackFrequency} = X ] && config_Post_PackFrequency=${config_Post_RebuildFrequency} 
     81else 
     82  config_Post_PackFrequency=NONE 
     83fi 
     84 
     85#================================== 
     86# If pack is active then PackFrequency overule the config_UserChoices_PeriodLength 
     87if ( [ ! X${config_Post_PackFrequency} = X${NULL_STR} ] && [ ! X${config_Post_PackFrequency} = XNONE ] ) ; then 
     88  Pack=true 
     89fi 
    7690 
    7791#==================================================== 
    … …  
    108122    CountListFiles=${#ListFiles[@]} 
    109123 
    110     echo "Search files with ${PeriodDateEnd} in ${R_BUFR}" 
    111     set +A ListFilesBuf -- $( IGCM_sys_RshMaster "find ${R_BUFR} -name \"*${PeriodDateEnd}*\" " ) 
    112     CountListFilesBuf=${#ListFilesBuf[@]} 
     124    if [ X${Pack} = Xtrue ] ; then 
     125      echo "Search files with ${PeriodDateEnd} in ${R_BUFR}" 
     126      set +A ListFilesBuf -- $( IGCM_sys_RshMaster "find ${R_BUFR} -name \"*${PeriodDateEnd}*\" " ) 
     127      CountListFilesBuf=${#ListFilesBuf[@]} 
     128    else 
     129      CountListFilesBuf=0 
     130    fi 
    113131 
    114132    # If exist, erase REBUILD DIR 
    … …  
    131149            IGCM_debug_Print 2 -e "\033[1;31m ${file}\033[m" 
    132150        done 
    133         for file in ${ListFilesBuf[@]} ; do 
     151        if [ X${Pack} = Xtrue ] ; then 
     152          for file in ${ListFilesBuf[@]} ; do 
    134153            IGCM_debug_Print 2 -e "\033[1;31m ${file}\033[m" 
    135         done 
    136  
     154          done 
     155        fi 
    137156        echo -e "\033[1;32mDo you REALLY want to erase all those files ?" 
    138157        echo -n -e " Your answer (y/n) : \033[m" 
    … …  
    143162                echo "OK. It will be erased." 
    144163                IGCM_sys_RshArchive "find ${R_SAVE} -name \"*${PeriodDateEnd}*\" -exec rm -f '{}' \;" 
    145                 IGCM_sys_RshMaster  "find ${R_BUFR} -name \"*${PeriodDateEnd}*\" -exec rm -f '{}' \;" 
     164                if [ X${Pack} = Xtrue ] ; then 
     165                  IGCM_sys_RshMaster  "find ${R_BUFR} -name \"*${PeriodDateEnd}*\" -exec rm -f '{}' \;" 
     166                fi 
    146167                echo "done." 
    147168                ;; 

  • trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

    r630 r634  
    506506      IGCM_debug_Print 2 "Try to save previous ksh job output" 
    507507      IGCM_sys_Cd ${SUBMIT_DIR}/ 
    508       IGCM_sys_PutBuffer_Out ${Last_Script_Output_Name} ${R_BUF_KSH}/${Last_Script_Output_Name}.$$ rw 
     508      if [ X${Pack} = Xtrue ] ; then 
     509        IGCM_sys_PutBuffer_Out ${Last_Script_Output_Name} ${R_BUF_KSH}/${Last_Script_Output_Name}.$$ rw 
     510      else 
     511        IGCM_sys_Put_Out ${Last_Script_Output_Name} ${R_OUT_KSH}/${Last_Script_Output_Name}.$$ rw 
     512      fi 
    509513 
    510514      IGCM_card_CheckConflict run.card 
    511       IGCM_sys_PutBuffer_Out ${SUBMIT_DIR}/run.card ${R_BUF_KSH}/${Last_run_card}.$$ rw 
    512  
     515      if [ X${Pack} = Xtrue ] ; then 
     516        IGCM_sys_PutBuffer_Out ${SUBMIT_DIR}/run.card ${R_BUF_KSH}/${Last_run_card}.$$ rw 
     517      else 
     518        IGCM_sys_Put_Out ${SUBMIT_DIR}/run.card ${R_OUT_KSH}/${Last_run_card}.$$ rw 
     519      fi 
    513520      IGCM_sys_Cd ${RUN_DIR} 
    514521    else 
    … …  
    808815  #         Save Job output          # 
    809816  #==================================# 
    810   IGCM_sys_PutBuffer_Out ${Exe_Output} ${R_BUF_KSH}/${PREFIX}_${Exe_Output} 
     817  if [ X${Pack} = Xtrue ] ; then 
     818    IGCM_sys_PutBuffer_Out ${Exe_Output} ${R_BUF_KSH}/${PREFIX}_${Exe_Output} 
     819  else 
     820    IGCM_sys_Put_Out ${Exe_Output} ${R_OUT_KSH}/${PREFIX}_${Exe_Output} 
     821  fi 
    811822  eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${Exe_Output}" 
    812823 
    813824  IGCM_card_CheckConflict run.card 
    814   IGCM_sys_PutBuffer_Out ${SUBMIT_DIR}/run.card ${R_BUF_KSH}/run.card rw 
     825  if [ X${Pack} = Xtrue ] ; then 
     826    IGCM_sys_PutBuffer_Out ${SUBMIT_DIR}/run.card ${R_BUF_KSH}/run.card rw 
     827  else 
     828    IGCM_sys_Put_Out ${SUBMIT_DIR}/run.card ${R_OUT_KSH}/run.card rw 
     829  fi 
    815830 
    816831  if [ ${DRYRUN} -le 1 ] ; then 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

    r629 r634  
    9191#==================================================== 
    9292. /home/cont003/p86ipsl/.atlas_env_titane_ksh 
    93  
    94 module switch nco/3.9.4 nco/3.9.4_netcdf4 
     93if [ X${LSB_QUEUE} = Xmono ] ; then 
     94  module switch nco/3.9.4 nco/3.9.4_netcdf4 
     95fi 
    9596 
    9697#==================================================== 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_vargas.ksh

    r619 r634  
    174174  echo "${@} " >> ${THEFILE} 
    175175 
    176     # No frontend queue on brodie : just rsh the job on the frontend with submission. 
     176  # No frontend queue on brodie : just rsh the job on the frontend with submission. 
    177177  sed -e "s@IGCM_sys_Qsub\(.*\)@\1@" ${THEFILE} > ${THEFILE}_ 
    178178 
Note: See TracChangeset for help on using the changeset viewer.