Changeset 746 for CONFIG/LMDZOR


Ignore:
Timestamp:
09/25/09 14:59:15 (12 years ago)
Author:
mafoipsl
Message:

Delete all Bands files in PARAM directories. Add in lmdz.driver everything concerning Bands. Add in lmdz.card LMDZ_NbPeriod_adjust parameter.

Location:
CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR
Files:
16 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.card

    r725 r746  
    99CREATE=ELC-${RESOL_ATM_3D} 
    1010 
    11 # Par default, adjust=n in run.def 
    12 LMDZ_adjust = n 
     11# adjust=y during LMDZ_NbPeriod_adjust Period, adjust=n after LMDZ_NbPeriod_adjust 
     12LMDZ_NbPeriod_adjust=3 
    1313 
    1414[InitialStateFiles] 
     
    4444        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D}, gcm.def), \ 
    4545        (${SUBMIT_DIR}/PARAM/run.def, .), \ 
    46         (${SUBMIT_DIR}/PARAM/traceur.def, .), \ 
    47         (${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat, .) 
     46        (${SUBMIT_DIR}/PARAM/traceur.def, .) 
    4847 
    4948[RestartFiles] 
     
    5251 
    5352[OutputText] 
    54 List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat) 
     53List=   (physiq.def, gcm.def, run.def, traceur.def) 
    5554 
    5655[OutputFiles] 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.card_Interannuel

    r725 r746  
    99CREATE=ELI-${RESOL_ATM_3D} 
    1010 
    11 # Par default, adjust=n in run.def 
    12 LMDZ_adjust = n 
     11# adjust=y during LMDZ_NbPeriod_adjust Period, adjust=n after LMDZ_NbPeriod_adjust 
     12LMDZ_NbPeriod_adjust=3 
    1313 
    1414[InitialStateFiles] 
     
    6464        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D}, gcm.def), \ 
    6565        (${SUBMIT_DIR}/PARAM/run.def, .), \ 
    66         (${SUBMIT_DIR}/PARAM/traceur.def, .), \ 
    67         (${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat, .) 
     66        (${SUBMIT_DIR}/PARAM/traceur.def, .) 
    6867 
    6968[RestartFiles] 
     
    7271 
    7372[OutputText] 
    74 List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat) 
     73List=   (physiq.def, gcm.def, run.def, traceur.def) 
    7574 
    7675[OutputFiles] 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.driver

    r711 r746  
    5656    PAT_day_step=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep day_step ) 
    5757 
    58     ## Read LMDZ_adjust option in ${compname}.card --> put adjust=y and save Bands_*.dat in ${SUBMIT_DIR}/PARAM 
    59     IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/${compname}.card UserChoices LMDZ_adjust 
    60     eval LMDZ_adjust=\${${compname}_UserChoices_LMDZ_adjust} > /dev/null 2>&1 
     58    ## Read LMDZ_NbPeriod_adjust option in ${compname}.card  
     59    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/${compname}.card UserChoices LMDZ_NbPeriod_adjust 
     60    eval LMDZ_NbPeriod_adjust=\${${compname}_UserChoices_LMDZ_NbPeriod_adjust} > /dev/null 2>&1 
     61     
     62    ## algo : CumulPeriod=1 ; LMDZ_adjust=y ; save Bands file on file server ; 
     63    ##        For CumulPeriod=2 to LMDZ_NbPeriod_adjust ; Fetch Bands file from server (CumulPeriod-1) ; LMDZ_adjust=y ; save Bands file on file server ; 
     64    ##        For CumulPeriod > LMDZ_NbPeriod_adjust ; LMDZ_adjust=n ; Fetch Bands file from server (CumulPeriod=LMDZ_NbPeriod_adjust) ; Use Bands ; 
    6165 
    6266    ##-- This could be define in lmdz.card, inside section [UserChoices] 
     
    6771    #(( day_step = 48 * iphysiq )) 
    6872    day_step=$( echo ${PAT_day_step} | awk -F= '{print $2}' ) 
    69  
    70     #[ -f ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat . 
    7173 
    7274    IGCM_debug_PopStack "ATM_Initialize" 
     
    8688        RAZ_DATE=0 
    8789    fi 
     90 
     91    LMDZ_adjust=n 
     92    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && LMDZ_adjust=y 
     93 
     94    RefPeriod=${LMDZ_NbPeriod_adjust} 
     95    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && (( RefPeriod = ${CumulPeriod} - 1 )) 
     96 
     97    [ ${CumulPeriod} -gt 1 ] && IGCM_sys_Get ${R_OUT_ATM_D}/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${RefPeriod} Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat 
    8898 
    8999    ## Mise en forme du fichier physiq.def 
     
    120130    IGCM_debug_PushStack "ATM_Finalize" 
    121131 
    122     [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM 
     132    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && IGCM_sys_Put_Out Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${R_OUT_ATM_D}/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${CumulPeriod} 
    123133 
    124134    echo FINALIZE ATM ! 
Note: See TracChangeset for help on using the changeset viewer.