Changeset 745


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

Delete all Bands files in PARAM-AR4 directory. Add in lmdz.driver everything concerning Bands. Add in lmdz.card(_Interannuel) LMDZ_NbPeriod_adjust parameter.

Location:
CONFIG/LMDZ/branches/LMDZ4/LMDZ
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/LMDZ/branches/LMDZ4/LMDZ/COMP/lmdz.card

    r724 r745  
    1414# PARAM-new to come : will represent the "new physics" in LMDZ 
    1515 
    16 # Par default, adjust=n in run.def 
    17 LMDZ_adjust = n 
     16# adjust=y during LMDZ_NbPeriod_adjust Period, adjust=n after LMDZ_NbPeriod_adjust 
     17LMDZ_NbPeriod_adjust=3 
    1818 
    1919[InitialStateFiles] 
    … …  
    7070        (${SUBMIT_DIR}/${PARAM}/gcm.def_${RESOL_ATM_3D}, gcm.def), \ 
    7171        (${SUBMIT_DIR}/${PARAM}/run.def, .), \ 
    72         (${SUBMIT_DIR}/${PARAM}/traceur.def, .), \ 
    73         (${SUBMIT_DIR}/${PARAM}/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat, .) 
     72        (${SUBMIT_DIR}/${PARAM}/traceur.def, .) 
    7473 
    7574[RestartFiles] 
    … …  
    7877 
    7978[OutputText] 
    80 List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat) 
     79List=   (physiq.def, gcm.def, run.def, traceur.def) 
    8180 
    8281[OutputFiles] 

  • CONFIG/LMDZ/branches/LMDZ4/LMDZ/COMP/lmdz.card_Interannuel

    r724 r745  
    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/LMDZ/branches/LMDZ4/LMDZ/COMP/lmdz.driver

    r699 r745  
    5353    PAT_iperiod=$(  grep -v ^# ${SUBMIT_DIR}/${PARAM}/gcm.def_${RESOL_ATM_3D} | grep iperiod  ) 
    5454 
    55     ## Read LMDZ_adjust option in ${compname}.card --> put adjust=y and save Bands_*.dat in ${SUBMIT_DIR}/${PARAM} 
    56     IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/${compname}.card UserChoices LMDZ_adjust 
    57     eval LMDZ_adjust=\${${compname}_UserChoices_LMDZ_adjust} > /dev/null 2>&1 
     55    ## Read LMDZ_NbPeriod_adjust option in ${compname}.card  
     56    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/${compname}.card UserChoices LMDZ_NbPeriod_adjust 
     57    eval LMDZ_NbPeriod_adjust=\${${compname}_UserChoices_LMDZ_NbPeriod_adjust} > /dev/null 2>&1 
     58     
     59    ## algo : CumulPeriod=1 ; LMDZ_adjust=y ; save Bands file on file server ; 
     60    ##        For CumulPeriod=2 to LMDZ_NbPeriod_adjust ; Fetch Bands file from server (CumulPeriod-1) ; LMDZ_adjust=y ; save Bands file on file server ; 
     61    ##        For CumulPeriod > LMDZ_NbPeriod_adjust ; LMDZ_adjust=n ; Fetch Bands file from server (CumulPeriod=LMDZ_NbPeriod_adjust) ; Use Bands ; 
    5862 
    5963    ##-- This could be define in lmdz.card, inside section [UserChoices] 
    … …  
    7882        RAZ_DATE=0 
    7983    fi 
     84 
     85    LMDZ_adjust=n 
     86    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && LMDZ_adjust=y 
     87 
     88    RefPeriod=${LMDZ_NbPeriod_adjust} 
     89    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && (( RefPeriod = ${CumulPeriod} - 1 )) 
     90 
     91    [ ${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 
    8092 
    8193    ## Mise en forme du fichier physiq.def 
    … …  
    111123    IGCM_debug_PushStack "ATM_Finalize" 
    112124 
    113     [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/${PARAM} 
     125    [ ${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} 
    114126 
    115127    echo FINALIZE ATM ! 
Note: See TracChangeset for help on using the changeset viewer.