Changeset 2954


Ignore:
Timestamp:
08/01/16 12:14:02 (8 years ago)
Author:
acosce
Message:

Homogenization of card between LMDZORINCA_v6 and LDMZOR_v6
+ add new config NMHC in LMDZORINCA_v6
+ compilation with XIOS2
+ add new resolution for LMDZORINCA_v6 (144x142x79 AER)

Location:
CONFIG/UNIFORM/v6
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/AA_make

    r2913 r2954  
    1111        echo "CHEM=NMHC_AER" > .chimie 
    1212 
     13NMHCxLMD9695-L39 : libioipsl xios liborchidee nmhc96x95x39 lmdz96x95x39 verif 
     14        echo "NMHCxLMD9695-L39" >.resol 
     15        echo "RESOL_ATM_3D=96x95x39" >>.resol 
     16        echo "CHEM=NMHC" > .chimie 
     17 
    1318AERxLMD9695-L39 : libioipsl xios liborchidee aer96x95x39 lmdz96x95x39 verif 
    1419        echo "AERxLMD9695-L39" >.resol 
    … …  
    1924        echo "AERxLMD144142-L39" >.resol 
    2025        echo "RESOL_ATM_3D=144x142x39" >>.resol 
     26        echo "CHEM=AER" > .chimie 
     27 
     28AERxLMD144142-L79 : libioipsl xios liborchidee aer144x142x79 lmdz144x142x79 verif 
     29        echo "AERxLMD144142-L79" >.resol 
     30        echo "RESOL_ATM_3D=144x142x79" >>.resol 
    2131        echo "CHEM=AER" > .chimie 
    2232 
    … …  
    4555 
    4656liborchidee : ../../modeles/ORCHIDEE/ 
    47         (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm  -parallel mpi_omp -xios -arch $(FCM_ARCH) -j 8  -driver) 
     57        (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm  -parallel mpi_omp -xios -arch $(FCM_ARCH) -j 8  -driver -xios2) 
    4858 
    4959nmhcaer96x95x39: 
    5060        $(M_K) inca RESOL_INCA=96x95x39 CHIMIE=NMHC_AER 
     61 
     62nmhc96x95x39: 
     63        $(M_K) inca RESOL_INCA=96x95x39 CHIMIE=NMHC 
    5164 
    5265aer96x95x39: 
    … …  
    5568aer144x142x39: 
    5669        $(M_K) inca RESOL_INCA=144x142x39 CHIMIE=AER 
     70 
     71aer144x142x79: 
     72        $(M_K) inca RESOL_INCA=144x142x79 CHIMIE=AER 
    5773 
    5874duss96x95x39: 
    … …  
    7187        $(M_K) lmdz RESOL_LMDZ=144x142x39 
    7288 
     89lmdz144x142x79: 
     90        $(M_K) lmdz RESOL_LMDZ=144x142x79 
     91 
     92 
    7393inca: ../../modeles/INCA 
    7494#       (cd ../../modeles/INCA; ./makeinca_fcm -chimie $(CHIMIE)  -resol $(RESOL_INCA) -j 8 -arch $(FCM_ARCH); cp SIMULATIONS/$(CHIMIE)/inca.dat ../../bin/inca.dat ; ) 
    … …  
    7797lmdz: ../../modeles/LMDZ 
    7898#       (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -chimie INCA  -arch $(FCM_ARCH) -j 8 ce0l ; mv bin/ce0l_$(RESOL_LMDZ)_phylmd_seq_inca.e ../../bin/create_etat0_limit.e ; ) 
    79         (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -rrtm true -cpp XIOS1 -chimie INCA -io xios  -mem -cosp false -v true -parallel mpi_omp -arch $(FCM_ARCH) -j 8  gcm ; mv bin/gcm_$(RESOL_LMDZ)_phylmd_para_mem_orch_inca.e ../../bin/gcm.e ; ) 
     99        (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -rrtm true -chimie INCA -io xios  -mem -cosp false -v true -parallel mpi_omp -arch $(FCM_ARCH) -j 8  gcm ; mv bin/gcm_$(RESOL_LMDZ)_phylmd_para_mem_orch_inca.e ../../bin/gcm.e ; ) 
    80100 
    81101 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_amip/COMP/lmdz.card

    r2840 r2954  
    66[UserChoices] 
    77# Physics package to use 
    8 LMDZ_Physics=AP 
    9  
    10 # Do not use XIOS with ce0l program 
    11 XIOS=n 
     8LMDZ_Physics=NPv5.65 
    129 
    1310# Manage radiative aerosol effect and ozone  
    … …  
    2421[BoundaryFiles] 
    2522List=   (${R_IN}/ATM/AMIP_2014/amipbc_sst_360x180_${year}.nc, amipbc_sst_1x1.nc), \ 
     23        (${R_IN}/ATM/AMIP_2014/amipbc_sst_360x180_${year_m1}.nc, amipbc_sst_1x1_m.nc), \ 
     24        (${R_IN}/ATM/AMIP_2014/amipbc_sst_360x180_${year_p1}.nc, amipbc_sst_1x1_p.nc), \ 
    2625        (${R_IN}/ATM/AMIP_2014/amipbc_sic_360x180_${year}.nc, amipbc_sic_1x1.nc), \ 
     26        (${R_IN}/ATM/AMIP_2014/amipbc_sic_360x180_${year_m1}.nc, amipbc_sic_1x1_m.nc), \ 
     27        (${R_IN}/ATM/AMIP_2014/amipbc_sic_360x180_${year_p1}.nc, amipbc_sic_1x1_p.nc), \ 
    2728        (${R_IN}/ATM/Ozone/HYBRIDE/v2.clim/tro3_${year}.new.nc, climoz.nc) 
    2829 
    … …  
    3738### land-sea mask. This file is different for different versions of the coupled model and 
    3839### the different resolutions. Choose between following to fit with IPSLCM6 coupled model: 
    39 #       (${R_IN}/ATM/IPSLCM6/eORCA1.1xLMD144142/o2a.nc, o2a.nc) 
     40#       (${R_IN}/ATM/IPSLCM6/eORCA1.2xLMD144x142/o2a.nc, o2a.nc) 
    4041#       (${R_IN}/ATM/IPSLCM6/ORCA2.3xLMD96x95_v1/o2a.nc, o2a.nc) 
    4142 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

    r2859 r2954  
    77# LMDZ_Physics=NPv3.2 for an early version of the new physics, to be used with LMDZ5/trunk revision 1554 or later 
    88# LMDZ_Physics=NPv5.4 for new physics to be used with LMDZ5/trunk revision 2449 or later 
     9# LMDZ_Physics=NPv5.67 for new physics to be used with LMDZ5/testing revision 2546 or later 
     10# LMDZ_Physics=NPv5.70 for new physics to be used with LMDZ5/testing revision 2595 or later 
    911LMDZ_Physics=AP 
    10  
    11 # Use XIOS as output library 
    12 XIOS=y 
    1312 
    1413# Set the variable CREATE needed further below to find the initial and boundary condition files. 
    … …  
    3433ByPass_hgardfou_mats=n 
    3534 
    36 # Set OutLevel to choose the level of output for LMDZ.  
     35# Set OutLevel to choose the level of output for LMDZ 
    3736# OutLevel=low/medium/high 
    3837OutLevel=low 
    3938 
    40 # COSP activation and choose of output frequency for COSP (monthly, daily, HF) = y/n 
     39# Set COSP activation and output frequency (monthly, daily, HF) = y/n 
    4140LMDZ_COSP_OK=n 
    4241LMDZ_COSP_monthly=n 
    … …  
    7170 
    7271[SmoothFiles] 
    73 List=() 
     72List=   () 
    7473 
    7574[ParametersFiles] 
    … …  
    7776        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_XY},    gcm.def),          \ 
    7877        (${SUBMIT_DIR}/PARAM/vert.def_L${RESOL_ATM_Z},   vert.def),         \ 
    79         (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \ 
    80         (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \ 
     78        (${MODIPSL}/modeles/LMDZ/DefLists/cosp_input_nl.txt, .),            \ 
     79        (${MODIPSL}/modeles/LMDZ/DefLists/cosp_output_nl.txt, .),           \ 
    8180        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \ 
    8281        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
    … …  
    8483        (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \ 
    8584        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \ 
    86         (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),                \ 
    87         (${SUBMIT_DIR}/PARAM/file_def_histmthCOSP_lmdz.xml, .),             \ 
    88         (${SUBMIT_DIR}/PARAM/file_def_histmthNMC_lmdz.xml, . ),             \ 
    89         (${SUBMIT_DIR}/PARAM/file_def_histday_lmdz.xml, . ),                \ 
    90         (${SUBMIT_DIR}/PARAM/file_def_histdayCOSP_lmdz.xml, .),             \ 
    91         (${SUBMIT_DIR}/PARAM/file_def_histdayNMC_lmdz.xml, . ),             \ 
    92         (${SUBMIT_DIR}/PARAM/file_def_histhf_lmdz.xml, . ),                 \ 
    93         (${SUBMIT_DIR}/PARAM/file_def_histhfCOSP_lmdz.xml, .),              \ 
    94         (${SUBMIT_DIR}/PARAM/file_def_histhfNMC_lmdz.xml, . ),              \ 
    95         (${SUBMIT_DIR}/PARAM/file_def_histstn_lmdz.xml, . ),                \ 
    96         (${SUBMIT_DIR}/PARAM/file_def_histins_lmdz.xml, . ),                \ 
    97         (${SUBMIT_DIR}/PARAM/file_def_histLES_lmdz.xml, . ),                \ 
    9885        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
    99         (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ) 
     86        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
     87        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     88        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
     89        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 
     90        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . ),   \ 
     91        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayCOSP_lmdz.xml, .),\ 
     92        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\ 
     93        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . ),    \ 
     94        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfCOSP_lmdz.xml, .), \ 
     95        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ), \ 
     96        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . ),   \ 
     97        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . ),   \ 
     98        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . ) 
    10099 
    101100[RestartFiles] 
    … …  
    104103 
    105104[OutputText] 
    106 List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt,out_lmdz.x.err, out_lmdz.x.out) 
     105List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt, out_lmdz.x.err, out_lmdz.x.out) 
    107106 
    108107[OutputFiles] 
    … …  
    122121[Post_1M_histmth] 
    123122Patches= () 
    124 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire) 
     123GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds, aire) 
    125124TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero) 
    126 ChunckJob2D = 100Y 
     125ChunckJob2D = 100Y  
    127126TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd) 
    128127ChunckJob3D = 100Y 
    … …  
    131130[Post_1M_histmthCOSP] 
    132131Patches = () 
    133 GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_counter_bounds) 
     132GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_centered, time_centered_bounds, aire) 
    134133TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso, tclisccp, albisccp, ctpisccp) 
    135134ChunckJob2D = OFF 
    … …  
    140139[Post_1M_histmthNMC] 
    141140Patches = () 
    142 GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds) 
     141GatherWithInternal = (lon, lat, plev, time_counter, time_centered, time_centered_bounds) 
    143142TimeSeriesVars2D = () 
    144143ChunckJob2D = NONE 
    … …  
    158157[Post_1D_histday] 
    159158Patches= () 
    160 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds) 
     159GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds) 
    161160TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, precip, pluc, plul, prw, psol, q2m, sens, sicf, slp, soll, sols, snow, SWdnSFC, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max) 
    162161ChunckJob2D = 50Y 
    … …  
    167166[Post_1D_histdayCOSP] 
    168167Patches = () 
    169 GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_counter_bounds) 
     168GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_centered, time_centered_bounds) 
    170169TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso, tclisccp, albisccp, ctpisccp) 
    171170ChunckJob2D = OFF 
    … …  
    176175[Post_1D_histdayNMC] 
    177176Patches = () 
    178 GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds) 
     177GatherWithInternal = (lon, lat, plev, time_counter, time_centered, time_centered_bounds) 
    179178TimeSeriesVars2D = () 
    180179ChunckJob2D = NONE 
    … …  
    185184[Post_HF_histhf] 
    186185Patches= () 
    187 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds) 
     186GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds) 
    188187TimeSeriesVars2D = (cldt, psol, q2m, slp, precip, pluc, plul, t2m, tsol, u10m, v10m) 
    189188ChunckJob2D = 50Y 
    … …  
    194193[Post_HF_histhfCOSP] 
    195194Patches = () 
    196 GatherWithInternal = (lon, lat, height, sza, time_counter, time_counter_bounds) 
     195GatherWithInternal = (lon, lat, height, sza, time_counter, time_centered, time_centered_bounds) 
    197196TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso) 
    198197ChunckJob2D = OFF 
    … …  
    203202[Post_HF_histhfNMC] 
    204203Patches = () 
    205 GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds) 
     204GatherWithInternal = (lon, lat, plev, time_counter, time_centered, time_centered_bounds) 
    206205TimeSeriesVars2D = () 
    207206ChunckJob2D = NONE 
    … …  
    212211[Post_3H_histhf3hm] 
    213212Patches= () 
    214 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds) 
     213GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds) 
    215214TimeSeriesVars2D = (flat, precip, pluc, snow, topl, topl0, SWupTOA, SWupTOAclr, SWdnTOA, SWupSFC, SWupSFCclr, SWdnSFC, SWdnSFCclr, LWupSFC, LWupSFCclr, LWdnSFC, LWdnSFCclr, bils, bils_tke, bils_diss, bils_ec, bils_kinetic, bils_enthalp, bils_latent, sens, cldt, zmax_th) 
    216215ChunckJob2D = OFF 
    … …  
    221220[Post_3H_histhf3h] 
    222221Patches= () 
    223 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds) 
     222GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds) 
    224223TimeSeriesVars2D = (phis, tsol, t2m, q2m, ustar, u10m, v10m, psol) 
    225224ChunckJob2D = OFF 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r2770 r2954  
    1414List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    1515        (${R_IN}/SRF/routing.nc,            . ), \ 
    16         (${R_IN}/SRF/albedo/alb_bg_jrctip.nc, . ), \ 
     16        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D.nc, alb_bg.nc ), \ 
    1717        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    1818 
    … …  
    4242[Post_1M_sechiba_history] 
    4343Patches = () 
    44 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
    45 TimeSeriesVars2D = (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) 
     44GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
     45TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, frac_snow, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR, riverflow, coastalflow, DelSoilMoist_daily, DelIntercept_daily, DelSWE_daily, delstock_routing, snowmelt, LAImean) 
    4646ChunckJob2D = NONE 
    4747TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
    … …  
    5151[Post_HF_sechiba_out_2] 
    5252Patches = () 
    53 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
     53GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
    5454TimeSeriesVars2D = (mrsos, mrro) 
    5555ChunckJob2D = 50Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/inca.card

    r2916 r2954  
    7373[Post_1D_inca_aero] 
    7474Patches= () 
    75 GatherWithInternal = (lon, lat, presnivs, time_counter_bounds, time_counter, area) 
     75GatherWithInternal = (lon, lat, presnivs, time_centered, time_centered_bounds, time_counter, area) 
    7676TimeSeriesVars2D = (od550bcas,od550oaas,od550so4as, od550so4cs, od550ssas,od550ssss, od550sscs,od550dustci,od550bcai,od550oaai, loaddustci, loadno3ci, loadbcai, loadoaai, loadsscs, loadso4cs, loadno3cs, loadssas, loadbcas, loadoaas, loadso4as, loadnh4as, loadno3as, loadssss) 
    7777ChunckJob2D = NONE 
    … …  
    8282[Post_1D_inca_forcage] 
    8383Patches= () 
    84 GatherWithInternal = (lon, lat, presnivs, time_counter_bounds,time_counter, area) 
     84GatherWithInternal = (lon, lat, presnivs, time_centered, time_centered_bounds,time_counter, area) 
    8585TimeSeriesVars2D = (SWTOAAS_ANT, SWTOAAS_AER, SWTOAAS_NAT, SWTOAAS_BC, SWTOAAS_SO4, SWTOAAS_POM, SWTOAAS_SS,SWTOAAS_DUST, SWTOAAS_DNO3,SWTOAAS_SNO3, SWTOAAS_FNO3) 
    8686ChunckJob2D = NONE 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/lmdz.card

    r2897 r2954  
    108108[Post_1M_histmth] 
    109109Patches= () 
    110 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire) 
     110GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds, aire) 
    111111TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero) 
    112112ChunckJob2D = 100Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/orchidee.card

    r2803 r2954  
    99DefSuffix=Choi 
    1010 
    11 VEGET_UPDATE=0Y 
     11VEGET_UPDATE=1Y 
    1212 
    1313[InitialStateFiles] 
    1414List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    1515        (${R_IN}/SRF/routing.nc,            . ), \ 
    16         (${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_2000.nc, PFTmap.nc), \ 
     16        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D.nc, alb_bg.nc ), \ 
    1717        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    1818 
    1919[BoundaryFiles] 
    20 List= () 
     20List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc) 
    2121ListNonDel= () 
    22  
    23 # to decomment if we want to calcul bvoc - for this we need to activate CHEMISTRY_BVOC in orchidee.def_Choi 
    24 #ListNonDel= (${R_IN}/SRF/chemistry/orchidee_fertilizer_1995.nc, .), \ 
    25 #            (${R_IN}/SRF/chemistry/orchidee_bbg_clim.nc, .) 
    2622 
    2723[SmoothFiles] 
    … …  
    4642[Post_1M_sechiba_history] 
    4743Patches = () 
    48 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
    49 TimeSeriesVars2D = (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) 
     44GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
     45TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, frac_snow, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR, riverflow, coastalflow, DelSoilMoist_daily, DelIntercept_daily, DelSWE_daily, delstock_routing, snowmelt, LAImean) 
    5046ChunckJob2D = NONE 
    5147TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
    … …  
    5551[Post_HF_sechiba_out_2] 
    5652Patches = () 
    57 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
     53GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
    5854TimeSeriesVars2D = (mrsos, mrro) 
    5955ChunckJob2D = 50Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUSS/COMP/inca.card

    r2916 r2954  
    7171[Post_1D_inca_aero] 
    7272Patches= () 
    73 GatherWithInternal = (lon, lat, presnivs, time_counter_bounds, time_counter, area) 
     73GatherWithInternal = (lon, lat, presnivs, time_centered, time_centered_bounds, time_counter, area) 
    7474TimeSeriesVars2D = (OD550_SSSSM, od550ssas,od550ss,od550dust, loaddustCI, loadssCS, loadSSAS, LOAD_SSSSM, emidustCI, emissAS, emissSS, emissCS) 
    7575ChunckJob2D = NONE 
    … …  
    8080[Post_1D_inca_forcage] 
    8181Patches= () 
    82 GatherWithInternal = (lon, lat, presnivs, time_counter_bounds,time_counter, area) 
     82GatherWithInternal = (lon, lat, presnivs, time_centered, time_centered_bounds,time_counter, area) 
    8383TimeSeriesVars2D = (SWTOAAS_AER,SWTOAAS_DUST,SWTOAAS_SS) 
    8484ChunckJob2D = NONE 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUSS/COMP/lmdz.card

    r2897 r2954  
    108108[Post_1M_histmth] 
    109109Patches= () 
    110 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire) 
     110GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds, aire) 
    111111TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero) 
    112112ChunckJob2D = 100Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUSS/COMP/orchidee.card

    r2803 r2954  
    99DefSuffix=Choi 
    1010 
    11 VEGET_UPDATE=0Y 
     11VEGET_UPDATE=1Y 
    1212 
    1313[InitialStateFiles] 
    1414List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    1515        (${R_IN}/SRF/routing.nc,            . ), \ 
    16         (${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_2000.nc, PFTmap.nc), \ 
     16        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D.nc, alb_bg.nc ), \ 
    1717        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    1818 
    1919[BoundaryFiles] 
    20 List= () 
     20List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc) 
    2121ListNonDel= () 
    2222 
    … …  
    4646[Post_1M_sechiba_history] 
    4747Patches = () 
    48 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
    49 TimeSeriesVars2D = (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) 
     48GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
     49TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, frac_snow, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR, riverflow, coastalflow, DelSoilMoist_daily, DelIntercept_daily, DelSWE_daily, delstock_routing, snowmelt, LAImean) 
    5050ChunckJob2D = NONE 
    5151TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
    … …  
    5555[Post_HF_sechiba_out_2] 
    5656Patches = () 
    57 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
     57GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
    5858TimeSeriesVars2D = (mrsos, mrro) 
    5959ChunckJob2D = 50Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/inca.card

    r2889 r2954  
    6161[Post_1D_inca_ges] 
    6262Patches= () 
    63 GatherWithInternal = (lon, lat, presnivs, time_counter_bounds,time_counter, area) 
     63GatherWithInternal = (lon, lat, presnivs, , time_centered, time_centered_bounds, time_counter, area) 
    6464TimeSeriesVars2D = () 
    6565ChunckJob2D = NONE 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/lmdz.card

    r2897 r2954  
    109109[Post_1M_histmth] 
    110110Patches= () 
    111 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire) 
     111GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds, aire) 
    112112TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero) 
    113113ChunckJob2D = 100Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/orchidee.card

    r2803 r2954  
    99DefSuffix=Choi 
    1010 
    11 VEGET_UPDATE=0Y 
     11VEGET_UPDATE=1Y 
    1212 
    1313[InitialStateFiles] 
    1414List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    1515        (${R_IN}/SRF/routing.nc,            . ), \ 
    16         (${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_2000.nc, PFTmap.nc), \ 
     16        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D.nc, alb_bg.nc ), \ 
    1717        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    1818 
    1919[BoundaryFiles] 
    20 List= () 
     20List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc) 
    2121ListNonDel= () 
    22  
    23 # to decomment if we want to calcul bvoc - for this we need to activate CHEMISTRY_BVOC in orchidee.def_Choi 
    24 #ListNonDel= (${R_IN}/SRF/chemistry/orchidee_fertilizer_1995.nc, .), \ 
    25 #            (${R_IN}/SRF/chemistry/orchidee_bbg_clim.nc, .) 
    2622 
    2723[SmoothFiles] 
    … …  
    4642[Post_1M_sechiba_history] 
    4743Patches = () 
    48 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
    49 TimeSeriesVars2D = (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) 
     44GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
     45TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, frac_snow, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR, riverflow, coastalflow, DelSoilMoist_daily, DelIntercept_daily, DelSWE_daily, delstock_routing, snowmelt, LAImean) 
    5046ChunckJob2D = NONE 
    5147TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
    … …  
    5551[Post_HF_sechiba_out_2] 
    5652Patches = () 
    57 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
     53GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
    5854TimeSeriesVars2D = (mrsos, mrro) 
    5955ChunckJob2D = 50Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/inca.card

    r2916 r2954  
    8181[Post_1D_inca_aero] 
    8282Patches= () 
    83 GatherWithInternal = (lon, lat, presnivs, time_counter_bounds, time_counter, area) 
     83GatherWithInternal = (lon, lat, presnivs, time_centered, time_centered_bounds, time_counter, area) 
    8484TimeSeriesVars2D = (od550bcas,od550oaas,od550so4as, od550so4cs, od550ssas,od550ssss, od550sscs,od550dustci,od550bcai,od550oaai, loaddustci, loadno3ci, loadbcai, loadoaai, loadsscs, loadso4cs, loadno3cs, loadssas, loadbcas, loadoaas, loadso4as, loadnh4as, loadno3as, loadssss) 
    8585ChunckJob2D = NONE 
    … …  
    8989[Post_1D_inca_species] 
    9090Patches= () 
    91 GatherWithInternal = (lon, lat, presnivs, time_counter_bounds,time_counter, area) 
     91GatherWithInternal = (lon, lat, presnivs, time_centered, time_centered_bounds,time_counter, area) 
    9292TimeSeriesVars2D = () 
    9393ChunckJob2D = NONE 
    … …  
    9898[Post_1D_inca_chem] 
    9999Patches= () 
    100 GatherWithInternal = (lon, lat, presnivs,time_counter_bounds, time_counter, area) 
     100GatherWithInternal = (lon, lat, presnivs,time_centered, time_centered_bounds, time_counter, area) 
    101101TimeSeriesVars2D = (o3_col, co_col, no2_col, ch2o_col, ch4_col, hno2_col, oh_col, so2_col) 
    102102ChunckJob2D = NONE 
    … …  
    106106[Post_1D_inca_forcage] 
    107107Patches= () 
    108 GatherWithInternal = (lon, lat, presnivs, time_counter_bounds,time_counter, area) 
     108GatherWithInternal = (lon, lat, presnivs, time_centered, time_centered_bounds,time_counter, area) 
    109109TimeSeriesVars2D = (SWTOAAS_ANT, SWTOAAS_AER, SWTOAAS_NAT, SWTOAAS_BC, SWTOAAS_SO4, SWTOAAS_POM, SWTOAAS_DUST, SWTOAAS_SS, SWTOAAS_DNO3, SWTOASS_SNO3,  SWTOAAS_FNO3) 
    110110ChunckJob2D = NONE 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/lmdz.card

    r2897 r2954  
    108108[Post_1M_histmth] 
    109109Patches= () 
    110 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire) 
     110GatherWithInternal = (lon, lat, presnivs, time_counter,time_centered, time_centered_bounds, aire) 
    111111TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero) 
    112112ChunckJob2D = 100Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/orchidee.card

    r2803 r2954  
    99DefSuffix=Choi 
    1010 
    11 VEGET_UPDATE=0Y 
     11VEGET_UPDATE=1Y 
    1212 
    1313[InitialStateFiles] 
    1414List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    1515        (${R_IN}/SRF/routing.nc,            . ), \ 
    16         (${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_2000.nc, PFTmap.nc), \ 
     16        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D.nc, alb_bg.nc ), \ 
    1717        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    1818 
    1919[BoundaryFiles] 
    20 List= () 
     20List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc) 
    2121ListNonDel= () 
    2222 
    … …  
    4646[Post_1M_sechiba_history] 
    4747Patches = () 
    48 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
    49 TimeSeriesVars2D = (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) 
     48GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
     49TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, frac_snow, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR, riverflow, coastalflow, DelSoilMoist_daily, DelIntercept_daily, DelSWE_daily, delstock_routing, snowmelt, LAImean) 
    5050ChunckJob2D = NONE 
    5151TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
    … …  
    5555[Post_HF_sechiba_out_2] 
    5656Patches = () 
    57 GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
     57GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds) 
    5858TimeSeriesVars2D = (mrsos, mrro) 
    5959ChunckJob2D = 50Y 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver

    r2859 r2954  
    435435    fi  
    436436 
     437    # config.def : Activate COSP 
     438    if [ ! X${lmdz_UserChoices_LMDZ_COSP_OK} = X ]; then  
     439        IGCM_comp_modifyDefFile nonblocker config.def ok_cosp ${lmdz_UserChoices_LMDZ_COSP_OK} 
     440    else 
     441        IGCM_comp_modifyDefFile nonblocker config.def ok_cosp n  
     442    fi  
     443 
     444    # config.def : Modify parameter pmagic if it is set in lmdz.card 
     445    if [ ! X${lmdz_UserChoices_pmagic} = X ]; then  
     446        IGCM_comp_modifyDefFile nonblocker config.def pmagic ${lmdz_UserChoices_pmagic} 
     447    else 
     448        # Take default value set in config.def 
     449        IGCM_comp_modifyDefFile nonblocker config.def pmagic DEFAULT 
     450    fi  
     451 
    437452    # guide.def : Activate nudging if ok_guide=y set in lmdz.card 
    438453    if [ ! X${lmdz_UserChoices_ok_guide} = X ] ; then 
    … …  
    468483    fi 
    469484 
    470     if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
    471         # Add include of LMDZ context in iodef.xml 
    472         # In iodef.xml add on next line after "COMPONENT CONTEXT" 
    473         #  <context id="LMDZ" src="./context_lmdz.xml"/> 
    474         echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp 
    475         cp iodef.xml iodef.xml.tmp 
    476         sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml 
    477         rm iodef.xml.tmp add.tmp 
    478  
    479         #Long Name as global attribute (if LongName is not empty) 
    480         if [ ! "X${config_UserChoices_LongName}" = "X" ] ; then 
    481             listfile=$(ls file_def*lmdz.xml) 
    482             echo "<variable id=\"LongName\" type=\"string\">${config_UserChoices_LongName}</variable>" > add.tmp 
    483             for file in ${listfile} 
    484             do 
    485                 cp ${file} ${file}.tmp 
    486                 sed -e "/<file id/r add.tmp" \ 
    487                     ${file}.tmp > ${file} 
    488                 rm ${file}.tmp  
    489             done 
    490             rm add.tmp 
    491         fi 
    492  
    493         # Set ok_all_xml=y in run.def 
    494         IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml y 
    495     else 
    496         # Deactivate ok_all_xml in run.def 
    497         IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml n 
    498     fi 
    499      
     485    # Add include of LMDZ context in iodef.xml 
     486    # In iodef.xml add on next line after "COMPONENT CONTEXT" 
     487    #  <context id="LMDZ" src="./context_lmdz.xml"/> 
     488    echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp 
     489    cp iodef.xml iodef.xml.tmp 
     490    sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml 
     491    rm iodef.xml.tmp add.tmp 
     492 
     493    #Long Name as global attribute (if LongName is not empty) 
     494    if [ ! "X${config_UserChoices_LongName}" = "X" ] ; then 
     495        listfile=$(ls file_def*lmdz.xml) 
     496        echo "<variable id=\"LongName\" type=\"string\">${config_UserChoices_LongName}</variable>" > add.tmp 
     497        for file in ${listfile} 
     498        do 
     499            cp ${file} ${file}.tmp 
     500            sed -e "/<file id/r add.tmp" \ 
     501                ${file}.tmp > ${file} 
     502            rm ${file}.tmp  
     503        done 
     504        rm add.tmp 
     505    fi 
     506             
    500507    IGCM_debug_PopStack "ATM_Update" 
    501508} 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/config.def_actuel

    r2505 r2954  
    77 
    88## Nombre  d'appels des routines de rayonnements ( par jour)                  
    9 nbapp_rad=24 
     9nbapp_rad=16 
    1010 
    1111##  Facteur additif pour l'albedo 
    12 pmagic=0.0 
     12pmagic =  _AUTO_: DEFAULT = 0.0 
    1313 
    1414# 
    … …  
    2222R_incl = 23.441 
    2323### solaire =    Constante solaire 
    24 solaire = _AUTO_ : DEFAULT = 1366.0896 
     24#solaire = _AUTO_ : DEFAULT = 1366.0896 
     25solaire = _AUTO_ : DEFAULT = 1361.20  
    2526# 
    2627# Taux gaz a effet de serre 
    … …  
    6465# 2: read two ozone climatologies, the average day and night climatology and the daylight climatology 
    6566read_climoz=_AUTO_ 
     67# COSP 
     68ok_cosp=_AUTO_ 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/config.def_annuel

    r2346 r2954  
    77 
    88## Nombre  d'appels des routines de rayonnements ( par jour)                  
    9 nbapp_rad=24 
     9nbapp_rad=16 
    1010 
    1111##  Facteur additif pour l'albedo 
    12 pmagic=0.0 
     12pmagic =  _AUTO_: DEFAULT = 0.0 
    1313 
    1414# 
    … …  
    6464# 2: read two ozone climatologies, the average day and night climatology and the daylight climatology 
    6565read_climoz=_AUTO_ 
     66# COSP 
     67ok_cosp=_AUTO_ 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/config.def_preind

    r2505 r2954  
    99 
    1010## Nombre  d'appels des routines de rayonnements ( par jour)                  
    11 nbapp_rad=24 
     11nbapp_rad=16 
    1212 
    1313##  Facteur additif pour l'albedo 
    14 pmagic=0.0 
     14pmagic =  _AUTO_: DEFAULT = 0.0 
    1515 
    1616# 
    … …  
    2424R_incl = 23.441 
    2525### solaire =    Constante solaire 
    26 solaire = _AUTO_: DEFAULT = 1365.6537 
     26solaire = _AUTO_: DEFAULT = 1361.20 
    2727# 
    2828# Taux gaz a effet de serre 
    … …  
    6666# 2: read two ozone climatologies, the average day and night climatology and the daylight climatology 
    6767read_climoz=_AUTO_ 
     68# COSP 
     69ok_cosp=_AUTO_ 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/iodef.xml

    r2694 r2954  
    1313  <context id="xios"> 
    1414 
    15     <variable_definition> 
    16          
    17      <!-- We must have buffer_size > jpi*jpj*jpk*8 (with jpi and jpj the subdomain size) --> 
    18           <variable id="buffer_size"               type="integer">10000000</variable> 
    19           <variable id="buffer_server_factor_size" type="integer">2</variable> 
    20           <variable id="info_level"                type="integer">1</variable> 
    21           <variable id="using_server"              type="boolean">false</variable> 
    22           <variable id="using_oasis"               type="boolean">false</variable> 
    23           <variable id="oasis_codes_id"            type="string" >LMDZ,oceanx</variable> 
    24          
    25       </variable_definition> 
    26                 
     15    <variable_definition>        
     16      <variable id="optimal_buffer_size" type="string">performance</variable> 
     17      <variable id="buffer_size_factor" type="double">2.0</variable> 
     18      <variable id="min_buffer_size" type="int">10000000</variable> 
     19      <variable id="info_level"            type="int">1</variable> 
     20      <variable id="using_server"          type="bool">false</variable> 
     21      <variable id="using_oasis"           type="bool">false</variable> 
     22      <variable id="oasis_codes_id"        type="string" >LMDZ,oceanx</variable>         
     23    </variable_definition> 
     24     
    2725  </context> 
    2826 

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

    r2784 r2954  
    8080RIVER_DESC_FILE =  river_desc.nc 
    8181 
     82# Parameters related to surface and thermal physical properties 
     83#************************************************************************ 
    8284# Read bare soil albedo from file with background MODIS data 
    8385ALB_BG_MODIS = y 
     86ALB_BG_FILE  = alb_bg.nc 
    8487 
    85 # Parameter related to chemistry bvoc  
     88# ROUGH_DYN : Account for a dynamic roughness height (activation of Su et al. parametrization) 
     89ROUGH_DYN=y 
     90 
     91# OK_FREEZE :  Activate the complet soil freezing scheme 
     92OK_FREEZE=n 
     93 
     94# DEPTH_MAX_T (m) :  Maximum depth of the soil thermodynamics 
     95DEPTH_MAX_T=90 
     96 
     97# OK_EXPLICITSNOW :  Activate explict snow scheme 
     98OK_EXPLICITSNOW=y 
     99  
     100# READ_REFTEMP :  Initialize soil temperature using climatological temperature 
     101READ_REFTEMP=n 
     102 
     103# Parameters related to chemistry bvoc  
    86104#************************************************************************ 
    87 # CHEMISTRY_OK_BVOC ([FLAG]) :  Activate chemistry    {OK_SECHIBA} 
    88 # default =  n  
     105# CHEMISTRY_OK_BVOC :  Activate chemistry 
    89106CHEMISTRY_BVOC =  n 
    90107 
    91 # CO2 FOR BVOC - WILKINSON ([FLAG]) :  CO2 inhibition effect for isoprene based on Wilkinson approach?    {CHEMISTRY_OK_BVOC } 
     108# CO2 FOR BVOC - WILKINSON :  CO2 inhibition effect for isoprene based on Wilkinson approach? 
    92109CO2_FOR_BVOC_WILKINSON=n 
    93110 
    94 # CO2 FOR BVOC - POSSELL ([FLAG]) :  CO2 inhibition effect for isoprene based on Possell approach?    {CHEMISTRY_OK_BVOC } 
     111# CO2 FOR BVOC - POSSELL :  CO2 inhibition effect for isoprene based on Possell approach? 
    95112CO2_FOR_BVOC_POSSELL=n 
    96113 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/run.def

    r2859 r2954  
    5050### config_inca=aero/chem needed only if type_trac=inca 
    5151config_inca=_AUTOBLOCKER_  
    52 ### To activate XIOS ouputs only 
    53 ok_all_xml= _AUTO_ 
     52### To activate XIOS ouputs only, set n to use IOIPSL 
     53ok_all_xml= y 
    5454 
     55 

  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/POST/monitoring01_orchidee.cfg

    r2330 r2954  
    3939#  field | files patterns | files additionnal | operations | title | units | calcul of area 
    4040#------------------------------------------------------------------------------------------------------------------------------------------------------ 
    41 temp_sol_lands | "temp_sol"         |  ""              | "temp_sol[d=1]"                    | "TSOL (LANDS)"                 | "K/d"    | "Areas[d=1]*Contfrac[d=1]" 
    42 humidity_lands | "bqsb gqsb"        |  ""              | "(bqsb[d=1]+gqsb[d=2])"            | "Total Soil Moisture  (LANDS)" | "1"      | "Areas[d=1]*Contfrac[d=1]" 
    43 albedo_lands   | "alb_vis alb_nir"  |  ""              | "((alb_vis[d=1]+alb_nir[d=2])*0.5)"| "Mean Albedo (LANDS)"          | "1"      | "Areas[d=1]*Contfrac[d=1]" 
    44 snow_lands     | "snow"             |  ""              | "snow[d=1]"                        | "Snow Mass (LANDS)"            | "kg/m^2" | "Areas[d=1]*Contfrac[d=1]" 
    45 maxveget_lands | "maxvegetfrac"     |  ""              | "maxvegetfrac[d=1,K=12:13]"        | "vegetmax[pft=12,13] (LANDS)"  | "1"      | "2" 
    46 nee_lands      | "nee maxvegetfrac" |  ""              | "(nee[d=1]*365*86400*maxvegetfrac[d=2]*Areas[d=1]*Contfrac[d=1]/1e15)"  | "Net Ecosystem Exchange"    | "PgC/yr" | "2" 
    47 maxveget_forcing | "maxvegetfrac"   |  ""              | "((maxvegetfrac[d=1,K=12]+maxvegetfrac[d=1,K=13])*Areas[d=1]*Contfrac[d=1]/1e12)" | "maxveget surface[pft=12,13] "  | "Mkm^2"  | "2" 
    48 #------------------------------------------------------------------------------------------------------------------------------------------------------ 
     41delta_water_stock | "nobiofrac DelSoilMoist_daily DelIntercept_daily DelSWE_daily delstock_routing" |  "" | "((1-nobiofrac[d=1])*DelSoilMoist_daily[d=2] + DelIntercept_daily[d=3] + DelSWE_daily[d=4] + delstock_routing[d=5])" | "Change in total water stock (LANDS) " | "kg/day/m2 of land" | "Areas[d=2]*Contfrac[d=2]" 
     42water_budget_closure | "nobiofrac DelSoilMoist_daily DelIntercept_daily DelSWE_daily delstock_routing rain snowf evap riverflow coastalflow" | "" | "(((1-nobiofrac[d=1])*DelSoilMoist_daily[d=2] + DelIntercept_daily[d=3] + DelSWE_daily[d=4] +  delstock_routing[d=5])*Areas[d=1]*Contfrac[d=1] -  ((rain[d=6] + snowf[d=7] - evap[d=8])*Areas[d=1]*Contfrac[d=1]  - (riverflow[d=9] + coastalflow[d=10])*1000*86400 ))/(4*3.14*6370000*6370000*0.26)" | "Water budget closure (LANDS) " | "kg/day/m2 of land" | "2" 
     43twbr_lands       | "twbr"             |  "" | "twbr[d=1]*86400"                  | "Hydrol water buget residu (LANDS)" | "kg/m^2/d" | "Areas[d=1]*Contfrac[d=1]" 
     44temp_sol_lands   | "temp_sol"         |  "" | "temp_sol[d=1]"                    | "TSOL (LANDS)"                      | "C"        | "Areas[d=1]*Contfrac[d=1]" 
     45fluxsens_lands   | "fluxsens"         |  "" | "fluxsens[d=1]"                    | "Sensible Flux (LANDS)"             | "W/m^2"    | "Areas[d=1]*Contfrac[d=1]" 
     46evap_lands       | "evap"             |  "" | "evap[d=1]"                        | "Evaporation (LANDS)"               | "mm/d"     | "Areas[d=1]*Contfrac[d=1]" 
     47evapnu_lands     | "evapnu"           |  "" | "evapnu[d=1]"                      | "Soil evaporation (LANDS)"          | "mm/d"     | "Areas[d=1]*Contfrac[d=1]" 
     48transpir_lands   | "transpir"         |  "" | "transpir[d=1]"                    | "Transpiration (LANDS)"             | "mm/d"     | "Areas[d=1]*Contfrac[d=1]" 
     49subli_lands      | "subli"            |  "" | "subli[d=1]"                       | "Sublimation (LANDS)"               | "mm/d"     | "Areas[d=1]*Contfrac[d=1]" 
     50snow_swe_lands   | "frac_snow snow"   |  "" | "snow[d=2]"                        | "Snow Mass (LANDS)"                 | "kg/m^2"   | "Areas[d=2]*Contfrac[d=2]" 
     51snownobio_lands  | "snownobio"        |  "" | "snownobio[d=1]"                   | "Snow Other Surfaces (LANDS)"       | "kg/m^2"   | "Areas[d=1]*Contfrac[d=1]" 
     52snowf_lands      | "snowf"            |  "" | "snowf[d=1]"                       | "Snowfall (LANDS)"                  | "mm/d"     | "Areas[d=1]*Contfrac[d=1]" 
     53precip_lands     | "rain snowf"       |  "" | "rain[d=1] + snowf[d=2]"           | "Total precipitaion (LANDS)"        | "mm/d"     | "Areas[d=1]*Contfrac[d=1]" 
     54runoff_lands     | "runoff"           |  "" | "runoff[d=1]"                      | "Surface runoff  (LANDS)"           | "kg/m^2"   | "Areas[d=1]*Contfrac[d=1]" 
     55drainage_lands   | "drainage"         |  "" | "drainage[d=1]"                    | "Drainage  (LANDS)"                 | "kg/m^2"   | "Areas[d=1]*Contfrac[d=1]" 
     56humidity_lands   | "mrso"             |  "" | "mrso[d=1]"                        | "Total Soil Moisture  (LANDS)"      | "kg/m^2"   | "Areas[d=1]*Contfrac[d=1]" 
     57surface_humidity_lands | "mrsos"      |  "" | "mrsos[d=1]"                       | "Top 10cm soil moisture  (LANDS)"   | "kg/m^2"   | "Areas[d=1]*Contfrac[d=1]" 
     58albedo_lands     | "alb_vis alb_nir"  |  "" | "((alb_vis[d=1]+alb_nir[d=2])*0.5)"| "Mean Albedo (LANDS)"               | "1"        | "Areas[d=1]*Contfrac[d=1]" 
     59lai_lands        | "LAImean"          |  "" | "LAImean[d=1]"                     | "LAI (mean excluding PFT=1) (LANDS)"| "1"        | "Areas[d=1]*Contfrac[d=1]" 
     60nee_lands        | "nee maxvegetfrac" |  "" | "(nee[d=1]*365*86400*maxvegetfrac[d=2]*Areas[d=1]*Contfrac[d=1]/1e15)"   | "Net Ecosystem Exchange" | "PgC/yr" | "2" 
     61maxveget_forcing | "maxvegetfrac"     |  "" | "maxvegetfrac[d=1,K=12:13@sum]"    | "veget_max fraction of agriculture [sum of pft=12,13] "| "1"  | "Areas[d=1]*Contfrac[d=1]" 
     62vegetn_lands     | "vegetfrac"        |  "" | "vegetfrac[d=1,K=2:9@sum]"         | "veget trees[sum of pft=2:9] (LANDS)"                  | "1"  | "Areas[d=1]*Contfrac[d=1]" 
     63vegetg_lands     | "vegetfrac"        |  "" | "vegetfrac[d=1,K=10:11@sum]"       | "veget natural grasses[sum of pft=10,11] (LANDS)"      | "1"  | "Areas[d=1]*Contfrac[d=1]" 
     64vegeta_lands     | "vegetfrac"        |  "" | "vegetfrac[d=1,K=12:13@sum]"       | "veget agriculture [sum of pft=12,13] (LANDS)"         | "1"  | "Areas[d=1]*Contfrac[d=1]" 
     65 

  • CONFIG/UNIFORM/v6/diff_configurations.ksh

    r2833 r2954  
    1616ConfigFamily=v6 
    1717ConfigList=`ls |grep ${ConfigFamily} |grep -v out` 
    18 ConfigList=$ConfigList" IPSLCM6 IPSLCM6CHT" 
     18#ConfigList=$ConfigList" IPSLCM6 IPSLCM6CHT" 
     19ConfigList="LMDZORINCA_v6 LMDZOR_v6" 
    1920verbose=no 
    2021echo All configurations to tests : $ConfigList 
Note: See TracChangeset for help on using the changeset viewer.