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

Merged trunk changes r2842:2865 into testing branch

Location:
LMDZ5/branches/testing
Files:
8 edited
6 copied

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." />
  • LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml

    r2845 r2870  
    321321                <field field_ref="solswad0" level="10" />
    322322                <field field_ref="solswai" level="10" />
    323                 <field field_ref="OD550_ASBCM" level="10" />
    324                 <field field_ref="OD550_ASPOMM" level="10" />
    325                 <field field_ref="OD550_ASSO4M" level="10" />
    326                 <field field_ref="OD550_CSSO4M" level="10" />
    327                 <field field_ref="OD550_SSSSM" level="10" />
    328                 <field field_ref="OD550_ASSSM" level="10" />
    329                 <field field_ref="OD550_CSSSM" level="10" />
    330                 <field field_ref="OD550_CIDUSTM" level="10" />
    331                 <field field_ref="OD550_AIBCM" level="10" />
    332                 <field field_ref="OD550_AIPOMM" level="10" />
    333                 <field field_ref="OD550_ASNO3M" level="10" />
    334                 <field field_ref="OD550_CSNO3M" level="10" />
    335                 <field field_ref="OD550_CINO3M" level="10" />
    336                 <field field_ref="OD550_STRAT" level="10" />
     323                <field field_ref="od550_ASBCM" level="10" />
     324                <field field_ref="od550_ASPOMM" level="10" />
     325                <field field_ref="od550_ASSO4M" level="10" />
     326                <field field_ref="od550_CSSO4M" level="10" />
     327                <field field_ref="od550_SSSSM" level="10" />
     328                <field field_ref="od550_ASSSM" level="10" />
     329                <field field_ref="od550_CSSSM" level="10" />
     330                <field field_ref="od550_CIDUSTM" level="10" />
     331                <field field_ref="od550_AIBCM" level="10" />
     332                <field field_ref="od550_AIPOMM" level="10" />
     333                <field field_ref="od550_ASNO3M" level="10" />
     334                <field field_ref="od550_CSNO3M" level="10" />
     335                <field field_ref="od550_CINO3M" level="10" />
     336                <field field_ref="od550_STRAT" level="10" />
    337337                <field field_ref="od550aer" level="10" />
    338338                <field field_ref="od865aer" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml

    r2845 r2870  
    327327                <field field_ref="sollwad0" level="10" />
    328328                <field field_ref="sollwai" level="10" />
    329                 <field field_ref="OD550_ASBCM" level="6" />
    330                 <field field_ref="OD550_ASPOMM" level="6" />
    331                 <field field_ref="OD550_ASSO4M" level="6" />
    332                 <field field_ref="OD550_CSSO4M" level="6" />
    333                 <field field_ref="OD550_SSSSM" level="6" />
    334                 <field field_ref="OD550_ASSSM" level="6" />
    335                 <field field_ref="OD550_CSSSM" level="6" />
    336                 <field field_ref="OD550_CIDUSTM" level="6" />
    337                 <field field_ref="OD550_AIBCM" level="6" />
    338                 <field field_ref="OD550_AIPOMM" level="6" />
    339                 <field field_ref="OD550_ASNO3M" level="6" />
    340                 <field field_ref="OD550_CSNO3M" level="6" />
    341                 <field field_ref="OD550_CINO3M" level="6" />
    342                 <field field_ref="OD550_STRAT" level="2" />
     329                <field field_ref="od550_ASBCM" level="6" />
     330                <field field_ref="od550_ASPOMM" level="6" />
     331                <field field_ref="od550_ASSO4M" level="6" />
     332                <field field_ref="od550_CSSO4M" level="6" />
     333                <field field_ref="od550_SSSSM" level="6" />
     334                <field field_ref="od550_ASSSM" level="6" />
     335                <field field_ref="od550_CSSSM" level="6" />
     336                <field field_ref="od550_CIDUSTM" level="6" />
     337                <field field_ref="od550_AIBCM" level="6" />
     338                <field field_ref="od550_AIPOMM" level="6" />
     339                <field field_ref="od550_ASNO3M" level="6" />
     340                <field field_ref="od550_CSNO3M" level="6" />
     341                <field field_ref="od550_CINO3M" level="6" />
     342                <field field_ref="od550_STRAT" level="2" />
    343343                <field field_ref="od550aer" level="6" />
     344                <field field_ref="dryod550aer" level="6" />
    344345                <field field_ref="od865aer" level="6" />
    345346                <field field_ref="abs550aer" level="6" />
  • LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml

    r2845 r2870  
    321321                <field field_ref="solswad0" level="10" />
    322322                <field field_ref="solswai" level="10" />
    323                 <field field_ref="OD550_ASBCM" level="10" />
    324                 <field field_ref="OD550_ASPOMM" level="10" />
    325                 <field field_ref="OD550_ASSO4M" level="10" />
    326                 <field field_ref="OD550_CSSO4M" level="10" />
    327                 <field field_ref="OD550_SSSSM" level="10" />
    328                 <field field_ref="OD550_ASSSM" level="10" />
    329                 <field field_ref="OD550_CSSSM" level="10" />
    330                 <field field_ref="OD550_CIDUSTM" level="10" />
    331                 <field field_ref="OD550_AIBCM" level="10" />
    332                 <field field_ref="OD550_AIPOMM" level="10" />
    333                 <field field_ref="OD550_ASNO3M" level="10" />
    334                 <field field_ref="OD550_CSNO3M" level="10" />
    335                 <field field_ref="OD550_CINO3M" level="10" />
    336                 <field field_ref="OD550_STRAT" level="10" />
     323                <field field_ref="od550_ASBCM" level="10" />
     324                <field field_ref="od550_ASPOMM" level="10" />
     325                <field field_ref="od550_ASSO4M" level="10" />
     326                <field field_ref="od550_CSSO4M" level="10" />
     327                <field field_ref="od550_SSSSM" level="10" />
     328                <field field_ref="od550_ASSSM" level="10" />
     329                <field field_ref="od550_CSSSM" level="10" />
     330                <field field_ref="od550_CIDUSTM" level="10" />
     331                <field field_ref="od550_AIBCM" level="10" />
     332                <field field_ref="od550_AIPOMM" level="10" />
     333                <field field_ref="od550_ASNO3M" level="10" />
     334                <field field_ref="od550_CSNO3M" level="10" />
     335                <field field_ref="od550_CINO3M" level="10" />
     336                <field field_ref="od550_STRAT" level="10" />
    337337                <field field_ref="od550aer" level="10" />
    338338                <field field_ref="od865aer" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml

    r2845 r2870  
    321321                <field field_ref="solswad0" level="10" />
    322322                <field field_ref="solswai" level="10" />
    323                 <field field_ref="OD550_ASBCM" level="10" />
    324                 <field field_ref="OD550_ASPOMM" level="10" />
    325                 <field field_ref="OD550_ASSO4M" level="10" />
    326                 <field field_ref="OD550_CSSO4M" level="10" />
    327                 <field field_ref="OD550_SSSSM" level="10" />
    328                 <field field_ref="OD550_ASSSM" level="10" />
    329                 <field field_ref="OD550_CSSSM" level="10" />
    330                 <field field_ref="OD550_CIDUSTM" level="10" />
    331                 <field field_ref="OD550_AIBCM" level="10" />
    332                 <field field_ref="OD550_AIPOMM" level="10" />
    333                 <field field_ref="OD550_ASNO3M" level="10" />
    334                 <field field_ref="OD550_CSNO3M" level="10" />
    335                 <field field_ref="OD550_CINO3M" level="10" />
    336                 <field field_ref="OD550_STRAT" level="10" />
     323                <field field_ref="od550_ASBCM" level="10" />
     324                <field field_ref="od550_ASPOMM" level="10" />
     325                <field field_ref="od550_ASSO4M" level="10" />
     326                <field field_ref="od550_CSSO4M" level="10" />
     327                <field field_ref="od550_SSSSM" level="10" />
     328                <field field_ref="od550_ASSSM" level="10" />
     329                <field field_ref="od550_CSSSM" level="10" />
     330                <field field_ref="od550_CIDUSTM" level="10" />
     331                <field field_ref="od550_AIBCM" level="10" />
     332                <field field_ref="od550_AIPOMM" level="10" />
     333                <field field_ref="od550_ASNO3M" level="10" />
     334                <field field_ref="od550_CSNO3M" level="10" />
     335                <field field_ref="od550_CINO3M" level="10" />
     336                <field field_ref="od550_STRAT" level="10" />
    337337                <field field_ref="od550aer" level="10" />
    338338                <field field_ref="od865aer" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

    r2845 r2870  
    347347                <field field_ref="sollwad0" level="5" />
    348348                <field field_ref="sollwai" level="5" />
    349                 <field field_ref="OD550_ASBCM" level="2" />
    350                 <field field_ref="OD550_ASPOMM" level="2" />
    351                 <field field_ref="OD550_ASSO4M" level="2" />
    352                 <field field_ref="OD550_CSSO4M" level="2" />
    353                 <field field_ref="OD550_SSSSM" level="2" />
    354                 <field field_ref="OD550_ASSSM" level="2" />
    355                 <field field_ref="OD550_CSSSM" level="2" />
    356                 <field field_ref="OD550_CIDUSTM" level="2" />
    357                 <field field_ref="OD550_AIBCM" level="2" />
    358                 <field field_ref="OD550_AIPOMM" level="2" />
    359                 <field field_ref="OD550_ASNO3M" level="2" />
    360                 <field field_ref="OD550_CSNO3M" level="2" />
    361                 <field field_ref="OD550_CINO3M" level="2" />
    362                 <field field_ref="OD550_STRAT" level="2" />
     349                <field field_ref="od550_ASBCM" level="2" />
     350                <field field_ref="od550_ASPOMM" level="2" />
     351                <field field_ref="od550_ASSO4M" level="2" />
     352                <field field_ref="od550_CSSO4M" level="2" />
     353                <field field_ref="od550_SSSSM" level="2" />
     354                <field field_ref="od550_ASSSM" level="2" />
     355                <field field_ref="od550_CSSSM" level="2" />
     356                <field field_ref="od550_CIDUSTM" level="2" />
     357                <field field_ref="od550_AIBCM" level="2" />
     358                <field field_ref="od550_AIPOMM" level="2" />
     359                <field field_ref="od550_ASNO3M" level="2" />
     360                <field field_ref="od550_CSNO3M" level="2" />
     361                <field field_ref="od550_CINO3M" level="2" />
     362                <field field_ref="od550_STRAT" level="2" />
     363                <field field_ref="dryod550_ASBCM" level="2" />
     364                <field field_ref="dryod550_ASPOMM" level="2" />
     365                <field field_ref="dryod550_ASSO4M" level="2" />
     366                <field field_ref="dryod550_CSSO4M" level="2" />
     367                <field field_ref="dryod550_SSSSM" level="2" />
     368                <field field_ref="dryod550_ASSSM" level="2" />
     369                <field field_ref="dryod550_CSSSM" level="2" />
     370                <field field_ref="dryod550_CIDUSTM" level="2" />
     371                <field field_ref="dryod550_AIBCM" level="2" />
     372                <field field_ref="dryod550_AIPOMM" level="2" />
     373                <field field_ref="dryod550_ASNO3M" level="2" />
     374                <field field_ref="dryod550_CSNO3M" level="2" />
     375                <field field_ref="dryod550_CINO3M" level="2" />
    363376                <field field_ref="od550aer" level="2" />
     377                <field field_ref="dryod550aer" level="2" />
    364378                <field field_ref="od865aer" level="2" />
    365379                <field field_ref="abs550aer" level="2" />
  • LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml

    r2845 r2870  
    321321                <field field_ref="solswad0" level="10" />
    322322                <field field_ref="solswai" level="10" />
    323                 <field field_ref="OD550_ASBCM" level="10" />
    324                 <field field_ref="OD550_ASPOMM" level="10" />
    325                 <field field_ref="OD550_ASSO4M" level="10" />
    326                 <field field_ref="OD550_CSSO4M" level="10" />
    327                 <field field_ref="OD550_SSSSM" level="10" />
    328                 <field field_ref="OD550_ASSSM" level="10" />
    329                 <field field_ref="OD550_CSSSM" level="10" />
    330                 <field field_ref="OD550_CIDUSTM" level="10" />
    331                 <field field_ref="OD550_AIBCM" level="10" />
    332                 <field field_ref="OD550_AIPOMM" level="10" />
    333                 <field field_ref="OD550_ASNO3M" level="10" />
    334                 <field field_ref="OD550_CSNO3M" level="10" />
    335                 <field field_ref="OD550_CINO3M" level="10" />
    336                 <field field_ref="OD550_STRAT" level="10" />
     323                <field field_ref="od550_ASBCM" level="10" />
     324                <field field_ref="od550_ASPOMM" level="10" />
     325                <field field_ref="od550_ASSO4M" level="10" />
     326                <field field_ref="od550_CSSO4M" level="10" />
     327                <field field_ref="od550_SSSSM" level="10" />
     328                <field field_ref="od550_ASSSM" level="10" />
     329                <field field_ref="od550_CSSSM" level="10" />
     330                <field field_ref="od550_CIDUSTM" level="10" />
     331                <field field_ref="od550_AIBCM" level="10" />
     332                <field field_ref="od550_AIPOMM" level="10" />
     333                <field field_ref="od550_ASNO3M" level="10" />
     334                <field field_ref="od550_CSNO3M" level="10" />
     335                <field field_ref="od550_CINO3M" level="10" />
     336                <field field_ref="od550_STRAT" level="10" />
    337337                <field field_ref="od550aer" level="10" />
    338338                <field field_ref="od865aer" level="10" />
Note: See TracChangeset for help on using the changeset viewer.