Ignore:
Timestamp:
May 4, 2017, 9:31:05 AM (7 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2842:2865 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

    r2845 r2870  
    319319        <field id="sollwad0"    long_name="LW-ADE clear-sky at SRF"    unit="W/m2" />
    320320        <field id="sollwai"    long_name="LW-AIE at SRF" unit="W/m2" />
    321         <field id="OD550_ASBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    322         <field id="OD550_ASPOMM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    323         <field id="OD550_ASSO4M"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    324         <field id="OD550_CSSO4M"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    325         <field id="OD550_SSSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    326         <field id="OD550_ASSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    327         <field id="OD550_CSSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    328         <field id="OD550_CIDUSTM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    329         <field id="OD550_AIBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    330         <field id="OD550_AIPOMM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    331         <field id="OD550_STRAT"    long_name="Aerosol Optical depth at 550 nm "    unit="1" enabled="TRUE" />
    332         <field id="OD550_SO4"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    333         <field id="OD550_ASNO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    334         <field id="OD550_CSNO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    335         <field id="OD550_CINO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    336         <field id="OD_10um_STRAT" long_name="Stratospheric Aerosol Optical depth at 10 um" unit="-" />
    337         <field id="od443aer" long_name="Total aerosol optical depth at 440nm" unit="-" />
    338         <field id="od550aer"    long_name="Total aerosol optical depth at 550nm"    unit="-" />
     321        <field id="od550_ASBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     322        <field id="od550_ASPOMM"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     323        <field id="od550_ASSO4M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     324        <field id="od550_CSSO4M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     325        <field id="od550_SSSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     326        <field id="od550_ASSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     327        <field id="od550_CSSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     328        <field id="od550_CIDUSTM"  long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     329        <field id="od550_AIBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     330        <field id="od550_AIPOMM"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     331        <field id="od550_ASNO3M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     332        <field id="od550_CSNO3M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     333        <field id="od550_CINO3M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     334        <field id="od550_STRAT"    long_name="Aerosol Optical depth at 550 nm "    unit="1" enabled="TRUE" />
     335        <field id="dryod550_ASBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     336        <field id="dryod550_ASPOMM"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     337        <field id="dryod550_ASSO4M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     338        <field id="dryod550_CSSO4M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     339        <field id="dryod550_SSSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     340        <field id="dryod550_ASSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     341        <field id="dryod550_CSSSM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     342        <field id="dryod550_CIDUSTM"  long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     343        <field id="dryod550_AIBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     344        <field id="dryod550_AIPOMM"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     345        <field id="dryod550_ASNO3M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     346        <field id="dryod550_CSNO3M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     347        <field id="dryod550_CINO3M"   long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     348        <field id="od_10um_STRAT"  long_name="Stratospheric Aerosol Optical depth at 10 um" unit="-" />
     349        <field id="od443aer"    long_name="Total aerosol optical depth at 440nm" unit="-" />
     350        <field id="od550aer"    long_name="Total aerosol optical depth at 550nm" unit="-" />
     351        <field id="dryod550aer" long_name="Total dry aerosol optical depth at 550nm"    unit="-" />
    339352        <field id="od865aer"    long_name="Total aerosol optical depth at 870nm"    unit="-" />
    340         <field id="abs550aer"    long_name="Absorption aerosol optical depth at 550nm"    unit="-" />
    341         <field id="od550lt1aer"    long_name="Fine mode optical depth"    unit="-" />
     353        <field id="abs550aer"   long_name="Absorption aerosol optical depth at 550nm"    unit="-" />
     354        <field id="od550lt1aer" long_name="Fine mode optical depth"    unit="-" />
    342355        <field id="sconcso4"    long_name="Surface Concentration of Sulfate "    unit="kg/m3" />
    343356        <field id="sconcno3"    long_name="Surface Concentration of Nitrate "    unit="kg/m3" />
    344         <field id="sconcoa"    long_name="Surface Concentration of Organic Aerosol "    unit="kg/m3" />
    345         <field id="sconcbc"    long_name="Surface Concentration of Black Carbon "    unit="kg/m3" />
    346         <field id="sconcss"    long_name="Surface Concentration of Sea Salt "    unit="kg/m3" />
    347         <field id="sconcdust"    long_name="Surface Concentration of Dust "    unit="kg/m3" />
    348         <field id="loadso4"    long_name="Column Load of Sulfate "    unit="kg/m2" />
     357        <field id="sconcoa"     long_name="Surface Concentration of Organic Aerosol "    unit="kg/m3" />
     358        <field id="sconcbc"     long_name="Surface Concentration of Black Carbon "    unit="kg/m3" />
     359        <field id="sconcss"     long_name="Surface Concentration of Sea Salt "    unit="kg/m3" />
     360        <field id="sconcdust"   long_name="Surface Concentration of Dust "    unit="kg/m3" />
     361        <field id="loadso4"   long_name="Column Load of Sulfate "    unit="kg/m2" />
    349362        <field id="loadoa"    long_name="Column Load of Organic Aerosol "    unit="kg/m2" />
    350363        <field id="loadbc"    long_name="Column Load of Black Carbon "    unit="kg/m2" />
    351364        <field id="loadss"    long_name="Column Load of Sea Salt "    unit="kg/m2" />
    352         <field id="loaddust"    long_name="Column Load of Dust "    unit="kg/m2" />
    353         <field id="loadno3"     long_name="Column Load of Nitrate " unit="kg/m2" />
     365        <field id="loaddust"  long_name="Column Load of Dust "    unit="kg/m2" />
     366        <field id="loadno3"   long_name="Column Load of Nitrate " unit="kg/m2" />
    354367        <field id="swtoaas_nat"    long_name="Natural aerosol radiative forcing all-sky at TOA"    unit="W/m2" />
    355368        <field id="swsrfas_nat"    long_name="Natural aerosol radiative forcing all-sky at SRF"    unit="W/m2" />
     
    638651
    639652    <field_group id="fields_strataer_2D" domain_ref="dom_glo">
    640         <field id="OD550_strat_only"   long_name="Stratospheric Aerosol Optical depth at 550 nm "        unit="1" />
    641         <field id="OD1020_strat_only"  long_name="Stratospheric Aerosol Optical depth at 1020 nm "       unit="1" />
     653        <field id="od550_strat_only"   long_name="Stratospheric Aerosol Optical depth at 550 nm "        unit="1" />
     654        <field id="od1020_strat_only"  long_name="Stratospheric Aerosol Optical depth at 1020 nm "       unit="1" />
    642655        <field id="surf_PM25_sulf"     long_name="Sulfate PM2.5 concentration at the surface"            unit="ug/m3" />
    643656        <field id="p_tropopause"       long_name="Tropopause pressure"                                   unit="Pa" />
     
    774787
    775788    <field_group id="fields_COSP_ISCCP" domain_ref="dom_glo" freq_op="3h">
    776       <field id="sunlit" long_name="1 for day points, 0 for nightime" unit="1"  detect_missing_value=".true."  detect_missing_value=".true." />
     789      <field id="sunlit" long_name="1 for day points, 0 for nightime" unit="1" detect_missing_value=".true." />
    777790      <field id="boxtauisccp" long_name="Optical Depth in Each Column as Calculated by the ISCCP Simulator" unit="1" axis_ref="column"  detect_missing_value=".true." />
    778791      <field id="boxptopisccp" long_name="Cloud Top Pressure in Each Column as Calculated by the ISCCP Simulator" unit="Pa" axis_ref="column"  detect_missing_value=".true." />
Note: See TracChangeset for help on using the changeset viewer.