Changeset 2602


Ignore:
Timestamp:
07/01/15 17:41:36 (6 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
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

    r2601 r2602  
    110110 
    111111[OutputText] 
    112 List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, used_run.def, iodef.xml, context_lmdz.xml,field_def_lmdz.xml,debug.01,lmdz.prt) 
     112List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
    113113 
    114114[OutputFiles] 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r2595 r2602  
    2626[ParametersFiles] 
    2727List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    28         (${SUBMIT_DIR}/PARAM/file_def_orchidee.xml, .)                   ,\ 
     28        (${SUBMIT_DIR}/PARAM/file_def_orchidee.xml, .)                  ,\ 
    2929        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    3030        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    3535 
    3636[OutputText] 
    37 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml) 
     37List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
    3838 
    3939[OutputFiles] 
     
    4545Patches = () 
    4646GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
    47 TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac) 
     47TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR) 
    4848ChunckJob2D = NONE 
    4949TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/stomate.card

    r2595 r2602  
    3333TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE) 
    3434ChunckJob2D = NONE 
    35 TimeSeriesVars3D = (CO2FLUX_MONTHLY,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE) 
     35TimeSeriesVars3D = (CO2FLUX,LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE) 
    3636ChunckJob3D = NONE 
    3737Seasonal=ON 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/config.card

    r2582 r2602  
    2525#-- "YYYY-MM-DD" 
    2626DateBegin=1980-01-01 
    27 DateEnd=1980-01-31 
     27DateEnd=1980-12-31 
    2828#============================ 
    2929#-- 1Y, 1M, 5D, 1D Period Length of one trunk of simulation 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

    r2595 r2602  
    3636 
    3737[OutputText] 
    38 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml) 
     38List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
    3939 
    4040[OutputFiles] 
     
    4646Patches = () 
    4747GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
    48 TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac) 
     48TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR) 
    4949ChunckJob2D = NONE 
    5050TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/stomate.card

    r2595 r2602  
    3333TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE) 
    3434ChunckJob2D = NONE 
    35 TimeSeriesVars3D = (CO2FLUX_MONTHLY,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE) 
     35TimeSeriesVars3D = (CO2FLUX,LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE) 
    3636ChunckJob3D = NONE 
    3737Seasonal=ON 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/config.card

    r2582 r2602  
    2525#-- "YYYY-MM-DD" 
    2626DateBegin=1980-01-01 
    27 DateEnd=1980-01-30 
     27DateEnd=1980-12-30 
    2828#============================ 
    2929#-- 1Y, 1M, 5D, 1D Period Length of one trunk of simulation 
     
    3737[ListOfComponents] 
    3838#D- For each component, Name of component, Tag of component 
    39 ATM= (lmdz, LMDZ4_AR5) 
    40 SRF= (orchidee, ORCHIDEE_1_9_5) 
    41 SBG= (stomate, ORCHIDEE_1_9_5) 
     39ATM= (lmdz, LMDZ) 
     40SRF= (orchidee, ORCHIDEE) 
     41SBG= (stomate, ORCHIDEE) 
    4242IOS= (xios, XIOS) 
    4343 
  • 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.