Changeset 2893


Ignore:
Timestamp:
06/10/16 15:33:58 (6 years ago)
Author:
jgipsl
Message:

Updated LMDZOR_v6 as done for IPSLCM6.0.4 from revision [2876] uptil [2892] :

  • changed to use XIOS2 instead of XIOS1
  • LMDZ : added new physique as option NPv5.65, changed default value for solaire constant and pmagic. Added cosp in the compilation.
  • ORCHIDEE : change albedo background file, added new default options : soil freezing and explicitsnow in orchidee.def_CWRR

To be used with LMDZ/testing rev 2546 and ORCHIDEE/trunk ref 3525
See ticket #94

Location:
CONFIG/UNIFORM/v6/LMDZOR_v6
Files:
2 deleted
12 edited
1 copied

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/LMDZOR_v6/AA_make

    r2866 r2893  
    5656 
    5757liborchidee : ../../modeles/ORCHIDEE/ 
    58         (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm -parallel mpi_omp -arch $(FCM_ARCH) -j 8 -xios -driver) 
     58        (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm -parallel mpi_omp -arch $(FCM_ARCH) -j 8 -xios2 -driver) 
    5959 
    6060 
     
    9191lmdz: ../../modeles/LMDZ 
    9292        (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -arch $(FCM_ARCH) -j 8 ce0l ; mv bin/ce0l_$(RESOL_LMDZ)_phylmd_seq.e ../../bin/create_etat0_limit.e ; ) 
    93         (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -mem -cosp false -v true -parallel mpi_omp -arch $(FCM_ARCH) -j 8 -io xios -cpp XIOS1 -rrtm true gcm ; mv bin/gcm_$(RESOL_LMDZ)_phylmd_para_mem_orch.e ../../bin/gcm.e ; ) 
     93        (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -mem -cosp true -v true -parallel mpi_omp -arch $(FCM_ARCH) -j 8 -io xios -rrtm true gcm ; mv bin/gcm_$(RESOL_LMDZ)_phylmd_para_mem_orch.e ../../bin/gcm.e ; ) 
    9494 
    9595 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZ/clim/COMP/lmdz.card

    r2859 r2893  
    7070        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_XY},    gcm.def),          \ 
    7171        (${SUBMIT_DIR}/PARAM/vert.def_L${RESOL_ATM_Z},   vert.def),         \ 
    72         (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \ 
    73         (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \ 
     72        (${MODIPSL}/modeles/LMDZ/DefLists/cosp_input_nl.txt, .),            \ 
     73        (${MODIPSL}/modeles/LMDZ/DefLists/cosp_output_nl.txt, .),           \ 
    7474        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \ 
    7575        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

    r2859 r2893  
    7777        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_XY},    gcm.def),          \ 
    7878        (${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,               .),          \ 
     79        (${MODIPSL}/modeles/LMDZ/DefLists/cosp_input_nl.txt, .),            \ 
     80        (${MODIPSL}/modeles/LMDZ/DefLists/cosp_output_nl.txt, .),           \ 
    8181        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \ 
    8282        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r2759 r2893  
    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.nc, alb_bg.nc ), \ 
    1717        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    1818 
     
    4343Patches = () 
    4444GatherWithInternal = (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) 
     45TimeSeriesVars2D = (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, riverflow, coastalflow) 
    4646ChunckJob2D = NONE 
    4747TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card

    r2859 r2893  
    7171        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_XY},    gcm.def),          \ 
    7272        (${SUBMIT_DIR}/PARAM/vert.def_L${RESOL_ATM_Z},   vert.def),         \ 
    73         (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \ 
    74         (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \ 
     73        (${MODIPSL}/modeles/LMDZ/DefLists/cosp_input_nl.txt, .),            \ 
     74        (${MODIPSL}/modeles/LMDZ/DefLists/cosp_output_nl.txt, .),           \ 
    7575        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \ 
    7676        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

    r2759 r2893  
    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.nc, alb_bg.nc ), \ 
    1717        (${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_2000.nc, PFTmap.nc), \ 
    1818        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
     
    4444Patches = () 
    4545GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds) 
    46 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) 
     46TimeSeriesVars2D = (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, riverflow, coastalflow) 
    4747ChunckJob2D = NONE 
    4848TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee) 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver

    r2859 r2893  
    434434        IGCM_comp_modifyDefFile nonblocker config.def ok_cdnc n  
    435435    fi  
     436 
     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 
    436444 
    437445    # guide.def : Activate nudging if ok_guide=y set in lmdz.card 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/config.def_actuel

    r2505 r2893  
    1010 
    1111##  Facteur additif pour l'albedo 
    12 pmagic=0.0 
     12pmagic=0.01 
    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/LMDZOR_v6/GENERAL/PARAM/config.def_annuel

    r2336 r2893  
    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/LMDZOR_v6/GENERAL/PARAM/config.def_preind

    r2336 r2893  
    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/LMDZOR_v6/GENERAL/PARAM/iodef.xml

    r2606 r2893  
    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/LMDZOR_v6/GENERAL/PARAM/orchidee.def_CWRR

    r2784 r2893  
    9595CO2_FOR_BVOC_POSSELL=n 
    9696 
     97ALB_BG_FILE=alb_bg.nc 
     98ROUGH_DYN=n 
     99OK_FREEZE=y 
     100DEPTH_MAX_T=90 
     101OK_EXPLICITSNOW=y  
     102READ_REFTEMP=n 
Note: See TracChangeset for help on using the changeset viewer.