Ignore:
Timestamp:
Jan 30, 2017, 5:54:45 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2727:2785 into testing branch

Location:
LMDZ5/branches/testing
Files:
1 deleted
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2720 r2787  
    2121<!--  <file_definition src="./file_def_histdayCOSP_lmdz.xml"/> -->
    2222<!--  <file_definition src="./file_def_histhfCOSP_lmdz.xml"/> -->
     23  <file_definition src="./file_def_histstrataer_lmdz.xml"/>
    2324 
    2425  <!-- Define domains and groups of domains -->
  • LMDZ5/branches/testing/DefLists/field_def_lmdz.xml

    r2729 r2787  
    315315        <field id="toplwad"    long_name="LW-ADE at TOA" unit="W/m2" />
    316316        <field id="toplwad0"    long_name="LW-ADE clear-sky at TOA"    unit="W/m2" />
     317        <field id="toplwai"    long_name="LW-AIE clear-sky at TOA"    unit="W/m2" />
    317318        <field id="sollwad"    long_name="LW-ADE at SRF" unit="W/m2" />
    318319        <field id="sollwad0"    long_name="LW-ADE clear-sky at SRF"    unit="W/m2" />
     320        <field id="sollwai"    long_name="LW-AIE at SRF" unit="W/m2" />
    319321        <field id="OD550_ASBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    320322        <field id="OD550_ASPOMM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     
    618620
    619621    <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="-" />
     622        <field id="ext_strat_550"        long_name="Strat. aerosol extinction coefficient at 550 nm"       unit="1/m" />
     623        <field id="ext_strat_1020"       long_name="Strat. aerosol extinction coefficient at 1020 nm"      unit="1/m" />
     624        <field id="budg_3D_nucl"         long_name="H2SO4 nucleation mass flux"                            unit="kg(S)/m2/layer/s" />
     625        <field id="budg_3D_cond_evap"    long_name="H2SO4 net condensation/evaporation mass flux"          unit="kg(S)/m2/layer/s" />
     626        <field id="budg_3D_ocs_to_so2"   long_name="OCS mass flux converted to SO2"                        unit="kg(S)/m2/layer/s" />
     627        <field id="budg_3D_so2_to_h2so4" long_name="SO2 mass flux converted to H2SO4"                      unit="kg(S)/m2/layer/s" />
     628        <field id="budg_3D_backgr_ocs"   long_name="OCS background tendency"                               unit="kg(S)/m2/layer/s" />
     629        <field id="budg_3D_backgr_so2"   long_name="SO2 background tendency"                               unit="kg(S)/m2/layer/s" />
     630        <field id="R2SO4"                long_name="H2SO4 mass fraction in aerosol"                        unit="%" />
     631        <field id="OCS_lifetime"         long_name="OCS lifetime"                                          unit="s" />
     632        <field id="SO2_lifetime"         long_name="SO2 lifetime"                                          unit="s" />
     633        <field id="vsed_aer"             long_name="Strat. aerosol sedimentation velocity (mass-weighted)" unit="m/s" />
     634        <field id="f_r_wet"              long_name="Conversion factor dry to wet aerosol radius"           unit="-" />
    633635    </field_group>
    634636
     
    636638        <field id="OD550_strat_only"   long_name="Stratospheric Aerosol Optical depth at 550 nm "        unit="1" />
    637639        <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" />
    640640        <field id="surf_PM25_sulf"     long_name="Sulfate PM2.5 concentration at the surface"            unit="ug/m3" />
    641641        <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" />
     642        <field id="budg_dep_dry_h2so4" long_name="H2SO4 dry deposition flux"                             unit="kg(S)/m2/s" />
     643        <field id="budg_dep_wet_h2so4" long_name="H2SO4 wet deposition flux"                             unit="kg(S)/m2/s" />
     644        <field id="budg_dep_dry_part"  long_name="Particle S dry deposition flux"                        unit="kg(S)/m2/s" />
     645        <field id="budg_dep_wet_part"  long_name="Particle S wet deposition flux"                        unit="kg(S)/m2/s" />
     646        <field id="budg_emi_ocs"       long_name="OCS emission flux"                                     unit="kg(S)/m2/s" />
     647        <field id="budg_emi_so2"       long_name="SO2 emission flux"                                     unit="kg(S)/m2/s" />
     648        <field id="budg_emi_h2so4"     long_name="H2SO4 emission flux"                                   unit="kg(S)/m2/s" />
     649        <field id="budg_emi_part"      long_name="Particle S emission flux"                              unit="kg(S)/m2/s" />
     650        <field id="budg_ocs_to_so2"    long_name="OCS to SO2 conversion flux"                            unit="kg(S)/m2/s" />
     651        <field id="budg_so2_to_h2so4"  long_name="SO2 to H2SO4 conversion flux"                          unit="kg(S)/m2/s" />
     652        <field id="budg_h2so4_to_part" long_name="H2SO4 to particle conversion flux"                     unit="kg(S)/m2/s" />
     653        <field id="budg_sed_part"      long_name="Ground sedimentation flux of strat. particles"         unit="kg(S)/m2/s" />
    643654    </field_group>
    644655   
     
    926937    </field_group>
    927938
    928    <field_group id="field_scalar" operation="instant" freq_op="30d" grid_ref="grid_scalar">
     939   <field_group id="field_scalar" operation="instant" grid_ref="grid_scalar">
    929940      <field id="R_ecc" long_name="R_ecc" unit="-" />
    930941      <field id="R_peri" long_name="R_peri" unit="-" />
  • LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml

    r2720 r2787  
    321321                <field field_ref="solswad0" level="10" />
    322322                <field field_ref="solswai" level="10" />
     323                <field field_ref="toplwad" level="10" />
     324                <field field_ref="toplwad0" level="10" />
     325                <field field_ref="toplwai" level="10" />
     326                <field field_ref="sollwad" level="10" />
     327                <field field_ref="sollwad0" level="10" />
     328                <field field_ref="sollwai" level="10" />
    323329                <field field_ref="OD550_ASBCM" level="6" />
    324330                <field field_ref="OD550_ASPOMM" level="6" />
  • LMDZ5/branches/testing/DefLists/file_def_histmthCOSP_lmdz.xml

    r2720 r2787  
    11<file_definition>
    22     <file_group id="defile">
    3         <file id="histmthCOSP" name="histmthCOSP" output_freq="30d" output_level="1"  enabled="_AUTO_">
     3        <file id="histmthCOSP" name="histmthCOSP" output_freq="1mo" output_level="1"  enabled="_AUTO_">
    44
    55            <!-- VARS Calipso and PARASOL -->
  • LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

    r2720 r2787  
    1010<!--            </field_group>  -->
    1111
    12             <field_group operation="instant" freq_op="30d">
     12            <field_group operation="instant">
    1313                <field field_ref="R_ecc" level="1" name="R_ecc" />
    1414                <field field_ref="R_peri" level="1" name="R_peri" />
     
    4343                <field field_ref="tsol"         level="1" />
    4444                <field field_ref="t2m"          level="1" />
    45                 <field field_ref="t2m_min" level="1" operation="minimum" />
    46                 <field field_ref="t2m_max" level="1" operation="maximum" />
     45                <field id="ave_t2m_daily_min" field_ref="t2m_min" name="ave_t2m_daily_min" level="1" operation="average" freq_op="1d"> @t2m_min </field>
     46                <field id="ave_t2m_daily_max" field_ref="t2m_max" name="ave_t2m_daily_max" level="1" operation="average" freq_op="1d"> @t2m_max </field>
    4747                <field field_ref="t2m_ter" level="10" />
    4848                <field field_ref="t2m_lic" level="10" />
     
    341341                <field field_ref="solswad0" level="5" />
    342342                <field field_ref="solswai" level="5" />
     343                <field field_ref="toplwad" level="5" />
     344                <field field_ref="toplwad0" level="5" />
     345                <field field_ref="toplwai" level="5" />
     346                <field field_ref="sollwad" level="5" />
     347                <field field_ref="sollwad0" level="5" />
     348                <field field_ref="sollwai" level="5" />
    343349                <field field_ref="OD550_ASBCM" level="2" />
    344350                <field field_ref="OD550_ASPOMM" level="2" />
     
    600606            </field_group>
    601607
    602             <field_group group_ref="fields_strataer_3D" operation="average" freq_op="1ts" level="1" />
    603             <field_group group_ref="fields_strataer_2D" operation="average" freq_op="1ts" level="1" />
    604             <field_group group_ref="fields_strataer_trac_3D" operation="average" freq_op="1ts" level="1" />
    605             <field_group group_ref="fields_strataer_trac_2D" operation="average" freq_op="1ts" level="1" />
    606 
    607608        </file>
    608609
Note: See TracChangeset for help on using the changeset viewer.