Ignore:
Timestamp:
Nov 19, 2021, 4:58:59 PM (3 years ago)
Author:
lguez
Message:

Sync latest trunk changes to Ocean_skin

Location:
LMDZ6/branches/Ocean_skin
Files:
8 edited
5 copied

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Ocean_skin

  • LMDZ6/branches/Ocean_skin/DefLists/context_lmdz.xml

    r3812 r4013  
    118118        <axis axis_ref="plev" />
    119119     </grid>
     120
     121     <grid id="grid_glo_plev17">
     122        <domain id="dom_glo" />
     123          <axis axis_ref="pres" long_name="pressure" n_glo="17" name="plev" positive="down" standard_name="air_pressure" unit="Pa" value="(0,16)[ 100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000. ]"><interpolate_axis coordinate="pres" order="1" type="polynomial" />
     124        </axis>
     125     </grid>
     126
    120127     <grid id="grid_out_plev">
    121128        <domain domain_ref="dom_out" />

  • LMDZ6/branches/Ocean_skin/DefLists/context_lmdz_sans_cosp.xml

    r3798 r4013  
    107107     </grid>
    108108
     109     <grid id="grid_glo_plev17">
     110        <domain id="dom_glo" />
     111          <axis axis_ref="pres" long_name="pressure" n_glo="17" name="plev" positive="down" standard_name="air_pressure" unit="Pa" value="(0,16)[ 100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000. ]"><interpolate_axis coordinate="pres" order="1" type="polynomial" />
     112        </axis>
     113     </grid>
     114
    109115     <grid id="grid_out_plev">
    110116        <domain domain_ref="dom_out" />

  • LMDZ6/branches/Ocean_skin/DefLists/field_def_lmdz.xml

    r3812 r4013  
    5656        <field id="t2m_oce"    long_name="Temp 2m oce"    unit="K" />
    5757        <field id="t2m_sic"    long_name="Temp 2m sic"    unit="K" />
     58        <field id="nt2mout"    long_name="nt2m hors intervalle, calc.complet" unit="-" />
     59        <field id="nq2mout"    long_name="nq2m hors intervalle, calc. complet" unit="-" />
     60        <field id="nu2mout"    long_name="nu2m hors intervalle, calc. complet" unit="-" />
     61            <field id="nt2moutfg"  long_name="nt2m hors intervalle, calc. complet/fg" unit="-" />
     62            <field id="nq2moutfg"  long_name="nq2m hors intervalle, calc. complet/fg" unit="-" />
     63            <field id="nu2moutfg"  long_name="nu2m hors intervalle, calc. complet/fg" unit="-" />
    5864        <field id="t2m_probsup25"   field_ref="t2m" long_name="Prob. t2m exceeds 25 degC" unit="-"> t2m &gt; 298.15 </field>
    5965        <field id="t2m_probsup28"   field_ref="t2m" long_name="Prob. t2m exceeds 28 degC" unit="-"> t2m &gt; 301.15 </field>
    … …  
    204210        <field id="tsol_oce"    long_name="Temperature oce"    unit="K" />
    205211        <field id="tsol_sic"    long_name="Temperature sic"    unit="K" />
    206         <field id="evappot_ter"    long_name="Temperature ter"    unit="K" />
    207         <field id="evappot_lic"    long_name="Temperature lic"    unit="K" />
    208         <field id="evappot_oce"    long_name="Temperature oce"    unit="K" />
    209         <field id="evappot_sic"    long_name="Temperature sic"    unit="K" />
     212        <field id="evappot_ter"    long_name="Potential evaporation ter"    unit="kg/(m2*s)" />
     213        <field id="evappot_lic"    long_name="Potential evaporation lic"    unit="kg/(m2*s)" />
     214        <field id="evappot_oce"    long_name="Potential evaporation oce"    unit="kg/(m2*s)" />
     215        <field id="evappot_sic"    long_name="Potential evaporation sic"    unit="kg/(m2*s)" />
    210216        <field id="sens_ter"    long_name="Sensible heat flux ter"    unit="W/m2" />
    211217        <field id="sens_lic"    long_name="Sensible heat flux lic"    unit="W/m2" />
    … …  
    520526        <field id="flx_co2_land"   long_name="CO2 flux from land"             unit="kg CO2/m2/s" />    <!-- Added OB -->
    521527        <field id="flx_co2_ocean"  long_name="CO2 flux from ocean"            unit="kg CO2/m2/s" />    <!-- Added OB -->
     528        <field id="flx_co2_ocean_cor"  long_name="correction of the CO2 flux from ocean"          unit="kg CO2/m2/s" />    <!-- Added PC -->
     529        <field id="flx_co2_land_cor"   long_name="correction of the CO2 flux from land"           unit="kg CO2/m2/s" />    <!-- Added PC -->
    522530        <field id="flx_co2_ff"     long_name="CO2 flux from ff"               unit="kg CO2/m2/s" />    <!-- Added OB -->
    523531        <field id="flx_co2_bb"     long_name="CO2 flux from bb"               unit="kg CO2/m2/s" />    <!-- Added OB -->

  • LMDZ6/branches/Ocean_skin/DefLists/file_def_histLES_lmdz.xml

    r3605 r4013  
    22<file_definition>
    33    <file_group id="defile">
    4         <file id="histLES" name="XhistLES" output_freq="1h" output_level="11" enabled="false" compression_level="0">
     4        <file id="histLES" name="XhistLES" output_freq="1h" output_level="11" enabled=".FALSE." compression_level="0">
    55           
    66            <!-- VARS 1D -->

  • LMDZ6/branches/Ocean_skin/DefLists/file_def_histins_lmdz.xml

    r3605 r4013  
    22<file_definition>
    33    <file_group id="defile">
    4         <file id="histins" name="Xhistins" output_freq="1ts" output_level="11" enabled="false" compression_level="0">
     4        <file id="histins" name="Xhistins" output_freq="1ts" output_level="11" enabled=".FALSE." compression_level="0">
    55           
    66            <!-- VARS 1D -->
    … …  
    374374                <field field_ref="lcc" level="10" />
    375375                <field field_ref="wvapp" level="10" />
    376                 <field field_ref="ozone_daylight" level="10" />
    377376                <field field_ref="albe_ter" level="10" />
    378377                <field field_ref="albe_lic" level="10" />
    … …  
    626625                <field field_ref="rsdcs4co2" level="10" />
    627626                <field field_ref="rldcs4co2" level="10" />
     627                <field field_ref="ozone_daylight" level="10" />
    628628            </field_group>
    629629          </field_group>

  • LMDZ6/branches/Ocean_skin/DefLists/file_def_histmth_lmdz.xml

    r3812 r4013  
    280280                <field field_ref="colO3_strat" level="2" />     <!-- Added ThL -->
    281281                <field field_ref="colO3_trop"  level="2" />     <!-- Added ThL -->
     282                <field field_ref="flx_co2_ocean"  level="1" />
     283                <field field_ref="flx_co2_land"   level="1" />
     284                <field field_ref="flx_co2_ocean_cor" level="1" /> <!-- Added PC -->
     285                <field field_ref="flx_co2_land_cor"  level="1" /> <!-- Added PC -->
     286                <field field_ref="flx_co2_ff"  level="1" />
     287                <field field_ref="flx_co2_bb"  level="1" />
    282288
    283289                <field_group operation="average" detect_missing_value=".true.">
    … …  
    689695            </field_group>
    690696
     697<!--
     698                <field field_ref="psbg" level="5" />
     699                <field field_ref="tro3" level="5" />
     700                <field field_ref="tro3_daylight" level="5" />
     701-->
     702
     703            <!-- VARS 3D -->
     704            <field_group operation="average" grid_ref="grid_glo_plev17">
     705                <field field_ref="temp" name="ta" grid_ref="grid_glo_plev17" level="4" />
     706                <field field_ref="geop" name="zg" grid_ref="grid_glo_plev17" level="4" />
     707                <field field_ref="ovap" name="hus" grid_ref="grid_glo_plev17" level="4" />
     708                <field field_ref="rhum" name="hur" grid_ref="grid_glo_plev17" level="4" />
     709                <field field_ref="vitu" name="ua" grid_ref="grid_glo_plev17" level="4" />
     710                <field field_ref="vitv" name="va" grid_ref="grid_glo_plev17" level="4" />
     711                <field field_ref="vitw" name="wap" grid_ref="grid_glo_plev17" level="4" />
     712<!--
     713                <field field_ref="tro3" name="tro3" grid_ref="grid_glo_plev17" level="4" />
     714                <field field_ref="tro3_daylight" name="tro3_daylight" grid_ref="grid_glo_plev17" level="4" />
     715                <field field_ref="tnondef" name="psbg" grid_ref="grid_glo_plev17" level="4" />
     716                <field field_ref="vitu_vitv" name="uv" grid_ref="grid_glo_plev17" level="4" />
     717                <field field_ref="vitv_ovap" name="vq" grid_ref="grid_glo_plev17" level="4" />
     718                <field field_ref="vitv_temp" name="vT" grid_ref="grid_glo_plev17" level="4" />
     719                <field field_ref="vitw_ovap" name="wq" grid_ref="grid_glo_plev17" level="4" />
     720                <field field_ref="vitv_geop" name="vphi" grid_ref="grid_glo_plev17" level="4" />
     721                <field field_ref="vitw_temp" name="wT" grid_ref="grid_glo_plev17" level="4" />
     722                <field field_ref="vtiu_vitu" name="u2" grid_ref="grid_glo_plev17" level="4" />
     723                <field field_ref="vitv_vitv" name="v2" grid_ref="grid_glo_plev17" level="4" />
     724                <field field_ref="temp_temp" name="T2" grid_ref="grid_glo_plev17" level="4" />
     725-->
     726            </field_group>
     727
    691728            <!-- VARS 3D -->
    692729            <field_group operation="average" grid_ref="grid_out_spectband">

  • LMDZ6/branches/Ocean_skin/DefLists/physiq.def_NPv6.1

    r3812 r4013  
    169169iflag_albedo=1
    170170
     171    # Controle de la definition de l'inertie thermique du sol dans le modele "bucket":
     172    #   0 (default) : constant
     173    #   1 : fonction lineaire de qsol
     174    #   2 : 2 fonctions lineaires de qsol :
     175    #       une pour "sable" (boite lat/lon pour Sahara), une pour le reste (limons et argile)
     176    #   3 : fonction lineaire de qsol, valeurs entre 900 pour qsol=0 et 2000 pour qsol=150
     177iflag_inertie=0
     178
    171179          # Frequence appel convection. Nombre appels par jour
    172180nbapp_cv=48
Note: See TracChangeset for help on using the changeset viewer.