Ignore:
Timestamp:
09/26/14 11:46:12 (10 years ago)
Author:
aclsce
Message:

Modifed to have same handling of XIOS xml files as in LMDZOR configuration.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/stomate.driver

    r2300 r2343  
    2121 
    2222    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    23         ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .FALSE.  
    24         ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .FALSE.  
     23        IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .FALSE.  
     24        IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .FALSE.  
    2525    fi    
    2626    case ${config_SBG_WriteFrequency} in 
    … …  
    3030            (( STOMATE_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears ))  
    3131            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    32                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    33                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq ${WriteInYears}y 
    34                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    35                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    36                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq ${WriteInYears}y 
    37                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     32                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
     33                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${WriteInYears}y 
     34                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
     35                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
     36                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInYears}y 
     37                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    3838 
    3939            fi 
    … …  
    4141        1M|1m)  
    4242            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    43                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    44                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq 1mo 
    45                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    46                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    47                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq 1mo 
    48                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     43                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
     44                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 1mo 
     45                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
     46                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
     47                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 1mo 
     48                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    4949            fi 
    5050            case ${config_UserChoices_PeriodLength} in 
    … …  
    6262            WriteInMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
    6363            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    64                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    65                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq ${WriteInMonths}mo 
    66                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    67                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    68                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq ${WriteInMonths}mo 
    69                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     64                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
     65                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${WriteInMonths}mo 
     66                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
     67                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
     68                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInMonths}mo 
     69                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    7070            fi 
    7171            case ${config_UserChoices_PeriodLength} in 
    … …  
    8181                (( STOMATE_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) ))  
    8282                if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    83                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    84                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq ${STOMATE_WRITE_STEP}s 
    85                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history 
    86                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    87                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq ${STOMATE_WRITE_STEP}s 
    88                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history 
     83                    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
     84                    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${STOMATE_WRITE_STEP}s 
     85                    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
     86                    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
     87                    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${STOMATE_WRITE_STEP}s 
     88                    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
    8989                fi 
    9090                ;; 
    … …  
    9494            (( STOMATE_WRITE_STEP = 5 )) 
    9595            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    96                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    97                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq 5d 
    98                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    99                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    100                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq 5d 
    101                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     96                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
     97                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 5d 
     98                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
     99                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
     100                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 5d 
     101                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    102102            fi 
    103103            ;; 
    … …  
    105105            (( STOMATE_WRITE_STEP = 1 ))  
    106106            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    107                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    108                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq 1d 
    109                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    110                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    111                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq 1d 
    112                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     107                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
     108                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 1d 
     109                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
     110                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
     111                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 1d 
     112                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    113113            fi 
    114114            ;; 
    … …  
    116116            WriteInSeconds=$( echo ${config_SBG_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
    117117            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    118                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    119                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s 
    120                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history  
    121                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    122                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq ${WriteInSeconds}s 
    123                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     118                IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
     119                IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s 
     120                IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history  
     121                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
     122                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInSeconds}s 
     123                IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    124124            fi 
    125125            (( STOMATE_WRITE_STEP = 1 )) ;; 
    … …  
    129129    esac 
    130130 
    131     ORCHIDEE_sed STOMATE_OK_STOMATE y 
    132131 
    133132#Use of XIOS library only 
    … …  
    137136    fi 
    138137 
    139     ORCHIDEE_sed STOMATE_HIST_DT ${STOMATE_WRITE_STEP} 
    140     ORCHIDEE_sed STOMATE_HISTLEVEL ${stomate_UserChoices_stomate_LEVEL} 
     138    IGCM_comp_modifyDefFile nonblocker orchidee.def STOMATE_HIST_DT ${STOMATE_WRITE_STEP} 
     139    IGCM_comp_modifyDefFile nonblocker orchidee.def STOMATE_HISTLEVEL ${stomate_UserChoices_stomate_LEVEL} 
    141140 
    142141    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
    143142        echo "STOMATE : without restart" 
    144         ORCHIDEE_sed STOMATE_RESTART_FILEIN NONE 
     143        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN NONE 
    145144    else 
    146         ORCHIDEE_sed STOMATE_RESTART_FILEIN stomate_rest_in.nc 
     145        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN stomate_rest_in.nc 
    147146    fi 
    148147 
Note: See TracChangeset for help on using the changeset viewer.