Changeset 1923


Ignore:
Timestamp:
11/15/12 18:06:49 (9 years ago)
Author:
jgipsl
Message:

Corrected bug affecting create_etat0_limit for leap calendar.

Location:
CONFIG/UNIFORM/v5
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/GENERAL/DRIVER/lmdz.driver

    r1897 r1923  
    4949    RESOL_ATM_XY="${RESOL_ATM_X}x${RESOL_ATM_Y}" 
    5050 
    51     ##-- Calendar type for LMDZ 
     51    ##-- Calendar type for LMDZ and create_etat0_limit 
    5252    case ${config_UserChoices_CalendarType} in 
    5353        leap|gregorian) 
    54             CalendarTypeForLmdz=earth_366d;; 
     54            CalendarTypeForLmdz=earth_366d 
     55            CalendarTypeForCreate=gregorian;; 
    5556        noleap) 
    56             CalendarTypeForLmdz=earth_365d;; 
     57            CalendarTypeForLmdz=earth_365d 
     58            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5759        360d) 
    58             CalendarTypeForLmdz=earth_360d;; 
     60            CalendarTypeForLmdz=earth_360d 
     61            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5962        *) 
    6063            CalendarTypeForLmdz=earth_360d 
     64            CalendarTypeForCreate=${CalendarTypeForLmdz} 
    6165    esac 
    6266 
     
    329333    ## run.def parameters 
    330334    LMDZ_sed run.def dayref   ${InitDay} 
    331     LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    332335    LMDZ_sed run.def nday     ${PeriodLengthInDays} 
    333336    LMDZ_sed run.def raz_date ${RAZ_DATE} 
     
    336339 
    337340    # Set anneeref different for gcm and ce0l 
     341    # Variable calend is different for a run with create_etat0_limit and the gcm 
    338342    # Test if executable create_etat0_limit is present and lmdz.x is not present 
    339343    if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then 
    340344        # for case ce0l : always take current year 
    341345        LMDZ_sed run.def anneeref ${year} 
     346        LMDZ_sed run.def calend   ${CalendarTypeForCreate} 
    342347    else 
    343348        # for case gcm : take first year of simulation 
    344349        LMDZ_sed run.def anneeref ${InitYear} 
     350        LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    345351    fi 
    346352 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/GENERAL/DRIVER/lmdz.driver

    r1897 r1923  
    4949    RESOL_ATM_XY="${RESOL_ATM_X}x${RESOL_ATM_Y}" 
    5050 
    51     ##-- Calendar type for LMDZ 
     51    ##-- Calendar type for LMDZ and create_etat0_limit 
    5252    case ${config_UserChoices_CalendarType} in 
    5353        leap|gregorian) 
    54             CalendarTypeForLmdz=earth_366d;; 
     54            CalendarTypeForLmdz=earth_366d 
     55            CalendarTypeForCreate=gregorian;; 
    5556        noleap) 
    56             CalendarTypeForLmdz=earth_365d;; 
     57            CalendarTypeForLmdz=earth_365d 
     58            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5759        360d) 
    58             CalendarTypeForLmdz=earth_360d;; 
     60            CalendarTypeForLmdz=earth_360d 
     61            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5962        *) 
    6063            CalendarTypeForLmdz=earth_360d 
     64            CalendarTypeForCreate=${CalendarTypeForLmdz} 
    6165    esac 
    6266 
     
    329333    ## run.def parameters 
    330334    LMDZ_sed run.def dayref   ${InitDay} 
    331     LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    332335    LMDZ_sed run.def nday     ${PeriodLengthInDays} 
    333336    LMDZ_sed run.def raz_date ${RAZ_DATE} 
     
    336339 
    337340    # Set anneeref different for gcm and ce0l 
     341    # Variable calend is different for a run with create_etat0_limit and the gcm 
    338342    # Test if executable create_etat0_limit is present and lmdz.x is not present 
    339343    if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then 
    340344        # for case ce0l : always take current year 
    341345        LMDZ_sed run.def anneeref ${year} 
     346        LMDZ_sed run.def calend   ${CalendarTypeForCreate} 
    342347    else 
    343348        # for case gcm : take first year of simulation 
    344349        LMDZ_sed run.def anneeref ${InitYear} 
     350        LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    345351    fi 
    346352 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/GENERAL/DRIVER/lmdz.driver

    r1897 r1923  
    4949    RESOL_ATM_XY="${RESOL_ATM_X}x${RESOL_ATM_Y}" 
    5050 
    51     ##-- Calendar type for LMDZ 
     51    ##-- Calendar type for LMDZ and create_etat0_limit 
    5252    case ${config_UserChoices_CalendarType} in 
    5353        leap|gregorian) 
    54             CalendarTypeForLmdz=earth_366d;; 
     54            CalendarTypeForLmdz=earth_366d 
     55            CalendarTypeForCreate=gregorian;; 
    5556        noleap) 
    56             CalendarTypeForLmdz=earth_365d;; 
     57            CalendarTypeForLmdz=earth_365d 
     58            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5759        360d) 
    58             CalendarTypeForLmdz=earth_360d;; 
     60            CalendarTypeForLmdz=earth_360d 
     61            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5962        *) 
    6063            CalendarTypeForLmdz=earth_360d 
     64            CalendarTypeForCreate=${CalendarTypeForLmdz} 
    6165    esac 
    6266 
     
    329333    ## run.def parameters 
    330334    LMDZ_sed run.def dayref   ${InitDay} 
    331     LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    332335    LMDZ_sed run.def nday     ${PeriodLengthInDays} 
    333336    LMDZ_sed run.def raz_date ${RAZ_DATE} 
     
    336339 
    337340    # Set anneeref different for gcm and ce0l 
     341    # Variable calend is different for a run with create_etat0_limit and the gcm 
    338342    # Test if executable create_etat0_limit is present and lmdz.x is not present 
    339343    if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then 
    340344        # for case ce0l : always take current year 
    341345        LMDZ_sed run.def anneeref ${year} 
     346        LMDZ_sed run.def calend   ${CalendarTypeForCreate} 
    342347    else 
    343348        # for case gcm : take first year of simulation 
    344349        LMDZ_sed run.def anneeref ${InitYear} 
     350        LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    345351    fi 
    346352 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/GENERAL/DRIVER/lmdz.driver

    r1897 r1923  
    4949    RESOL_ATM_XY="${RESOL_ATM_X}x${RESOL_ATM_Y}" 
    5050 
    51     ##-- Calendar type for LMDZ 
     51    ##-- Calendar type for LMDZ and create_etat0_limit 
    5252    case ${config_UserChoices_CalendarType} in 
    5353        leap|gregorian) 
    54             CalendarTypeForLmdz=earth_366d;; 
     54            CalendarTypeForLmdz=earth_366d 
     55            CalendarTypeForCreate=gregorian;; 
    5556        noleap) 
    56             CalendarTypeForLmdz=earth_365d;; 
     57            CalendarTypeForLmdz=earth_365d 
     58            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5759        360d) 
    58             CalendarTypeForLmdz=earth_360d;; 
     60            CalendarTypeForLmdz=earth_360d 
     61            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5962        *) 
    6063            CalendarTypeForLmdz=earth_360d 
     64            CalendarTypeForCreate=${CalendarTypeForLmdz} 
    6165    esac 
    6266 
     
    329333    ## run.def parameters 
    330334    LMDZ_sed run.def dayref   ${InitDay} 
    331     LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    332335    LMDZ_sed run.def nday     ${PeriodLengthInDays} 
    333336    LMDZ_sed run.def raz_date ${RAZ_DATE} 
     
    336339 
    337340    # Set anneeref different for gcm and ce0l 
     341    # Variable calend is different for a run with create_etat0_limit and the gcm 
    338342    # Test if executable create_etat0_limit is present and lmdz.x is not present 
    339343    if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then 
    340344        # for case ce0l : always take current year 
    341345        LMDZ_sed run.def anneeref ${year} 
     346        LMDZ_sed run.def calend   ${CalendarTypeForCreate} 
    342347    else 
    343348        # for case gcm : take first year of simulation 
    344349        LMDZ_sed run.def anneeref ${InitYear} 
     350        LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    345351    fi 
    346352 
  • CONFIG/UNIFORM/v5/LMDZOR_v5/GENERAL/DRIVER/lmdz.driver

    r1897 r1923  
    4949    RESOL_ATM_XY="${RESOL_ATM_X}x${RESOL_ATM_Y}" 
    5050 
    51     ##-- Calendar type for LMDZ 
     51    ##-- Calendar type for LMDZ and create_etat0_limit 
    5252    case ${config_UserChoices_CalendarType} in 
    5353        leap|gregorian) 
    54             CalendarTypeForLmdz=earth_366d;; 
     54            CalendarTypeForLmdz=earth_366d 
     55            CalendarTypeForCreate=gregorian;; 
    5556        noleap) 
    56             CalendarTypeForLmdz=earth_365d;; 
     57            CalendarTypeForLmdz=earth_365d 
     58            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5759        360d) 
    58             CalendarTypeForLmdz=earth_360d;; 
     60            CalendarTypeForLmdz=earth_360d 
     61            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5962        *) 
    6063            CalendarTypeForLmdz=earth_360d 
     64            CalendarTypeForCreate=${CalendarTypeForLmdz} 
    6165    esac 
    6266 
     
    329333    ## run.def parameters 
    330334    LMDZ_sed run.def dayref   ${InitDay} 
    331     LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    332335    LMDZ_sed run.def nday     ${PeriodLengthInDays} 
    333336    LMDZ_sed run.def raz_date ${RAZ_DATE} 
     
    336339 
    337340    # Set anneeref different for gcm and ce0l 
     341    # Variable calend is different for a run with create_etat0_limit and the gcm 
    338342    # Test if executable create_etat0_limit is present and lmdz.x is not present 
    339343    if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then 
    340344        # for case ce0l : always take current year 
    341345        LMDZ_sed run.def anneeref ${year} 
     346        LMDZ_sed run.def calend   ${CalendarTypeForCreate} 
    342347    else 
    343348        # for case gcm : take first year of simulation 
    344349        LMDZ_sed run.def anneeref ${InitYear} 
     350        LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    345351    fi 
    346352 
  • CONFIG/UNIFORM/v5/LMDZREPR_v5/GENERAL/DRIVER/lmdz.driver

    r1897 r1923  
    4949    RESOL_ATM_XY="${RESOL_ATM_X}x${RESOL_ATM_Y}" 
    5050 
    51     ##-- Calendar type for LMDZ 
     51    ##-- Calendar type for LMDZ and create_etat0_limit 
    5252    case ${config_UserChoices_CalendarType} in 
    5353        leap|gregorian) 
    54             CalendarTypeForLmdz=earth_366d;; 
     54            CalendarTypeForLmdz=earth_366d 
     55            CalendarTypeForCreate=gregorian;; 
    5556        noleap) 
    56             CalendarTypeForLmdz=earth_365d;; 
     57            CalendarTypeForLmdz=earth_365d 
     58            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5759        360d) 
    58             CalendarTypeForLmdz=earth_360d;; 
     60            CalendarTypeForLmdz=earth_360d 
     61            CalendarTypeForCreate=${CalendarTypeForLmdz};; 
    5962        *) 
    6063            CalendarTypeForLmdz=earth_360d 
     64            CalendarTypeForCreate=${CalendarTypeForLmdz} 
    6165    esac 
    6266 
     
    329333    ## run.def parameters 
    330334    LMDZ_sed run.def dayref   ${InitDay} 
    331     LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    332335    LMDZ_sed run.def nday     ${PeriodLengthInDays} 
    333336    LMDZ_sed run.def raz_date ${RAZ_DATE} 
     
    336339 
    337340    # Set anneeref different for gcm and ce0l 
     341    # Variable calend is different for a run with create_etat0_limit and the gcm 
    338342    # Test if executable create_etat0_limit is present and lmdz.x is not present 
    339343    if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then 
    340344        # for case ce0l : always take current year 
    341345        LMDZ_sed run.def anneeref ${year} 
     346        LMDZ_sed run.def calend   ${CalendarTypeForCreate} 
    342347    else 
    343348        # for case gcm : take first year of simulation 
    344349        LMDZ_sed run.def anneeref ${InitYear} 
     350        LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
    345351    fi 
    346352 
Note: See TracChangeset for help on using the changeset viewer.