Changeset 545


Ignore:
Timestamp:
02/07/12 14:43:43 (12 years ago)
Author:
sdipsl
Message:
  • clean_month.job adapted to R_BUFR
  • R_IN points to CCCWORKDIR /ccc/work/cont003/dsm/p86ipsl/IGCM
  • bugfixes, simplification, refactoring, cosmetics
Location:
trunk/libIGCM
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_clean_month

    r428 r545  
    7777#==================================================== 
    7878#R_SAVE : Job output directory 
     79#R_BUFR : Job output buffered directory 
    7980if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    8081    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    8182    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     83    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    8284else 
    8385    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     86    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    8487fi 
    8588IGCM_sys_TestDirArchive ${R_SAVE} 
    … …  
    8891if [ ! -f ${SUBMIT_DIR}/run.card ]; then  
    8992    echo "You seem NOT to have a run.card in this directory !!" 
    90     echo "This script will fail because it doesn't know what to do without run.card avaible." 
     93    echo "This script will fail because it doesn't know what to do without run.card available." 
    9194    exit 1 
    9295else 
    … …  
    104107    set +A ListFiles -- $( IGCM_sys_RshArchive "find ${R_SAVE} -name \"*${PeriodDateEnd}*\" " ) 
    105108    CountListFiles=${#ListFiles[@]} 
     109 
     110    echo "Search files with ${PeriodDateEnd} in ${R_BUFR}" 
     111    set +A ListFilesBuf -- $( IGCM_sys_RshMaster "find ${R_BUFR} -name \"*${PeriodDateEnd}*\" " ) 
     112    CountListFilesBuf=${#ListFilesBuf[@]} 
    106113 
    107114    # If exist, erase REBUILD DIR 
    … …  
    124131            IGCM_debug_Print 2 -e "\033[1;31m ${file}\033[m" 
    125132        done 
     133        for file in ${ListFilesBuf[@]} ; do 
     134            IGCM_debug_Print 2 -e "\033[1;31m ${file}\033[m" 
     135        done 
    126136 
    127         echo "\033[1;32mDo you REALLY want to erase all those files ?" 
    128         echo -n " Your answer (y/n) : \033[m" 
     137        echo -e "\033[1;32mDo you REALLY want to erase all those files ?" 
     138        echo -n -e " Your answer (y/n) : \033[m" 
    129139        read reponse 
    130140        case ${reponse} in 
    … …  
    133143                echo "OK. It will be erased." 
    134144                IGCM_sys_RshArchive "find ${R_SAVE} -name \"*${PeriodDateEnd}*\" -exec rm -f '{}' \;" 
     145                IGCM_sys_RshMaster  "find ${R_BUFR} -name \"*${PeriodDateEnd}*\" -exec rm -f '{}' \;" 
    135146                echo "done." 
    136147                ;; 
    … …  
    147158        done 
    148159 
    149         echo "\033[1;32mDo you REALLY want to erase all those Directories ?" 
    150         echo -n " Your answer (y/n) : \033[m" 
     160        echo -e "\033[1;32mDo you REALLY want to erase all those Directories ?" 
     161        echo -n -e " Your answer (y/n) : \033[m" 
    151162        read reponse 
    152163        case ${reponse} in 

  • trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

    r544 r545  
    966966        elif [ ${nb_rebuild_file} -gt 1 ] ; then 
    967967          IGCM_debug_Print 2 "Parallelism detected rebuilding ${file_in} is needed" 
    968           if ( [ X${config_Post_RebuildFrequency} = X${NULL_STR} ] || [ X${config_Post_RebuildFrequency} = XNONE ] ) ; then 
     968          if [ X${AsynchronousRebuild} = Xfalse ] ; then 
    969969            IGCM_debug_Print 2 "Rebuilding ${file_in} online" 
    970970            IGCM_sys_rebuild ${file_in} ${generic_file_name}_*.nc 
    … …  
    10161016        if [ ${SaveOnArchive} = true ] ; then 
    10171017          # 
     1018          # Rebuild has been done online or it was not needed 
     1019          # 
    10181020          # If we need to apply a patch we use TMP DIRECTORY before ARCHIVING if asynchronous rebuild is on 
    10191021          # 
    10201022          thereisapatch=$( eval echo \${${compname}_${flag_post}_Patches[0]} ) 
    1021            
    1022           if ( [ ! X${thereisapatch} = X${NULL_STR} ] && [ ! X${config_Post_RebuildFrequency} = X ] && [ ! X${config_Post_RebuildFrequency} = XNONE ] ) ; then 
    1023             if [ -f ${file_in} ] ; then 
    1024               [ ! -d ${RUN_DIR}/REBUILD_${PeriodDateBegin} ] && IGCM_sys_Mkdir ${RUN_DIR}/REBUILD_${PeriodDateBegin} 
    1025  
    1026               IGCM_sys_Mv ${file_in} ${RUN_DIR}/REBUILD_${PeriodDateBegin} 
    1027               eval FileToBeDeleted[${#FileToBeDeleted[@]}]=REBUILD_${PeriodDateBegin}/${file_in} > /dev/null 2>&1 
     1023          if ( [ ! X${thereisapatch} = X${NULL_STR} ] && [ X${AsynchronousRebuild} = Xtrue ] && [ -f ${file_in} ] ) ; then 
     1024            [ ! -d ${RUN_DIR}/REBUILD_${PeriodDateBegin} ] && IGCM_sys_Mkdir ${RUN_DIR}/REBUILD_${PeriodDateBegin} 
     1025            IGCM_sys_Mv ${file_in} ${RUN_DIR}/REBUILD_${PeriodDateBegin} 
     1026            eval FileToBeDeleted[${#FileToBeDeleted[@]}]=REBUILD_${PeriodDateBegin}/${file_in} > /dev/null 2>&1 
     1027            # 
     1028            if [ $DRYRUN -le 1 ]; then 
     1029              if [ ! -f ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh ] ; then 
     1030                echo "#!/bin/ksh                                      " >  ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1031                echo "function IGCM_FlushRebuild                      " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1032                echo "{                                               " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1033                echo "IGCM_debug_PushStack \"IGCM_FlushRebuild\"      " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1034                echo "echo                                            " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1035                echo "IGCM_debug_Print 1 \"IGCM_FlushRebuild\"        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1036                echo "echo                                            " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1037                echo "export R_SAVE=${R_SAVE}                         " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1038                echo "export config_UserChoices_JobName=${config_UserChoices_JobName} " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1039              fi 
     1040              # 
     1041              for Patch in $( eval echo \${${compname}_${flag_post}_Patches[*]} ); do 
     1042                echo ". ${libIGCM_POST}/libIGCM_post/IGCM_${Patch}.ksh" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1043                echo "IGCM_${Patch} ${file_in}                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1044                echo "IGCM_debug_Verif_Exit_Post                      " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1045              done 
    10281046              # 
    1029               if [ $DRYRUN -le 1 ]; then 
    1030                 if [ ! -f ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh ] ; then 
    1031                   echo "#!/bin/ksh                                      " >  ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1032                   echo "function IGCM_FlushRebuild                      " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1033                   echo "{                                               " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1034                   echo "IGCM_debug_PushStack \"IGCM_FlushRebuild\"      " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1035                   echo "echo                                            " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1036                   echo "IGCM_debug_Print 1 \"IGCM_FlushRebuild\"        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1037                   echo "echo                                            " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1038                   echo "export R_SAVE=${R_SAVE}                         " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1039                   echo "export config_UserChoices_JobName=${config_UserChoices_JobName} " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1040                 fi 
    1041                 # 
    1042                 for Patch in $( eval echo \${${compname}_${flag_post}_Patches[*]} ); do 
    1043                   echo ". ${libIGCM_POST}/libIGCM_post/IGCM_${Patch}.ksh" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1044                   echo "IGCM_${Patch} ${file_in}                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1045                   echo "IGCM_debug_Verif_Exit_Post                      " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1046                 done 
    1047                 # 
    1048                 echo "IGCM_sys_Put_Out ${file_in} ${file_out}           " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1049                 echo "IGCM_debug_Verif_Exit_Post                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1050                 # 
    1051               fi 
     1047              echo "IGCM_sys_Put_Out ${file_in} ${file_out}           " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1048              echo "IGCM_debug_Verif_Exit_Post                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
     1049              # 
    10521050            fi 
    10531051          else 
    1054             [ ! -d ${RUN_DIR}/REBUILD_${PeriodDateBegin} ] && IGCM_sys_Mkdir ${RUN_DIR}/REBUILD_${PeriodDateBegin} 
    1055             if [ ! -f ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh ] ; then 
    1056               echo "#!/bin/ksh                                          " >  ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1057               echo "function IGCM_FlushRebuild                          " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1058               echo "{                                                   " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1059               echo "IGCM_debug_PushStack \"IGCM_FlushRebuild\"          " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1060               echo "echo                                                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1061               echo "IGCM_debug_Print 1 \"IGCM_FlushRebuild\"            " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1062               echo "echo                                                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1063               echo "export R_SAVE=${R_SAVE}                             " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1064               echo "export config_UserChoices_JobName=${config_UserChoices_JobName} " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh 
    1065             fi 
    1066  
     1052            # 
     1053            # No Patch, No Asynchronous rebuild, online rebuild has been done or was not needed 
     1054            # 
    10671055            IGCM_sys_Put_Out ${file_in} ${file_out} 
    10681056            eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${file_in}" > /dev/null 2>&1 

  • trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

    r544 r545  
    197197    IGCM_sys_TestDir        ${R_BUFR} 
    198198    [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDir ${R_BUFR}" 
     199 
    199200    #Test state of run in run.card 
    200201    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodState 
    … …  
    340341  typeset i 
    341342 
    342   if ( [ ! X${config_Post_RebuildFrequency} = X${NULL_STR} ] || [ ! X${config_Post_RebuildFrequency} = XNONE ] ) ; then 
     343  if ( [ ! X${config_Post_RebuildFrequency} = X${NULL_STR} ] && [ ! X${config_Post_RebuildFrequency} = XNONE ] ) ; then 
    343344    AsynchronousRebuild=true 
    344345    IGCM_debug_Print 1 "Asynchronous rebuild has been activated." 
    … …  
    595596  listVarEnv="ExeOutDateMax,R_OUT_EXE,PREFIX,SUBMIT_DIR" 
    596597  IGCM_sys_RshMaster "\ 
    597        . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh; \ 
     598    . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh; \ 
    598599    export ExeOutDateMax=${ExeOutDateMax};\ 
    599        export R_OUT_EXE=${R_OUT_EXE};\ 
    600        export PREFIX=${PREFIX};\ 
    601        export SUBMIT_DIR=${SUBMIT_DIR};\ 
    602        export listVarEnv=${listVarEnv};\ 
    603        Script_Output=out_SaveSourceModifications;\ 
    604        IGCM_sys_Qsub ${libIGCM}/SaveSourceModifications.job ${ExeOutDateMax} ${R_OUT_EXE} ${PREFIX} ${SUBMIT_DIR}" 
     600    export R_OUT_EXE=${R_OUT_EXE};\ 
     601    export PREFIX=${PREFIX};\ 
     602    export SUBMIT_DIR=${SUBMIT_DIR};\ 
     603    export listVarEnv=${listVarEnv};\ 
     604    Script_Output=out_SaveSourceModifications;\ 
     605    IGCM_sys_Qsub ${libIGCM}/SaveSourceModifications.job ${ExeOutDateMax} ${R_OUT_EXE} ${PREFIX} ${SUBMIT_DIR}" 
    605606 
    606607  IGCM_debug_PopStack "IGCM_config_SaveSourceModifications" 

  • trunk/libIGCM/libIGCM_post/libIGCM_post.ksh

    r544 r545  
    4545  # Overrule special cases 
    4646  if ( [ ! X${config_Post_TimeSeriesFrequency} = X${NULL_STR} ] && \ 
    47     [ ! X${config_Post_TimeSeriesFrequency} = XNONE ]        && \ 
     47    [ ! X${config_Post_TimeSeriesFrequency} = XNONE ]           && \ 
    4848    [ ${SimulationLengthInDays} -ge ${ExperienceLengthInDays} ] ) ; then 
    4949    TimeSeriesFrequency=true 
    … …  
    5151  fi 
    5252  # 
    53   if ( [ ! X${config_Post_RebuildFrequency} = X${NULL_STR} ] && \ 
    54     [ ! X${config_Post_RebuildFrequency} = XNONE ]        && \ 
    55     [ ${SimulationLengthInDays} -ge ${ExperienceLengthInDays} ] ) ; then 
     53  if ( [ X${AsynchronousRebuild} = Xtrue ] && [ ${SimulationLengthInDays} -ge ${ExperienceLengthInDays} ] ) ; then 
    5654    RebuildFrequency=true 
    5755    POST=true 
    … …  
    9593  typeset listVarEnv 
    9694 
    97   POST_DIR=${R_OUT_POST}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    98  
     95  #POST_DIR=${R_OUT_POST}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     96  POST_DIR=${R_BUF_KSH} 
    9997  if [ ${POST} = true ]; then 
    10098    echo 
    … …  
    409407 
    410408  #============== REBUILD POST-TREATMENT =============# 
    411   if ( [ ! X${config_Post_RebuildFrequency} = X${NULL_STR} ] && [ ! X${config_Post_RebuildFrequency} = XNONE ] ) ; then 
     409  if [ X${AsynchronousRebuild} = Xtrue ] ; then 
    412410    # ----------------------------------------------------------------------------------- 
    413411    # Function IGCM_FlushRebuild define in rebuild.ksh has not been closed yet. Do it now 
    … …  
    578576      fi ;; 
    579577    esac ;; 
    580   NONE|none)  
     578  NONE|none) 
    581579    ;; 
    582580  *) 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

    r544 r545  
    117117#==================================================== 
    118118#- IN 
    119 typeset -r R_IN=${R_IN:=/dmnfs/cont003/p86ipsl/IGCM} 
     119typeset -r R_IN=${R_IN:=/ccc/work/cont003/dsm/p86ipsl/IGCM} 
    120120typeset -r R_IN_ECMWF=${R_IN_ECMWF:=/dmnfs/cont003/p24data} 
    121121 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

    r544 r545  
    107107#==================================================== 
    108108#- IN 
    109 typeset -r R_IN=${R_IN:=/dmnfs/cont003/p86ipsl/IGCM} 
     109typeset -r R_IN=${R_IN:=/ccc/work/cont003/dsm/p86ipsl/IGCM} 
    110110typeset -r R_IN_ECMWF=${R_IN_ECMWF:=/dmnfs/cont003/p24data} 
    111111 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex8.ksh

    r544 r545  
    133133#==================================================== 
    134134#- IN 
    135 typeset -r R_IN=${R_IN:=/dmnfs/cont003/p86ipsl/IGCM} 
     135typeset -r R_IN=${R_IN:=/ccc/work/cont003/dsm/p86ipsl/IGCM} 
    136136typeset -r R_IN_ECMWF=${R_IN_ECMWF:=/dmnfs/cont003/p24data} 
    137137 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

    r544 r545  
    133133#==================================================== 
    134134#- IN 
    135 typeset -r R_IN=${R_IN:=/dmnfs/cont003/p86ipsl/IGCM} 
     135typeset -r R_IN=${R_IN:=/ccc/work/cont003/dsm/p86ipsl/IGCM} 
    136136typeset -r R_IN_ECMWF=${R_IN_ECMWF:=/dmnfs/cont003/p24data} 
    137137 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

    r544 r545  
    9292. /home/cont003/p86ipsl/.atlas_env_titane_ksh 
    9393 
     94module switch nco/4.0.8 nco/3.9.4_netcdf4 
     95 
    9496#==================================================== 
    9597# Specific for ocean additionnal diagnostic 
    … …  
    145147#==================================================== 
    146148#- IN 
    147 typeset -r R_IN=${R_IN:=/dmnfs/cont003/p86ipsl/IGCM} 
     149typeset -r R_IN=${R_IN:=/ccc/work/cont003/dsm/p86ipsl/IGCM} 
    148150typeset -r R_IN_ECMWF=${R_IN_ECMWF:=/dmnfs/cont003/p24data} 
    149151 
Note: See TracChangeset for help on using the changeset viewer.