Changeset 590


Ignore:
Timestamp:
03/21/12 11:02:21 (12 years ago)
Author:
sdipsl
Message:
  • can extract needed restart from a tar (up to 20 minutes on titane)
    • still to do : introduce a lag when cleaning the restart buffer so that we don't look into the tar too often
    • still to do : work on the clean_month procedure
  • rebuild process submit pack_output process if needed
    • still to do : a pack_output able to submit create_ts/create_se if needed
  • bugfixes/cosmetics/cleaning
  • SX9 and titane OK.
Location:
trunk/libIGCM
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_SaveSourceModifications

    r554 r590  
    145145fi 
    146146 
    147 # Clean RUN_DIR_PATH (necessary for cesium) 
     147# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    148148if ( ! ${DEBUG_debug} ) ; then 
    149149    IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 

  • trunk/libIGCM/AA_atlas_LMDZ

    r587 r590  
    231231[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} 
    232232 
    233 # Clean RUN_DIR_PATH (necessary for cesium) 
     233# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    234234IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 

  • trunk/libIGCM/AA_atlas_ORCA_LIM

    r587 r590  
    272272[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} 
    273273 
    274 # Clean RUN_DIR_PATH (necessary for cesium) 
     274# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    275275IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 

  • trunk/libIGCM/AA_atlas_ORCHIDEE

    r587 r590  
    237237[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} 
    238238 
    239 # Clean RUN_DIR_PATH (necessary for cesium) 
     239# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    240240IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 

  • trunk/libIGCM/AA_atlas_PISCES

    r587 r590  
    237237[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} 
    238238 
    239 # Clean RUN_DIR_PATH (necessary for cesium) 
     239# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    240240IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 

  • trunk/libIGCM/AA_create_multi_se

    r554 r590  
    539539fi 
    540540 
    541 # Clean RUN_DIR_PATH (necessary for cesium) 
     541# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    542542IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 

  • trunk/libIGCM/AA_create_se

    r554 r590  
    690690fi 
    691691 
    692 # Clean RUN_DIR_PATH (necessary for cesium) 
     692# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    693693IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 

  • trunk/libIGCM/AA_create_ts

    r554 r590  
    862862fi 
    863863 
    864 # Clean RUN_DIR_PATH (necessary for cesium) 
     864# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    865865IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 
    866866 

  • trunk/libIGCM/AA_monitoring

    r587 r590  
    292292IGCM_sys_Put_Dods MONITORING 
    293293 
    294 # Clean RUN_DIR_PATH (necessary for cesium) 
     294# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    295295IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 

  • trunk/libIGCM/AA_pack_debug

    r589 r590  
    33#-Q- cesium ## CESIUM   CEA ## 
    44#-Q- cesium ###################### 
    5 #-Q- cesium #MSUB -r PACKDEBUG    # Nom du job                 
     5#-Q- cesium #MSUB -r PACKDEBUG    # Nom du job 
    66#-Q- cesium #MSUB -N 1              # Reservation du noeud 
    77#-Q- cesium #MSUB -n 1              # Reservation du processus 
    … …  
    2727#-Q- sx8brodie # Nom du travail LoadLeveler 
    2828#-Q- sx8brodie # @ job_name   = PACKDEBUG 
    29 #-Q- sx8brodie # Fichier de sortie standard du travail        
     29#-Q- sx8brodie # Fichier de sortie standard du travail 
    3030#-Q- sx8brodie # @ output     = $(job_name).$(jobid) 
    3131#-Q- sx8brodie # Fichier de sortie d'erreur du travail 
    … …  
    8181#-Q- sx9mercure ## CESIUM   CEA ## 
    8282#-Q- sx9mercure ###################### 
    83 #-Q- sx9mercure #MSUB -r PACKDEBUG    # Nom du job                 
     83#-Q- sx9mercure #MSUB -r PACKDEBUG    # Nom du job 
    8484#-Q- sx9mercure #MSUB -N 1              # Reservation du noeud 
    8585#-Q- sx9mercure #MSUB -n 1              # Reservation du processus 
    … …  
    9191#-Q- titane ## TITANE   CEA     ## 
    9292#-Q- titane ###################### 
    93 #-Q- titane #MSUB -r PACKDEBUG    # Nom du job                 
     93#-Q- titane #MSUB -r PACKDEBUG    # Nom du job 
    9494#-Q- titane #MSUB -eo 
    9595#-Q- titane #MSUB -n 1              # Reservation du processus 
    … …  
    178178#RESTART/ATM_****.nc 
    179179#RESTART/OCE_****.nc 
    180 #Attention de bien conserver les dates d'origines  
     180#Attention de bien conserver les dates d'origines 
    181181# 
    182182#Dans le cadre de la production nouvelle chaine 
    183183#ils auront directement le bon nom 
    184184# 
    185 #On veut egalement que l'archive soit par periode de temps  
    186 # cette periode est definie par la taille du pack donc connue  
    187 # en entree du script (1M, 1Y, 5Y, 10Y etc...)  
    188 # 
    189 # $1= PATH/config_card d'une simulation avec  
    190 # TagName/JobName/ExperimentName/SpaceName/DateBegin/DateEnd/PATH_SIMUL 
     185#On veut egalement que l'archive soit par periode de temps 
     186# cette periode est definie par la taille du pack donc connue 
     187# en entree du script (1M, 1Y, 5Y, 10Y etc...) 
     188# 
     189# $1= PATH/config_card d'une simulation avec 
     190# TagName/JobName/ExperimentName/SpaceName/DateBegin/DateEnd 
    191191# $2=PeriodPack en M/m ou Y/y 
    192192 
    … …  
    223223fi 
    224224 
    225 # 
     225#==================================================== 
    226226# First of all 
    227227# 
    228 #### 0- lecture de config.card  
    229 #### on veut les renseignements suivants :  
    230 #### JobName, PATH_SIMUL, DateBegin et DateEnd 
    231  
     228# Read config.card 
    232229IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card UserChoices 
    233230typeset option 
    … …  
    250247 
    251248#==================================================== 
    252 #R_SAVE : Job output storage directory 
    253 #R_BUFR : Job output buffered directory 
     249# Prepare environment 
     250#R_SAVE      : Job output storage directory 
     251#R_BUFR      : Job output buffered directory 
     252#STORE_DEBUG : Where we store tar files 
    254253 
    255254if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    … …  
    264263[ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 
    265264 
    266 #### Preparation de l'environnement 
    267 # repertoire dans lequel seront crees les archives 
    268 #STORE_DEBUG=/scratch/cont003/p86denv/Pack_Test/DEBUG 
     265#STORE_DEBUG=/ccc/store/cont003/dsm/p86denv/.../DEBUG 
    269266STORE_DEBUG=${R_SAVE}/DEBUG 
    270267IGCM_sys_MkdirArchive ${STORE_DEBUG} 
    271268 
     269#cd ${STORE_DEBUG} 
     270#rm -f * 
     271 
    272272# Switch to script variables meaning (try to be compatible with ipsl_pack TGCC moving procedure) 
    273273JobName=${config_UserChoices_JobName} 
    274 PATH_SIMUL=${R_BUFR} 
    275 echo $JobName $PATH_SIMUL $DateBegin $DateEnd 
    276  
    277 #### 1- renommer les fichiers ###### 
    278 #cd ${STORE_DEBUG} 
    279 #rm -rf * 
    280  
    281 # On les copie sur le scratchdir en changeant le nom et conservant la date 
     274echo $JobName $DateBegin $DateEnd 
     275 
    282276# Clear txt file lists 
    283277rm -f ${RUN_DIR}/liste_debug_files.txt 
    … …  
    286280 
    287281# Create sorted debug list to work with 
    288 find ${PATH_SIMUL}/*/Debug -type f | sort >> ${RUN_DIR}/liste_debug_files.txt 
     282find ${R_BUFR}/*/Debug -type f | sort >> ${RUN_DIR}/liste_debug_files.txt 
    289283 
    290284# Rename debug files we will work with using symlinks 
    … …  
    318312    extract_date_file=$( echo ${file}  | sed -e "s/.*${JobName}_[0-9]*_//" ) 
    319313    date_file=$( echo ${extract_date_file} | sed 's/\([0-9]\{8\}\)_.*$/\1/g' ) 
    320 #   echo pack n°${number_pack}  ${date_file} ${date_begin_pack} ${date_end_pack}  
    321     if [ ${date_file} -le ${date_end_pack} ] && [ ${date_file} -ge ${date_begin_pack} ] ; then  
     314#   echo pack n°${number_pack}  ${date_file} ${date_begin_pack} ${date_end_pack} 
     315    if [ ${date_file} -le ${date_end_pack} ] && [ ${date_file} -ge ${date_begin_pack} ] ; then 
    322316        echo $( basename ${file} ) >> ${RUN_DIR}/liste_pack_${number_pack}.txt 
    323         echo $( readlink ${file} ) >> ${RUN_DIR}/liste_remove_pack_${number_pack}.txt 
    324  
     317        echo $( readlink ${file} ) >> ${RUN_DIR}/liste_remove_pack_${number_pack}.txt 
    325318#    Will not work. Need to find a better ordering. 
    326319#    elif [ ${date_file} -ge ${date_end_pack} ] ; then 
    … …  
    350343 
    351344done 
     345 
     346# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
     347IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 
     348 
     349date 

  • trunk/libIGCM/AA_pack_output

    r585 r590  
    33#-Q- cesium ## CESIUM   CEA ## 
    44#-Q- cesium ###################### 
    5 #-Q- cesium #MSUB -r PACKOUTPUT    # Nom du job                 
     5#-Q- cesium #MSUB -r PACKOUTPUT    # Nom du job 
    66#-Q- cesium #MSUB -N 1              # Reservation du noeud 
    77#-Q- cesium #MSUB -n 1              # Reservation du processus 
    … …  
    2727#-Q- sx8brodie # Nom du travail LoadLeveler 
    2828#-Q- sx8brodie # @ job_name   = PACKOUTPUT 
    29 #-Q- sx8brodie # Fichier de sortie standard du travail        
     29#-Q- sx8brodie # Fichier de sortie standard du travail 
    3030#-Q- sx8brodie # @ output     = $(job_name).$(jobid) 
    3131#-Q- sx8brodie # Fichier de sortie d'erreur du travail 
    … …  
    8181#-Q- sx9mercure ## CESIUM   CEA ## 
    8282#-Q- sx9mercure ###################### 
    83 #-Q- sx9mercure #MSUB -r PACKOUTPUT    # Nom du job                 
     83#-Q- sx9mercure #MSUB -r PACKOUTPUT    # Nom du job 
    8484#-Q- sx9mercure #MSUB -N 1              # Reservation du noeud 
    8585#-Q- sx9mercure #MSUB -n 1              # Reservation du processus 
    … …  
    9191#-Q- titane ## TITANE   CEA     ## 
    9292#-Q- titane ###################### 
    93 #-Q- titane #MSUB -r PACKOUTPUT    # Nom du job                 
     93#-Q- titane #MSUB -r PACKOUTPUT    # Nom du job 
    9494#-Q- titane #MSUB -eo 
    9595#-Q- titane #MSUB -n 1              # Reservation du processus 
    … …  
    200200fi 
    201201 
    202 # 
     202#==================================================== 
    203203# First of all 
    204204# 
    205 #### 0- lecture de config.card  
    206 #### on veut les renseignements suivants :  
    207 #### JobName, PATH_SIMUL, DateBegin et DateEnd 
     205# Read config.card 
    208206 
    209207IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card UserChoices 
    … …  
    249247# Switch to script variables meaning (try to be compatible with ipsl_pack TGCC moving procedure) 
    250248JobName=${config_UserChoices_JobName} 
    251 PATH_SIMUL=${R_BUFR} 
    252 echo $JobName $PATH_SIMUL $DateBegin $DateEnd 
     249echo $JobName $DateBegin $DateEnd 
    253250 
    254251# ------------------------------------------------------------------ 
    … …  
    268265 
    269266  IGCM_debug_PrintVariables 3 number_pack 
    270   DaysTemp=$( IGCM_date_DaysInNextPeriod ${date_begin_pack} ${PeriodPack} ) 
     267  DaysTemp=$( IGCM_date_DaysInCurrentPeriod ${date_begin_pack} ${PeriodPack} ) 
    271268  date_end_pack=$( IGCM_date_AddDaysToGregorianDate ${date_begin_pack} $(( ${DaysTemp} - 1 )) ) 
    272269 
    … …  
    283280      # Loop over the file type and pack them when in between date_begin_pack and date_end_pack 
    284281      for myType in ${fileType} ; do 
    285         grep ${myType} liste_files.${dirID}.txt > liste_files.${dirID}.${myType}.txt 
    286         nbfile=0 
    287         for file in $( gawk '{print $11}' liste_files.${dirID}.${myType}.txt ); do 
    288           extract_date_file=$( echo ${file}  | sed -e "s/.*${JobName}_[0-9]*_//" ) 
    289           date_file=$( echo ${extract_date_file} | sed 's/\([0-9]\{8\}\)_.*$/\1/g' ) 
    290           # echo pack n°${number_pack}  ${date_file} ${date_begin_pack} ${date_end_pack} 
    291           if [ ${date_file} -le ${date_end_pack} ] && [ ${date_file} -ge ${date_begin_pack} ] ; then  
    292             echo ${file} >> liste_pack_${myType}_${number_pack}.txt 
    293             ncdump -h ${file} | grep -E 'float|double' | cut -f 1 -d '(' | cut -f 2 -d ' ' >> liste_variables_${myType}_${number_pack}.txt 
    294             (( nbfile = nbfile + 1 )) 
    295           fi 
    296         done 
    297         # Select list of variables to work with 
    298         list_var=$( cat liste_variables_${myType}_${number_pack}.txt | sort | uniq -c | awk -v nbfile=$nbfile '{if ($1 != nbfile) {print $2}}' | paste -s -d ',' ) 
    299         liste_file_tmp=$( for i in $( cat liste_pack_${myType}_${number_pack}.txt ) ; do basename $i ; done ) 
    300         # Create packed files 
    301         IGCM_debug_Print 1 "Ncrcat ongoing for ${dir} and ${myType}" 
    302         output=${JobName}_${date_begin_pack}_${date_end_pack}_${myType} 
    303         #cat liste_pack_${myType}_${number_pack}.txt | xargs ncrcat -v ${list_var} -o ${output} 
    304         if [ X${list_var} = X ] ; then 
    305           ncrcat --omp_num_threads 4 -p ${dir} ${liste_file_tmp} --output ${output} 
    306         else 
    307           ncrcat --omp_num_threads 4 -x -v ${list_var} -p ${dir} ${liste_file_tmp} --output ${output} 
    308         fi 
    309         # ------------------------------------------------------------------ 
     282        grep ${myType} liste_files.${dirID}.txt > liste_files.${dirID}.${myType}.txt 
     283        nbfile=0 
     284        for file in $( gawk '{print $11}' liste_files.${dirID}.${myType}.txt ); do 
     285          extract_date_file=$( echo ${file}  | sed -e "s/.*${JobName}_[0-9]*_//" ) 
     286          date_file=$( echo ${extract_date_file} | sed 's/\([0-9]\{8\}\)_.*$/\1/g' ) 
     287          # echo pack n°${number_pack}  ${date_file} ${date_begin_pack} ${date_end_pack} 
     288          if [ ${date_file} -le ${date_end_pack} ] && [ ${date_file} -ge ${date_begin_pack} ] ; then 
     289            echo ${file} >> liste_pack_${myType}_${number_pack}.txt 
     290            ncdump -h ${file} | grep -E 'float|double' | cut -f 1 -d '(' | cut -f 2 -d ' ' >> liste_variables_${myType}_${number_pack}.txt 
     291            (( nbfile = nbfile + 1 )) 
     292          fi 
     293        done 
     294        # Select list of variables to work with 
     295        list_var=$( cat liste_variables_${myType}_${number_pack}.txt | sort | uniq -c | awk -v nbfile=$nbfile '{if ($1 != nbfile) {print $2}}' | paste -s -d ',' ) 
     296        liste_file_tmp=$( for i in $( cat liste_pack_${myType}_${number_pack}.txt ) ; do basename $i ; done ) 
     297        # Create packed files 
     298        IGCM_debug_Print 1 "Ncrcat ongoing for ${dir} and ${myType}" 
     299        output=${JobName}_${date_begin_pack}_${date_end_pack}_${myType} 
     300        #cat liste_pack_${myType}_${number_pack}.txt | xargs ncrcat -v ${list_var} -o ${output} 
     301        if [ X${list_var} = X ] ; then 
     302          IGCM_sys_ncrcat -p ${dir} ${liste_file_tmp} --output ${output} 
     303        else 
     304          IGCM_sys_ncrcat -x -v ${list_var} -p ${dir} ${liste_file_tmp} --output ${output} 
     305        fi 
     306        # ------------------------------------------------------------------ 
    310307        # Test if all was right before proceeding further 
    311308        # ------------------------------------------------------------------ 
    312         IGCM_debug_Verif_Exit_Post 
     309        IGCM_debug_Verif_Exit_Post 
    313310        # Save it 
    314         IGCM_sys_Put_Out ${output} ${R_SAVE}/$( echo $dir | sed "s:${R_BUFR}/::" )/${output} 
    315         # ------------------------------------------------------------------ 
     311        IGCM_sys_Put_Out ${output} ${R_SAVE}/$( echo $dir | sed "s:${R_BUFR}/::" )/${output} 
     312        # ------------------------------------------------------------------ 
    316313        # Test if all was right before proceeding further 
    317314        # ------------------------------------------------------------------ 
    318         IGCM_debug_Verif_Exit_Post 
     315        IGCM_debug_Verif_Exit_Post 
    319316        # Clean file produced by ncrcat 
    320         IGCM_sys_Rm ${output} 
     317        IGCM_sys_Rm ${output} 
    321318        # Clean files used by ncrcat 
    322         cat liste_pack_${myType}_${number_pack}.txt | xargs rm 
     319        cat liste_pack_${myType}_${number_pack}.txt | xargs rm 
    323320        # Save the list of files that has been pack (ncrcat) 
    324         mv liste_pack_${myType}_${date_begin_pack}_${date_end_pack}.txt ${STORE_DEBUG} 
    325         IGCM_debug_Print 1 "Ncrcat and cleaning done for ${dir} and ${myType}" 
     321        mv liste_pack_${myType}_${date_begin_pack}_${date_end_pack}.txt ${STORE_DEBUG} 
     322        IGCM_debug_Print 1 "Ncrcat and cleaning done for ${dir} and ${myType}" 
    326323      done 
    327324    done 
    … …  
    331328  date_begin_pack=$( IGCM_date_AddDaysToGregorianDate ${date_end_pack} 1 ) 
    332329done 
     330 
     331# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
     332IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 
     333 
     334date 

  • trunk/libIGCM/AA_pack_restart

    r589 r590  
    33#-Q- cesium ## CESIUM   CEA ## 
    44#-Q- cesium ###################### 
    5 #-Q- cesium #MSUB -r PACKRESTART    # Nom du job                 
     5#-Q- cesium #MSUB -r PACKRESTART    # Nom du job 
    66#-Q- cesium #MSUB -N 1              # Reservation du noeud 
    77#-Q- cesium #MSUB -n 1              # Reservation du processus 
    … …  
    2727#-Q- sx8brodie # Nom du travail LoadLeveler 
    2828#-Q- sx8brodie # @ job_name   = PACKRESTART 
    29 #-Q- sx8brodie # Fichier de sortie standard du travail        
     29#-Q- sx8brodie # Fichier de sortie standard du travail 
    3030#-Q- sx8brodie # @ output     = $(job_name).$(jobid) 
    3131#-Q- sx8brodie # Fichier de sortie d'erreur du travail 
    … …  
    8181#-Q- sx9mercure ## CESIUM   CEA ## 
    8282#-Q- sx9mercure ###################### 
    83 #-Q- sx9mercure #MSUB -r PACKRESTART    # Nom du job                 
     83#-Q- sx9mercure #MSUB -r PACKRESTART    # Nom du job 
    8484#-Q- sx9mercure #MSUB -N 1              # Reservation du noeud 
    8585#-Q- sx9mercure #MSUB -n 1              # Reservation du processus 
    … …  
    9191#-Q- titane ## TITANE   CEA     ## 
    9292#-Q- titane ###################### 
    93 #-Q- titane #MSUB -r PACKRESTART    # Nom du job                 
     93#-Q- titane #MSUB -r PACKRESTART    # Nom du job 
    9494#-Q- titane #MSUB -eo 
    9595#-Q- titane #MSUB -n 1              # Reservation du processus 
    … …  
    178178#RESTART/ATM_****.nc 
    179179#RESTART/OCE_****.nc 
    180 #Attention de bien conserver les dates d'origines  
     180#Attention de bien conserver les dates d'origines 
    181181# 
    182182#Dans le cadre de la production nouvelle chaine 
    183183#ils auront directement le bon nom 
    184184# 
    185 #On veut egalement que l'archive soit par periode de temps  
    186 # cette periode est definie par la taille du pack donc connue  
    187 # en entree du script (1M, 1Y, 5Y, 10Y etc...)  
    188 # 
    189 # $1= PATH/config_card d'une simulation avec  
    190 # TagName/JobName/ExperimentName/SpaceName/DateBegin/DateEnd/PATH_SIMUL 
     185#On veut egalement que l'archive soit par periode de temps 
     186# cette periode est definie par la taille du pack donc connue 
     187# en entree du script (1M, 1Y, 5Y, 10Y etc...) 
     188# 
     189# $1= PATH/config_card d'une simulation avec 
     190# TagName/JobName/ExperimentName/SpaceName/DateBegin/DateEnd 
    191191# $2=PeriodPack en M/m ou Y/y 
    192192 
    … …  
    223223fi 
    224224 
    225 # 
     225#==================================================== 
    226226# First of all 
    227227# 
    228 #### 0- lecture de config.card  
    229 #### on veut les renseignements suivants :  
    230 #### JobName, PATH_SIMUL, DateBegin et DateEnd 
     228# Read config.card 
    231229 
    232230IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card UserChoices 
    … …  
    250248 
    251249#==================================================== 
    252 #R_SAVE : Job output storage directory 
    253 #R_BUFR : Job output buffered directory 
     250# Prepare environment 
     251#R_SAVE        : Job output storage directory 
     252#R_BUFR        : Job output buffered directory 
     253#STORE_RESTART : Where we store tar files 
    254254 
    255255if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    … …  
    264264[ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 
    265265 
    266 #### Preparation de l'environnement 
    267 # repertoire dans lequel seront crees les archives 
    268 #STORE_RESTART=/scratch/cont003/p86denv/Pack_Test/RESTART 
     266#STORE_RESTART=/ccc/store/cont003/dsm/p86denv/.../RESTART 
    269267STORE_RESTART=${R_SAVE}/RESTART 
    270268IGCM_sys_MkdirArchive ${STORE_RESTART} 
    271269 
     270#cd ${STORE_RESTART} 
     271#rm -f * 
     272 
    272273# Switch to script variables meaning (try to be compatible with ipsl_pack TGCC moving procedure) 
    273274JobName=${config_UserChoices_JobName} 
    274 PATH_SIMUL=${R_BUFR} 
    275 echo $JobName $PATH_SIMUL $DateBegin $DateEnd 
    276  
    277 #### 1- renommer les fichiers ###### 
    278 #cd ${STORE_RESTART} 
    279 #rm -rf * 
    280  
    281 # On les copie sur le scratchdir en changeant le nom et conservant la date 
     275echo $JobName $R_BUFR $DateBegin $DateEnd 
     276 
    282277# Clear txt file lists 
    283278rm -f ${RUN_DIR}/liste_restart_files.txt 
    … …  
    286281 
    287282# Create sorted restart list to work with 
    288 find ${PATH_SIMUL}/*/Restart -name "*nc" | sort >> ${RUN_DIR}/liste_restart_files.txt 
     283find ${R_BUFR}/*/Restart -name "*nc" | sort >> ${RUN_DIR}/liste_restart_files.txt 
    289284 
    290285# Rename restart files we will work with using symlinks 
    … …  
    318313    extract_date_file=$( echo ${file}  | sed -e "s/.*${JobName}_//" ) 
    319314    date_file=$( echo ${extract_date_file} | sed 's/\([0-9]\{8\}\)_.*$/\1/g' ) 
    320 #   echo pack n°${number_pack}  ${date_file} ${date_begin_pack} ${date_end_pack}  
    321     if [ ${date_file} -le ${date_end_pack} ] && [ ${date_file} -ge ${date_begin_pack} ] ; then  
    322         echo $( basename ${file} ) >> ${RUN_DIR}/liste_pack_${number_pack}.txt 
    323         echo $( readlink ${file} ) >> ${RUN_DIR}/liste_remove_pack_${number_pack}.txt 
    324  
    325 #    Will not work. Need to find a better ordering. 
    326 #    elif [ ${date_file} -ge ${date_end_pack} ] ; then 
    327 #      break 
     315#   echo pack n°${number_pack}  ${date_file} ${date_begin_pack} ${date_end_pack} 
     316    if [ ${date_file} -le ${date_end_pack} ] && [ ${date_file} -ge ${date_begin_pack} ] ; then 
     317      echo $( basename ${file} ) >> ${RUN_DIR}/liste_pack_${number_pack}.txt 
     318      echo $( readlink ${file} ) >> ${RUN_DIR}/liste_remove_pack_${number_pack}.txt 
     319#   Will not work. Need to find a better ordering. 
     320#   elif [ ${date_file} -ge ${date_end_pack} ] ; then 
     321#     break 
    328322    fi 
    329323  done 
    … …  
    350344 
    351345done 
     346 
     347# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
     348IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 
     349 
     350date 

  • trunk/libIGCM/AA_rebuild_fromArchive

    r554 r590  
    268268done 
    269269 
    270 # Clean RUN_DIR_PATH (necessary for cesium only) 
     270# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    271271IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 
     272 
     273date 

  • trunk/libIGCM/AA_rebuild_fromWorkdir

    r554 r590  
    268268done 
    269269 
    270 # Clean RUN_DIR_PATH (necessary for cesium only) 
     270# Clean RUN_DIR_PATH (necessary for cesium and titane only) 
    271271IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH} 
     272 
     273date 

  • trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

    r588 r590  
    608608  echo 
    609609 
    610   typeset Date_tmp Date_r Path_r do_start CompOldName Path_OUT Path_BUF Buffered 
     610  typeset Date_tmp Date_r Path_r do_start CompOldName Path_OUT Path_BUF 
     611  typeset Buffered Archived Tared PotentialTarFile IsMatching TarFileFound 
    611612  typeset comp compname comptagname card ListFilesName FileName0 NbFiles i i_  
    612613  typeset file_in file_out file_in_ file_out_ file_in_Name 
    … …  
    637638        eval CompOldName=${comp} 
    638639      else 
    639                 # Read component Restarts parameters 
     640        # Read component Restarts parameters 
    640641        IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/config.card ${comp} Restart 
    641642        eval do_start=\${config_${comp}_Restart} > /dev/null 2>&1 
    … …  
    731732 
    732733          if [ -f ${Path_BUF}*.nc ] ; then 
     734            IGCM_debug_Print 3 "Buffered restart" 
    733735            Buffered=true 
     736            Archived=false 
     737            Tared=false 
    734738            nb_restart_file=$(IGCM_sys_CountFileBuffer ${Path_BUF}_????.nc) 
     739          elif [ -f ${Path_OUT}*.nc ] ; then 
     740            IGCM_debug_Print 3 "Archived restart" 
     741            Buffered=false 
     742            Archived=true 
     743            Tared=false 
     744            nb_restart_file=$(IGCM_sys_CountFileArchive ${Path_OUT}_????.nc) 
    735745          else 
     746            IGCM_debug_Print 3 "Tared restart" 
    736747            Buffered=false 
    737             nb_restart_file=$(IGCM_sys_CountFileArchive ${Path_OUT}_????.nc) 
     748            Archived=false 
     749            Tared=true 
     750            # Look after the tar file we want if we did not found it already 
     751            if [ X${IsMatching} = X ] ; then 
     752              for PotentialTarFile in $( find ${R_SAVE}/RESTART -name "${config_UserChoices_JobName}_*_restart.tar" ) ; do 
     753                IsMatching=$( echo ${PotentialTarFile} | sed "s:^${config_UserChoices_JobName}_::" | sed "s:\.restart\.tar$::" | gawk -F_ -v restartdate=${LastPeriodDateEnd} '{if (($1 < restartdate) && ($2 > restartdate)) {print $1"_"$2}}' ) 
     754                if [ ! X${IsMatching} = X ] ; then 
     755                  TarFileFound=${PotentialTarFile} 
     756                  break 
     757                fi 
     758              done 
     759            fi 
     760            tar xvf ${TarFileFound} ${comp}_${generic_restart_file_name_in}*.nc 
     761            nb_restart_file=$( IGCM_sys_CountFileBuffer ${comp}_${generic_restart_file_name_in}_????.nc ) 
    738762          fi 
    739763 
    … …  
    742766            until [ $j -ge $nb_restart_file ]; do 
    743767              j4=${j} 
    744               if [ ${Buffered} ] ; then 
     768              if [ X${Buffered} = Xtrue ] ; then 
    745769                IGCM_sys_GetBuffer ${Path_BUF}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc 
    746               else 
     770              elif [ X${Archived} = Xtrue ] ; then 
    747771                IGCM_sys_Get ${Path_OUT}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc 
     772              elif [ X${Tared} = Xtrue ] ; then 
     773                IGCM_sys_Mv ${comp}_${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc 
    748774              fi 
    749775              (( j=j+1 )) 
    750776            done 
    751777          else 
    752             if [ ${Buffered} ] ; then 
     778            if [ X${Buffered} = Xtrue ] ; then 
    753779              eval IGCM_sys_GetBuffer \${R_BUF_${comp}_R}/${file_in_Name} ${file_out} 
    754             else 
     780            elif [ X${Archived} = Xtrue ] ; then 
    755781              eval IGCM_sys_Get \${R_OUT_${comp}_R}/${file_in_Name} ${file_out} 
    756             fi 
    757           fi 
    758  
     782            elif [ X${Tared} = Xtrue ] ; then 
     783              IGCM_sys_Mv ${comp}_${file_in_Name} ${file_out} 
     784            fi 
     785          fi 
    759786          (( i=i+3 )) 
    760787        done 

  • trunk/libIGCM/libIGCM_post/IGCM_Patch_20091118_mask.ksh

    r588 r590  
    2020    IGCM_debug_PushStack "IGCM_Patch_mask" $@ 
    2121 
    22     if [ -f ${config_UserChoices_JobName}_mesh_mask.nc ] ; then 
     22    if [ ! -f ${config_UserChoices_JobName}_mesh_mask.nc ] ; then 
    2323      if [ -f ${R_BUFR}/OCE/Output/${config_UserChoices_JobName}_mesh_mask.nc ] ; then 
    24         IGCM_sys_Get ${R_BUFR}/OCE/Output/${config_UserChoices_JobName}_mesh_mask.nc . 
     24        IGCM_sys_GetBuffer ${R_BUFR}/OCE/Output/${config_UserChoices_JobName}_mesh_mask.nc . 
    2525      elif [ -f ${R_SAVE}/OCE/Output/${config_UserChoices_JobName}_mesh_mask.nc ] ; then 
    2626        IGCM_sys_Get ${R_SAVE}/OCE/Output/${config_UserChoices_JobName}_mesh_mask.nc . 

  • trunk/libIGCM/libIGCM_post/libIGCM_post.ksh

    r583 r590  
    245245          [ $(( ( ${YearEnd} - ${YearBegin} + 1 ) % ${YearsChunckLength} )) = 0 ] && NbYearsChunckLoop=$(( ${NbYearsChunckLoop} - 1 )) 
    246246          # Starting Year of the current chunck 
    247           ChunckTsYearBegin=$(( ${NbYearsChunckLoop} *  ${YearsChunckLength} + ${YearBegin} )) 
     247          ChunckTsYearBegin=$(( ${NbYearsChunckLoop} * ${YearsChunckLength} + ${YearBegin} )) 
    248248          # Starting date of the current chunck 
    249249          ChunckTsDateBegin=${ChunckTsYearBegin}${MonthBegin}01 
    … …  
    412412  fi 
    413413 
     414  #============== PACK PROCESSING FOR RESTART AND DEBUG FILES =============# 
     415  if [ ${PackFrequency} = true ] ; then 
     416    IGCM_debug_Print 1 "PACK POST-PROCESSING" 
     417    echo 
     418    ## Need to Remember This One 
     419    SavedDateBegin=${DateBegin} 
     420    ## Need to Remember This One 
     421    SavedDateEnd=${DateEnd} 
     422    # 
     423    DaysTemp=$(( $( IGCM_date_DaysInPreviousPeriod ${PeriodDateEnd} ${config_Post_PackFrequency} end ) - 1 )) 
     424    # 
     425    PackDateBegin=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateEnd} -${DaysTemp} ) 
     426    # 
     427    script=pack_debug 
     428    # 
     429    Script_Post_Output=${script}.${PeriodDateEnd} 
     430    # 
     431    listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,POST_DIR,MASTER,DateBegin,DateEnd,PeriodPack,StandAlone" 
     432    IGCM_sys_RshPost <<-EOF 
     433    export DEBUG_debug=${DEBUG_debug} 
     434    export MODIPSL=${MODIPSL} 
     435    export libIGCM_SX=${libIGCM} 
     436    export libIGCM=${libIGCM_POST} 
     437    export SUBMIT_DIR=${SUBMIT_DIR} 
     438    export POST_DIR=${POST_DIR} 
     439    export MASTER=${MASTER} 
     440    export DateBegin=${PackDateBegin} 
     441    export DateEnd=${PeriodDateEnd} 
     442    export PeriodPack=${config_Post_PackFrequency} 
     443    export StandAlone=false 
     444    export listVarEnv=${listVarEnv} 
     445    export Script_Post_Output=${Script_Post_Output} 
     446    . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh 
     447    . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh 
     448    IGCM_sys_MkdirWork ${POST_DIR} 
     449    IGCM_debug_Verif_Exit_Post 
     450    IGCM_sys_QsubPost ${script} 
     451EOF 
     452    # 
     453    script=pack_restart 
     454    # 
     455    Script_Post_Output=${script}.${PeriodDateEnd} 
     456    # 
     457    IGCM_sys_RshPost <<-EOF 
     458    export DEBUG_debug=${DEBUG_debug} 
     459    export MODIPSL=${MODIPSL} 
     460    export libIGCM_SX=${libIGCM} 
     461    export libIGCM=${libIGCM_POST} 
     462    export SUBMIT_DIR=${SUBMIT_DIR} 
     463    export POST_DIR=${POST_DIR} 
     464    export MASTER=${MASTER} 
     465    export DateBegin=${PackDateBegin} 
     466    export DateEnd=${PeriodDateEnd} 
     467    export PeriodPack=${config_Post_PackFrequency} 
     468    export StandAlone=false 
     469    export listVarEnv=${listVarEnv} 
     470    export Script_Post_Output=${Script_Post_Output} 
     471    . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh 
     472    . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh 
     473    IGCM_sys_MkdirWork ${POST_DIR} 
     474    IGCM_debug_Verif_Exit_Post 
     475    IGCM_sys_QsubPost ${script} 
     476EOF 
     477    # 
     478    script=pack_output 
     479    # 
     480    Script_Post_Output=${script}.${PeriodDateEnd} 
     481    # 
     482    if [ ${RebuildFrequency} = true ] ; then 
     483      # 
     484      if [ -f ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh ] ; then 
     485        # 
     486#       if [ X${MASTER} = Xtitane ] ; then 
     487#         echo "IGCM_sys_RshPost <<-EOF"                     >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     488#       fi 
     489        echo "export DEBUG_debug=${DEBUG_debug}              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     490        echo "export MODIPSL=${MODIPSL}                      " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     491        echo "export libIGCM_SX=${libIGCM}                   " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     492        echo "export libIGCM=${libIGCM_POST}                 " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     493        echo "export SUBMIT_DIR=${SUBMIT_DIR}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     494        echo "export POST_DIR=${POST_DIR}                    " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     495        echo "export MASTER=${MASTER}                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     496        echo "export DateBegin=${PackDateBegin}              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     497        echo "export DateEnd=${PeriodDateEnd}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     498        echo "export PeriodPack=${config_Post_PackFrequency} " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     499        echo "export StandAlone=false                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     500        echo "export listVarEnv=${listVarEnv}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     501        echo "export Script_Post_Output=${Script_Post_Output}" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     502        echo "export script=${script}                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     503#       if [ X${MASTER} = Xtitane ] ; then 
     504#         echo ". ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     505#         echo ". ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh"     >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     506#       fi 
     507        echo "IGCM_sys_MkdirWork ${POST_DIR}                 " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     508        echo "IGCM_debug_Verif_Exit_Post                     " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     509        echo "IGCM_sys_QsubPost ${script}                    " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     510#       if [ X${MASTER} = Xtitane ] ; then 
     511#         echo "EOF"                                         >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     512#       fi 
     513      fi 
     514    else 
     515      IGCM_sys_RshPost <<-EOF 
     516    export DEBUG_debug=${DEBUG_debug} 
     517    export MODIPSL=${MODIPSL} 
     518    export libIGCM_SX=${libIGCM} 
     519    export libIGCM=${libIGCM_POST} 
     520    export SUBMIT_DIR=${SUBMIT_DIR} 
     521    export POST_DIR=${POST_DIR} 
     522    export MASTER=${MASTER} 
     523    export DateBegin=${PackDateBegin} 
     524    export DateEnd=${PeriodDateEnd} 
     525    export PeriodPack=${config_Post_PackFrequency} 
     526    export StandAlone=false 
     527    export listVarEnv=${listVarEnv} 
     528    export Script_Post_Output=${Script_Post_Output} 
     529    . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh 
     530    . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh 
     531    IGCM_sys_MkdirWork ${POST_DIR} 
     532    IGCM_debug_Verif_Exit_Post 
     533    IGCM_sys_QsubPost ${script} 
     534EOF 
     535    export DateBegin=${SavedDateBegin} 
     536    export DateEnd=${SavedDateEnd} 
     537    fi 
     538  fi 
     539 
    414540  #============== REBUILD POST-PROCESSING =============# 
    415541  if [ X${AsynchronousRebuild} = Xtrue ] ; then 
    … …  
    473599    IGCM_sys_QsubPost ${script} 
    474600EOF 
    475   fi 
    476  
    477   #============== PACK PROCESSING FOR RESTART AND DEBUG FILES =============# 
    478   if [ ${PackFrequency} = true ] ; then 
    479     IGCM_debug_Print 1 "PACK POST-PROCESSING" 
    480     echo 
    481     ## Need to Remember This One 
    482     SavedDateBegin=${DateBegin} 
    483     ## Need to Remember This One 
    484     SavedDateEnd=${DateEnd} 
    485     # 
    486     DaysTemp=$(( $( IGCM_date_DaysInPreviousPeriod ${PeriodDateEnd} ${config_Post_PackFrequency} end ) - 1 )) 
    487     # 
    488     PackDateBegin=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateEnd} -${DaysTemp} ) 
    489     # 
    490     script=pack_debug 
    491     # 
    492     Script_Post_Output=${script}.${PeriodDateEnd} 
    493     # 
    494     listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,POST_DIR,MASTER,DateBegin,DateEnd,PeriodPack,StandAlone" 
    495     IGCM_sys_RshPost <<-EOF 
    496     export DEBUG_debug=${DEBUG_debug} 
    497     export MODIPSL=${MODIPSL} 
    498     export libIGCM_SX=${libIGCM} 
    499     export libIGCM=${libIGCM_POST} 
    500     export SUBMIT_DIR=${SUBMIT_DIR} 
    501     export POST_DIR=${POST_DIR} 
    502     export MASTER=${MASTER} 
    503     export DateBegin=${PackDateBegin} 
    504     export DateEnd=${PeriodDateEnd} 
    505     export PeriodPack=${config_Post_PackFrequency} 
    506     export StandAlone=false 
    507     export listVarEnv=${listVarEnv} 
    508     export Script_Post_Output=${Script_Post_Output} 
    509     . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh 
    510     . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh 
    511     IGCM_sys_MkdirWork ${POST_DIR} 
    512     IGCM_debug_Verif_Exit_Post 
    513     IGCM_sys_QsubPost ${script} 
    514 EOF 
    515     # 
    516     script=pack_restart 
    517     # 
    518     Script_Post_Output=${script}.${PeriodDateEnd} 
    519     # 
    520     IGCM_sys_RshPost <<-EOF 
    521     export DEBUG_debug=${DEBUG_debug} 
    522     export MODIPSL=${MODIPSL} 
    523     export libIGCM_SX=${libIGCM} 
    524     export libIGCM=${libIGCM_POST} 
    525     export SUBMIT_DIR=${SUBMIT_DIR} 
    526     export POST_DIR=${POST_DIR} 
    527     export MASTER=${MASTER} 
    528     export DateBegin=${PackDateBegin} 
    529     export DateEnd=${PeriodDateEnd} 
    530     export PeriodPack=${config_Post_PackFrequency} 
    531     export StandAlone=false 
    532     export listVarEnv=${listVarEnv} 
    533     export Script_Post_Output=${Script_Post_Output} 
    534     . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh 
    535     . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh 
    536     IGCM_sys_MkdirWork ${POST_DIR} 
    537     IGCM_debug_Verif_Exit_Post 
    538     IGCM_sys_QsubPost ${script} 
    539 EOF 
    540     # 
    541     script=pack_output 
    542     # 
    543     Script_Post_Output=${script}.${PeriodDateEnd} 
    544     # 
    545     IGCM_sys_RshPost <<-EOF 
    546     export DEBUG_debug=${DEBUG_debug} 
    547     export MODIPSL=${MODIPSL} 
    548     export libIGCM_SX=${libIGCM} 
    549     export libIGCM=${libIGCM_POST} 
    550     export SUBMIT_DIR=${SUBMIT_DIR} 
    551     export POST_DIR=${POST_DIR} 
    552     export MASTER=${MASTER} 
    553     export DateBegin=${PackDateBegin} 
    554     export DateEnd=${PeriodDateEnd} 
    555     export PeriodPack=${config_Post_PackFrequency} 
    556     export StandAlone=false 
    557     export listVarEnv=${listVarEnv} 
    558     export Script_Post_Output=${Script_Post_Output} 
    559     . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh 
    560     . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh 
    561     IGCM_sys_MkdirWork ${POST_DIR} 
    562     IGCM_debug_Verif_Exit_Post 
    563     #IGCM_sys_QsubPost ${script} 
    564 EOF 
    565     export DateBegin=${SavedDateBegin} 
    566     export DateEnd=${SavedDateEnd} 
    567601  fi 
    568602  IGCM_debug_PopStack "IGCM_post_Submit" 
    … …  
    631665  *M|*m) 
    632666    PeriodMasterMonth=$( echo ${MasterFrequency} | sed -e "s/[mM]//" ) 
    633     case ${SlaveFrequency} in                
     667    case ${SlaveFrequency} in 
    634668    *Y|*y) 
    635669      PeriodSlaveYear=$( echo ${SlaveFrequency} | sed -e "s/[yY]//" ) 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

    r587 r590  
    18321832    echo "IGCM_sys_ncrcat :" $@ 
    18331833  fi 
    1834   ncrcat $@ 
     1834  ncrcat --omp_num_threads 2 $@ 
    18351835  if [ $? -gt 0 ] ; then 
    18361836    echo "IGCM_sys_ncrcat : erreur ${@}." 
Note: See TracChangeset for help on using the changeset viewer.