Ignore:
Timestamp:
07/01/15 17:41:36 (9 years ago)
Author:
jgipsl
Message:
  • orchidee.def : Deactivate FIRE in ORCHIDEE (FIRE_DISABLE=y). Add RIVER_DESC to create a file needed for offline diagnostics. This file is only created the first once per simulation.
  • orchidee.card :

Add river_desc.nc (must be in OutputText? List because no time axis). Remove bqsb et gqsb from TS : these fields only exist with Choisnel. Add twbr : note this field only exist with CWRR.

  • stomate.card :

Remove CO2FLUX_MONTHLY and VEGET from TS. Add CO2FLUX to TS.

  • orchidee.driver : Add river_desc=y for 1st cumul period. Change in order to have all ModifDefList? first.
  • + small enhancement
Location:
CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/orchidee.driver

    r2601 r2602  
    2323    IGCM_debug_PushStack "SRF_Update" 
    2424 
     25    ## 1. Modifications in orchidee.def parameter file 
     26 
    2527    # Activate STOMATE if the compontent SBG=stomate is set in config.card 
    2628    if [ X${config_ListOfComponents_SBG} = Xstomate ] ; then 
    … …  
    3436        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled .FALSE. 
    3537    fi 
     38 
     39    # Define in orchidee.def if restart file should be used 
     40    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then 
     41        IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in sechiba_rest_in.nc 
     42    else 
     43        IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in NONE 
     44    fi 
     45 
     46    # Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices 
     47    if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then 
     48        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
     49    else 
     50        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y 
     51    fi 
     52    if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then 
     53        IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
     54    else 
     55        IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE n 
     56    fi 
     57 
     58    # Activate creation of river description file only for the first period 
     59    if [ ${CumulPeriod} -eq 1 ] ; then 
     60        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_DESC y 
     61    else 
     62        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_DESC n 
     63    fi 
     64 
     65 
     66    ## 2. Mangement of output and modifications of related xml files 
    3667 
    3768    # Set default values for sechiba1_enabled, sechiba1_freq and sechiba2_enabled. 
    … …  
    82113    rm iodef.xml.tmp add.tmp 
    83114 
    84  
    85     # Define in orchidee.def if restart file should be used 
    86     if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then 
    87         IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in sechiba_rest_in.nc 
    88     else 
    89         IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in NONE 
    90     fi 
    91  
    92     # Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices 
    93     if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then 
    94         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
    95     else 
    96         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y 
    97     fi 
    98     if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then 
    99         IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
    100     else 
    101         IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE n 
    102     fi 
    103  
    104115    IGCM_debug_PopStack "SRF_Update" 
    105116} 

  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/orchidee.def_CWRR

    r2582 r2602  
    9191LAND_COVER_CHANGE = _AUTO_ 
    9292 
     93# Do not use default fire module 
     94FIRE_DISABLE = y 
     95 
     96# Create river description file 
     97RIVER_DESC = _AUTO_ 
     98RIVER_DESC_FILE =  river_desc.nc 
     99 

  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/orchidee.def_Choi

    r2582 r2602  
    9191LAND_COVER_CHANGE = _AUTO_ 
    9292 
     93# Do not use default fire module 
     94FIRE_DISABLE = y 
     95 
     96# Create river description file 
     97RIVER_DESC = _AUTO_ 
     98RIVER_DESC_FILE =  river_desc.nc 
     99 
Note: See TracChangeset for help on using the changeset viewer.