Changeset 154


Ignore:
Timestamp:
10/01/07 11:40:06 (14 years ago)
Author:
sdipsl
Message:

Bug correction : NWRITE and NWRITEHF was not properly handle. OPA can output two differents write frequency, opa.card take it in account. IPSLCM4_v2 can now run with PeriodLength?=1Y in config.card

Location:
CONFIG/trunk/IPSLCM4_v2/EXP00/COMP
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/lim.card

    r63 r154  
    2323 
    2424[OutputFiles] 
    25 List=   (${PREFIX_MO}_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod), \ 
    26         (${PREFIX_5D}_icemod.nc, ${R_OUT_ICE_O_D}/${PREFIX}_5D_icemod.nc, NONE), \ 
    27         (${PREFIX_DA}_icemod.nc, ${R_OUT_ICE_O_D}/${PREFIX}_1D_icemod.nc, NONE) 
     25List=   (${PREFIX_OPA}_${DATE_OPA}_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod) 
    2826 
    2927[Post_1M_icemod] 
  • CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/lim.driver

    r41 r154  
    2121    ##-- MUST BE DONE AFTER OCE_UPDATE 
    2222 
    23     (( ICE_NSTOCK = ORCA_NSTOCK )) 
    24     ## I PREFER (( ICE_NSTOCK = ORCA_NWRITE )) 
    25     ## BUT      (( ICE_NSTOCK = ORCA_NSTOCK )) is in AA_job 
     23    (( ICE_NSTOCK = ORCA_NWRITE )) 
    2624 
    2725    ##-- Restart configuration 
  • CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/opa.card

    r90 r154  
    2626 
    2727[OutputFiles] 
    28 List=   (${PREFIX_MO}_grid_T.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc, Post_1M_grid_T),\ 
    29         (${PREFIX_MO}_grid_U.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc, Post_1M_grid_U) ,\ 
    30         (${PREFIX_MO}_grid_V.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc, Post_1M_grid_V),\ 
    31         (${PREFIX_MO}_grid_W.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc, Post_1M_grid_W),\ 
    32         (${PREFIX_MO}_diaznl.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_diaznl.nc, Post_1M_diaznl),\ 
    33         (${PREFIX_MO}_S_tren.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_S_tren.nc, NONE),\ 
    34         (${PREFIX_MO}_T_tren.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_T_tren.nc, NONE),\ 
    35         (${PREFIX_MO}_trends.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_trends.nc, NONE),\ 
    36         (${PREFIX_MO}_diagap.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_diagap.nc, NONE),\ 
    37         (${PREFIX_5D}_grid_T.nc, ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_T.nc, NONE),\ 
    38         (${PREFIX_5D}_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_U.nc, NONE),\ 
    39         (${PREFIX_5D}_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_V.nc, NONE),\ 
    40         (${PREFIX_5D}_grid_W.nc, ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_W.nc, NONE),\ 
    41         (${PREFIX_5D}_diaznl.nc, ${R_OUT_OCE_O_D}/${PREFIX}_5D_diaznl.nc, NONE),\ 
    42         (${PREFIX_DA}_grid_T.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_T.nc, NONE),\ 
    43         (${PREFIX_DA}_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc, NONE),\ 
    44         (${PREFIX_DA}_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_V.nc, NONE),\ 
    45         (${PREFIX_DA}_grid_W.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_W.nc, NONE),\ 
    46         (${PREFIX_DA}_diaznl.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_diaznl.nc, NONE) 
     28List=   (${PREFIX_OPA}_${DATE_OPA}_grid_T.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc, Post_1M_grid_T),\ 
     29        (${PREFIX_OPA}_${DATE_OPA}_grid_U.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc, Post_1M_grid_U) ,\ 
     30        (${PREFIX_OPA}_${DATE_OPA}_grid_V.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc, Post_1M_grid_V),\ 
     31        (${PREFIX_OPA}_${DATE_OPA}_grid_W.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc, Post_1M_grid_W),\ 
     32        (${PREFIX_OPA}_${DATE_OPA}_diaznl.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_diaznl.nc, Post_1M_diaznl),\ 
     33        (${PREFIX_OPA}_${DATE_OPA}_S_tren.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_S_tren.nc, NONE),\ 
     34        (${PREFIX_OPA}_${DATE_OPA}_T_tren.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_T_tren.nc, NONE),\ 
     35        (${PREFIX_OPA}_${DATE_OPA}_trends.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_trends.nc, NONE),\ 
     36        (${PREFIX_OPA}_${DATE_OPA}_diagap.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_diagap.nc, NONE),\ 
     37        (${PREFIX_HF}_${DATE_OPA}_grid_T.nc,  ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_T.nc, NONE),\ 
     38        (${PREFIX_HF}_${DATE_OPA}_grid_U.nc,  ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_U.nc, NONE),\ 
     39        (${PREFIX_HF}_${DATE_OPA}_grid_V.nc,  ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_V.nc, NONE) 
    4740 
    4841[Post_1M_grid_T] 
  • CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/opa.driver

    r41 r154  
    6060    IGCM_debug_PushStack "OCE_Update" 
    6161 
     62    NbFreq=$( echo ${config_OCE_WriteFrequency} | wc -w ) 
     63 
    6264    ##--Write Frequency Purpose .... 
    63     for frequency in ${config_OCE_WriteFrequency} ; do 
     65    frequency=$( echo ${config_OCE_WriteFrequency} | awk "-F " '{print $1}' ) 
     66 
     67    case ${frequency} in 
     68        1Y|1y) 
     69            (( ORCA_NWRITE = ORCA_NPDT_JOUR * $( IGCM_date_DaysInYear  ${year} ) ))          ; 
     70            PREFIX_OPA=${config_UserChoices_JobName}_1y ;; 
     71        1M|1m) 
     72            (( ORCA_NWRITE = ORCA_NPDT_JOUR * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ; 
     73            PREFIX_OPA=${config_UserChoices_JobName}_1m ;; 
     74        *D|*d) 
     75            (( ORCA_NWRITE = ORCA_NPDT_JOUR * $( echo ${frequency} | sed -e "s/[dD]//" ) ))  ; 
     76            PREFIX_OPA=${config_UserChoices_JobName}_$( echo ${frequency} | sed -e "s/[dD]//" )d ;; 
     77        *) 
     78            (( ORCA_NWRITE = 0 ))                                                            ;; 
     79    esac 
     80 
     81    ##--Write Frequency Purpose .... concerning the second opa file type. 
     82    if [ ${NbFreq} -eq 2 ] ; then 
     83        frequency=$( echo ${config_OCE_WriteFrequency} | awk "-F " '{print $2}' ) 
    6484        case ${frequency} in 
    65             5D|5d) (( ORCA_NWRIHF=ORCA_NPDT_JOUR*5 )) ;; 
    66             1D|1d) (( ORCA_NWRIHF=ORCA_NPDT_JOUR )) ;; 
    67             *)     (( ORCA_NWRIHF=0 )) ;; 
     85            1Y|1y) 
     86                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * $( IGCM_date_DaysInYear  ${year} ) ))          ; 
     87                PREFIX_HF=${config_UserChoices_JobName}_1y ;; 
     88            1M|1m) 
     89                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ; 
     90                PREFIX_HF=${config_UserChoices_JobName}_1m ;; 
     91            *D|*d) 
     92                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * $( echo ${frequency} | sed -e "s/[dD]//" ) ))  ; 
     93                PREFIX_HF=${config_UserChoices_JobName}_$( echo ${frequency} | sed -e "s/[dD]//" )d ;; 
     94            *) 
     95                (( ORCA_NWRIHF = 0 ))                                                            ;; 
    6896        esac 
    69     done 
    70  
    71     (( ORCA_NWRITE = ORCA_NPDT_JOUR * PeriodLengthInDays )) 
     97    else 
     98        ORCA_NWRIHF=0 
     99    fi 
    72100 
    73101    # Period Length In Days between DateBegin and first day of calendar 0001 01 01 
     
    150178        DATE_OPA=$( cat date.file | \ 
    151179            sed "s/\ ${config_UserChoices_JobName}_[0-9]*[a-z]_\([0-9]*_[0-9]*\)_output\ */\1/g" ) 
    152         PREFIX_DA=${config_UserChoices_JobName}_1d_${DATE_OPA} 
    153         PREFIX_5D=${config_UserChoices_JobName}_5d_${DATE_OPA} 
    154         PREFIX_MO=${config_UserChoices_JobName}_1m_${DATE_OPA} 
     180 
     181        MainPrefix=${config_UserChoices_JobName}_1d_${DATE_OPA} 
     182        SecondPrefix=${config_UserChoices_JobName}_5d_${DATE_OPA} 
    155183    fi 
    156184 
Note: See TracChangeset for help on using the changeset viewer.