Ignore:
Timestamp:
Nov 30, 2016, 1:28:41 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2664:2719 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/DefLists/field_def_lmdz.xml

    r2669 r2720  
    111111        <field id="bils_enthalp"    long_name="Surf. total heat flux"    unit="W/m2" />
    112112        <field id="bils_latent"    long_name="Surf. total heat flux"    unit="W/m2" />
    113         <field id="bils_ech"    long_name="peu importe"    unit="W/m2" />
    114         <field id="du_gwd_rando"    long_name="peu importe"    unit="W/m2" />
    115         <field id="dv_gwd_rando"    long_name="peu importe"    unit="W/m2" />
    116         <field id="ustr_gwd_hines"    long_name="zonal wind stress Hines gravity waves"    unit="Pa" />
    117         <field id="vstr_gwd_hines"    long_name="meridional wind stress Hines gravity waves"    unit="Pa" />
    118         <field id="ustr_gwd_front"    long_name="zonal wind stress fronts gravity waves"    unit="Pa" />
    119         <field id="vstr_gwd_front"    long_name="meridional wind stress fronts gravity waves"    unit="Pa" />
    120         <field id="ustr_gwd_rando"    long_name="zonal wind stress random gravity waves"    unit="Pa" />
    121         <field id="vstr_gwd_rando"    long_name="meridinal wind stress random gravity waves"    unit="Pa" />
     113        <field id="bils_ech"    long_name="peu importe"    unit="W/m2" />
     114        <field id="du_gwd_rando"    long_name="peu importe"    unit="W/m2" />
     115        <field id="dv_gwd_rando"    long_name="peu importe"    unit="W/m2" />
     116        <field id="ustr_gwd_hines"    long_name="zonal wind stress Hines gravity waves"    unit="Pa" />
     117        <field id="vstr_gwd_hines"    long_name="meridional wind stress Hines gravity waves"    unit="Pa" />
     118        <field id="ustr_gwd_front"    long_name="zonal wind stress fronts gravity waves"    unit="Pa" />
     119        <field id="vstr_gwd_front"    long_name="meridional wind stress fronts gravity waves"    unit="Pa" />
     120        <field id="ustr_gwd_rando"    long_name="zonal wind stress random gravity waves"    unit="Pa" />
     121        <field id="vstr_gwd_rando"    long_name="meridinal wind stress random gravity waves"    unit="Pa" />
    122122        <field id="sens"    long_name="Sensible heat flux"    unit="W/m2" />
    123123        <field id="fder"    long_name="Heat flux derivation"    unit="W/m2" />
     
    176176        <field id="wbilo_oce"    long_name="Bilan eau oce"    unit="kg/(m2*s)" />
    177177        <field id="wbilo_sic"    long_name="Bilan eau sic"    unit="kg/(m2*s)" />
     178        <field id="wevap_ter"    long_name="Evap eau ter"    unit="kg/(m2*s)" />
     179        <field id="wevap_lic"    long_name="Evap eau lic"    unit="kg/(m2*s)" />
     180        <field id="wevap_oce"    long_name="Evap eau oce"    unit="kg/(m2*s)" />
     181        <field id="wevap_sic"    long_name="Evap eau sic"    unit="kg/(m2*s)" />
     182        <field id="wrain_ter"    long_name="Pluie eau ter"    unit="kg/(m2*s)" />
     183        <field id="wrain_lic"    long_name="Pluie eau lic"    unit="kg/(m2*s)" />
     184        <field id="wrain_oce"    long_name="Pluie eau oce"    unit="kg/(m2*s)" />
     185        <field id="wrain_sic"    long_name="Pluie eau sic"    unit="kg/(m2*s)" />
     186        <field id="wsnow_ter"    long_name="Neige eau ter"    unit="kg/(m2*s)" />
     187        <field id="wsnow_lic"    long_name="Neige eau lic"    unit="kg/(m2*s)" />
     188        <field id="wsnow_oce"    long_name="Neige eau oce"    unit="kg/(m2*s)" />
     189        <field id="wsnow_sic"    long_name="Neige eau sic"    unit="kg/(m2*s)" />
    178190        <field id="cdrm"    long_name="Momentum drag coef."    unit="-" />
    179191        <field id="cdrh"    long_name="Heat drag coef."    unit="-" />
     
    479491        <field id="upwd"    long_name="saturated updraft"    unit="kg/m2/s" />
    480492        <field id="ep"    long_name="ep"    unit="su" />
     493        <field id="duphy"    long_name="Physics du"    unit="K/s" />
    481494        <field id="dtphy"    long_name="Physics dT"    unit="K/s" />
    482495        <field id="dqphy"    long_name="Physics dQ"    unit="(kg/kg)/s" />
     
    560573        <field id="dulif"    long_name="Orography dU"    unit="m/s2" />
    561574        <field id="dvlif"    long_name="Orography dV"    unit="m/s2" />
    562         <field id="du_gwd_hines" long_name="Hines GWD dU" unit="m/s2" />
    563         <field id="dv_gwd_hines" long_name="Hines GWD dV" unit="m/s2" />
    564         <field id="du_gwd_front" long_name="Fronts GWD dU" unit="m/s2" />
    565         <field id="dv_gwd_front" long_name="Fronts GWD dV" unit="m/s2" />
    566         <field id="east_gwstress" long_name="Eastward GW Stress" unit="Pa" />
    567         <field id="west_gwstress" long_name="Westward GW Stress" unit="Pa" />
     575        <field id="du_gwd_hines" long_name="Hines GWD dU" unit="m/s2" />
     576        <field id="dv_gwd_hines" long_name="Hines GWD dV" unit="m/s2" />
     577        <field id="du_gwd_front" long_name="Fronts GWD dU" unit="m/s2" />
     578        <field id="dv_gwd_front" long_name="Fronts GWD dV" unit="m/s2" />
     579        <field id="east_gwstress" long_name="Eastward GW Stress" unit="Pa" />
     580        <field id="west_gwstress" long_name="Westward GW Stress" unit="Pa" />
    568581        <field id="dtoro"    long_name="Orography dT"    unit="K/s" />
    569582        <field id="dtlif"    long_name="Orography dT"    unit="K/s" />
     
    600613        <field id="stratomask"    long_name="Stratospheric fraction"    unit="-" />
    601614    </field_group>
     615
     616    <field_group id="fields_strataer_trac_3D" domain_ref="dom_glo" axis_ref="presnivs"/>
     617    <field_group id="fields_strataer_trac_2D" domain_ref="dom_glo"/>
     618
     619    <field_group id="fields_strataer_3D" domain_ref="dom_glo" axis_ref="presnivs">
     620        <field id="ext_strat_550"      long_name="Strat. aerosol extinction coefficient at 550 nm"       unit="1/m" />
     621        <field id="ext_strat_1020"     long_name="Strat. aerosol extinction coefficient at 1020 nm"      unit="1/m" />
     622        <field id="sulf_convert"       long_name="SO2 mass flux converted to H2SO4"                      unit="kg(S)/m2/layer/s" />
     623        <field id="sulf_nucl"          long_name="H2SO4 nucleation mass flux"                            unit="kg(S)/m2/layer/s" />
     624        <field id="sulf_cond_evap"     long_name="H2SO4 condensation/evaporation mass flux"              unit="kg(S)/m2/layer/s" />
     625        <field id="ocs_convert"        long_name="OCS mass flux converted to SO2"                        unit="kg(S)/m2/layer/s" />
     626        <field id="R2SO4"              long_name="H2SO4 mass fraction in aerosol"                        unit="%" />
     627        <field id="OCS_lifetime"       long_name="OCS lifetime"                                          unit="s" />
     628        <field id="SO2_lifetime"       long_name="SO2 lifetime"                                          unit="s" />
     629        <field id="SO2_backgr_tend"    long_name="SO2 background tendency"                               unit="kg(S)/m2/layer/s" />
     630        <field id="OCS_backgr_tend"    long_name="OCS background tendency"                               unit="kg(S)/m2/layer/s" />
     631        <field id="vsed_aer"           long_name="Strat. aerosol sedimentation velocity (mass-weighted)" unit="m/s" />
     632        <field id="f_r_wet"            long_name="Conversion factor dry to wet aerosol radius"           unit="-" />
     633    </field_group>
     634
     635    <field_group id="fields_strataer_2D" domain_ref="dom_glo">
     636        <field id="OD550_strat_only"   long_name="Stratospheric Aerosol Optical depth at 550 nm "        unit="1" />
     637        <field id="OD1020_strat_only"  long_name="Stratospheric Aerosol Optical depth at 1020 nm "       unit="1" />
     638        <field id="sulf_dep_dry"       long_name="Sulfur dry deposition flux"                            unit="kg(S)/m2/s" />
     639        <field id="sulf_dep_wet"       long_name="Sulfur wet deposition flux"                            unit="kg(S)/m2/s" />
     640        <field id="surf_PM25_sulf"     long_name="Sulfate PM2.5 concentration at the surface"            unit="ug/m3" />
     641        <field id="p_tropopause"       long_name="Tropopause pressure"                                   unit="Pa" />
     642        <field id="sflux"              long_name="Ground sedimentation flux of strat. particles"         unit="kg(S)/m2/s" />
     643    </field_group>
    602644   
    603645    <field_group  id="fields_NMC" domain_ref="dom_glo" axis_ref="plev">
     
    624666    </field_group>
    625667
    626     <field_group id="fields_trac" domain_ref="dom_glo">
     668    <field_group id="fields_trac_2D" domain_ref="dom_glo">
    627669          <field id="cumRN"    long_name="Cumulated tracer  RNVL1"    unit="-" />
    628670          <field id="cumPB"    long_name="Cumulated tracer  PBVL1"    unit="-" />
    629           <field id="cumAga"    long_name="Cumulated tracer  Aga"    unit="-" />
    630     </field_group>
    631 
    632     <field_group id="fields_trac" domain_ref="dom_glo" axis_ref="presnivs">
     671          <field id="cumAga"   long_name="Cumulated tracer  Aga"    unit="-" />
     672          <field id="cumdRN_dry"  long_name="Surface dry deposition tracer  RNVL1"  unit="- s-1" />
     673          <field id="cumdPB_dry"  long_name="Surface dry deposition tracer  PBVL1"  unit="- s-1" />
     674          <field id="cumdAga_dry" long_name="Surface dry deposition tracer  Aga"    unit="- s-1" />
     675    </field_group>
     676
     677    <field_group id="fields_trac_3D" domain_ref="dom_glo" axis_ref="presnivs">
    633678      <field id="RN"    long_name="Tracer RNVL1"    unit="-" />
    634679      <field id="dRN_vdf"    long_name="Tendance tracer RNVL1"    unit="-" />
     
    720765      <field id="c20_atb532" long_name="Lidar Attenuated Total Backscatter (532 nm)" unit="1" axis_ref="height_mlev" />
    721766      <field id="beta_mol532" long_name="Lidar Molecular Backscatter (532 nm)" unit="m-1 sr-1" axis_ref="height_mlev" />
    722       <field id="cllcalipsoice"    long_name="Lidar Ice-Phase Low-level Cloud Fraction"   unit="%" />
    723       <field id="clhcalipsoice"    long_name="Lidar Ice-Phase Hight-level Cloud Fraction"   unit="%" />
    724       <field id="clmcalipsoice"    long_name="Lidar Ice-Phase Mid-level Cloud Fraction"   unit="%" />
    725       <field id="cltcalipsoice"    long_name="Lidar Ice-Phase Total Cloud Fraction"   unit="%" />
    726       <field id="clcalipsoice"  long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
    727       <field id="cllcalipsoliq"    long_name="Lidar Liq-Phase Low-level Cloud Fraction"   unit="%" />
    728       <field id="clhcalipsoliq"    long_name="Lidar Liq-Phase Hight-level Cloud Fraction"   unit="%" />
    729       <field id="clmcalipsoliq"    long_name="Lidar Liq-Phase Mid-level Cloud Fraction"   unit="%" />
    730       <field id="cltcalipsoliq"    long_name="Lidar Liq-Phase Total Cloud Fraction"   unit="%" />
    731       <field id="clcalipsoliq"  long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
     767      <field id="cllcalipsoice"   long_name="Lidar Ice-Phase Low-level Cloud Fraction"   unit="%" />
     768      <field id="clhcalipsoice"   long_name="Lidar Ice-Phase Hight-level Cloud Fraction"   unit="%" />
     769      <field id="clmcalipsoice"   long_name="Lidar Ice-Phase Mid-level Cloud Fraction"   unit="%" />
     770      <field id="cltcalipsoice"   long_name="Lidar Ice-Phase Total Cloud Fraction"   unit="%" />
     771      <field id="clcalipsoice"    long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
     772      <field id="cllcalipsoliq"   long_name="Lidar Liq-Phase Low-level Cloud Fraction"   unit="%" />
     773      <field id="clhcalipsoliq"   long_name="Lidar Liq-Phase Hight-level Cloud Fraction"   unit="%" />
     774      <field id="clmcalipsoliq"   long_name="Lidar Liq-Phase Mid-level Cloud Fraction"   unit="%" />
     775      <field id="cltcalipsoliq"   long_name="Lidar Liq-Phase Total Cloud Fraction"   unit="%" />
     776      <field id="clcalipsoliq"    long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
    732777      <field id="cllcalipsoun"    long_name="Lidar Undefined-Phase Low-level Cloud Fraction"   unit="%" />
    733778      <field id="clhcalipsoun"    long_name="Lidar Undefined-Phase Hight-level Cloud Fraction"   unit="%" />
    734779      <field id="clmcalipsoun"    long_name="Lidar Undefined-Phase Mid-level Cloud Fraction"   unit="%" />
    735780      <field id="cltcalipsoun"    long_name="Lidar Undefined-Phase Total Cloud Fraction"   unit="%" />
    736       <field id="clcalipsoun"  long_name="Lidar Undefined-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
    737       <field id="clcalipsotmp"  long_name="Lidar Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
    738       <field id="clcalipsotmpliq"  long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
    739       <field id="clcalipsotmpice"  long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
     781      <field id="clcalipsoun"     long_name="Lidar Undefined-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
     782      <field id="clcalipsotmp"    long_name="Lidar Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
     783      <field id="clcalipsotmpliq" long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
     784      <field id="clcalipsotmpice" long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
    740785      <field id="clcalipsotmpun"  long_name="Undefined-Phase Total Cloud Fraction"   unit="%" axis_ref="temp" />
    741786    </field_group> 
     
    867912    </field_group>
    868913
    869 
    870914   <field_group id="field_scalar" operation="instant" freq_op="30d" grid_ref="grid_scalar">
    871915      <field id="R_ecc" long_name="R_ecc" unit="-" />
     
    873917      <field id="R_incl" long_name="R_incl" unit="deg" />
    874918      <field id="solaire" long_name="solaire" unit="W/m2" />
    875 
    876919      <field id="rsun1" long_name="Fraction constante solaire bande 1" unit="W/m2" />
    877920      <field id="rsun2" long_name="Fraction constante solaire bande 2" unit="W/m2" />
     
    880923      <field id="rsun5" long_name="Fraction constante solaire bande 5" unit="W/m2" />
    881924      <field id="rsun6" long_name="Fraction constante solaire bande 6" unit="W/m2" />
    882 
    883925      <field id="co2_ppm" long_name="co2_ppm" unit="ppm" />
    884926      <field id="CH4_ppb" long_name="CH4_ppb" unit="ppb" />
Note: See TracChangeset for help on using the changeset viewer.