Ignore:
Timestamp:
Feb 22, 2021, 12:44:07 PM (4 years ago)
Author:
dcugnet
Message:

Update the branch to the current trunk.

Location:
LMDZ6/branches/LMDZ-tracers
Files:
8 edited
2 copied

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/LMDZ-tracers

  • LMDZ6/branches/LMDZ-tracers/DefLists/CMIP6_ping_atmos.xml

    r3484 r3851  
    155155   <field id="CMIP6_loadss"        field_ref="loadss"           /> <!-- P1 (kg m-2) atmosphere_mass_content_of_seasalt_dry_aerosol : Load of Seasalt -->
    156156   <field id="CMIP6_longitude"     field_ref="dummy_not_provided"         /> <!-- P1 (degrees_east) longitude : Longitude -->
     157   <!--field id="CMIP6_lwsffluxaero"  field_ref="sollwad"         --> <!-- P2 (W m-2) longwave__flux__due_to_volcanic_aerosols_at_the_surface : downwelling longwave  flux  due to volcanic aerosols at the surface to be diagnosed through double radiation call with ok_volcan=y-->
    157158   <field id="CMIP6_lwsffluxaero"  field_ref="dummy_not_provided"         /> <!-- P2 (W m-2) longwave__flux__due_to_volcanic_aerosols_at_the_surface : downwelling longwave  flux  due to volcanic aerosols at the surface to be diagnosed through double radiation call -->
    158159   <field id="CMIP6_lwsrfasdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) surface_instantaneous_longwave_forcing_due_to_dust : All-sky Surface Longwave radiative flux due to Dust -->
     
    161162   <field id="CMIP6_lwtoacsaer"    field_ref="toplwad0"         /> <!-- P1 (W m-2) toa_instantaneous_longwave_forcing : Clear-Sky LW-RF Aerosols at TOA -->
    162163   <field id="CMIP6_lwtoacsdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) toa_instantaneous_longwave_forcing_due_to_dust_in_clearsky : Clear-sky TOA Longwave radiative flux due to Dust -->
     164   <!-- field id="CMIP6_lwtoafluxaerocs" field_ref="toplwad0"       --> <!-- P1 (W m-2) longwave_flux_due_to_volcanic_aerosols_at_TOA_under_clear_sky : downwelling longwave flux due to volcanic aerosols at TOA under clear sky to be diagnosed through double radiation call with ok_volcan=y -->
    163165   <field id="CMIP6_lwtoafluxaerocs" field_ref="dummy_not_provided"       /> <!-- P1 (W m-2) longwave_flux_due_to_volcanic_aerosols_at_TOA_under_clear_sky : downwelling longwave flux due to volcanic aerosols at TOA under clear sky to be diagnosed through double radiation call -->
    164166   <field id="CMIP6_mc"            field_ref="mc"               /> <!-- P1 (kg m-2 s-1) atmosphere_net_upward_convective_mass_flux : The net mass flux should represent the difference between the updraft and downdraft components.  The flux is computed as the mass divided by the area of the grid cell. -->
     
    282284   <field id="CMIP6_snwc"          field_ref="dummy_not_provided"         /> <!-- P1 (kg m-2) canopy_snow_amount : canopy_snow_amount -->
    283285   <field id="CMIP6_solbnd"        field_ref="solbnd"         />  <!-- P1 (W m-2) solar_irradiance : Top-of-Atmosphere Solar Insolation for each band -->
     286   <!-- field id="CMIP6_swsffluxaero"  field_ref="solswad"         --> <!-- P2 (W m-2) shortwave__flux_due_to_volcanic_aerosols_at__the_surface : downwelling shortwave  flux due to volcanic aerosols at  the surface to be diagnosed through double radiation call with ok_volcan=y-->
    284287   <field id="CMIP6_swsffluxaero"  field_ref="dummy_not_provided"         /> <!-- P2 (W m-2) shortwave__flux_due_to_volcanic_aerosols_at__the_surface : downwelling shortwave  flux due to volcanic aerosols at  the surface to be diagnosed through double radiation call -->
    285288   <field id="CMIP6_swsrfasdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) tendency_of_all_sky_surface_shortwave_flux_due_to_dust_ambient_aerosol_particles : All-sky Surface Shortwave radiative flux due to Dust -->
     
    287290   <field id="CMIP6_swtoaasdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) toa_instantaneous_shortwave_forcing : all sky sw-rf dust at toa -->
    288291   <field id="CMIP6_swtoacsdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) toa_instantaneous_shortwave_forcing : clear sky sw-rf dust at toa -->
     292   <!-- field id="CMIP6_swtoafluxaerocs" field_ref="topswad0"       --> <!-- P1 (W m-2) shortwave_flux_due_to_volcanic_aerosols_at_TOA_under_clear_sky : downwelling shortwave flux due to volcanic aerosols at TOA under clear sky to be diagnosed through double radiation call with ok_volcan=y-->
    289293   <field id="CMIP6_swtoafluxaerocs" field_ref="dummy_not_provided"       /> <!-- P1 (W m-2) shortwave_flux_due_to_volcanic_aerosols_at_TOA_under_clear_sky : downwelling shortwave flux due to volcanic aerosols at TOA under clear sky to be diagnosed through double radiation call -->
    290294   <field id="CMIP6_sza"           field_ref="sza"              /> <!-- P1 (degree) solar_zenith_angle : solar zenith angle -->
  • LMDZ6/branches/LMDZ-tracers/DefLists/field_def_cosp1.xml

    r3653 r3851  
    1     <field_group operation="average" freq_offset="0ts" freq_op="3h">  <!-- ----------------------------COSP------------------------ -->
     1    <field_group operation="average" freq_offset="0ts" freq_op="3h">
    22
    33    <field_group id="fields_COSP_CALIPSO_2D" grid_ref="grid_glo" freq_offset="0ts" freq_op="3h">
     
    66      <field id="clmcalipso"    long_name="Lidar Mid-level Cloud Fraction"   unit="1"  detect_missing_value=".true." />
    77      <field id="cltcalipso"    long_name="Lidar Total Cloud Fraction"   unit="1"  detect_missing_value=".true." />
    8       <field id="pcllcalipso"   long_name="Lidar Low-level Cloud Fraction"   unit="%"  detect_missing_value=".true." > cllcalipso*100 </field>
    9       <field id="pclhcalipso"   long_name="Lidar Hight-level Cloud Fraction"   unit="%"  detect_missing_value=".true." > clhcalipso*100 </field>
    10       <field id="pclmcalipso"   long_name="Lidar Mid-level Cloud Fraction"   unit="%"  detect_missing_value=".true." > clmcalipso*100 </field>
    11       <field id="pcltcalipso"   long_name="Lidar Total Cloud Fraction"   unit="%" detect_missing_value=".true." > cltcalipso*100 </field>
    128      <field id="cllcalipsoice"   long_name="Lidar Ice-Phase Low-level Cloud Fraction"   unit="1"  detect_missing_value=".true." />
    139      <field id="clhcalipsoice"   long_name="Lidar Ice-Phase Hight-level Cloud Fraction"   unit="1"  detect_missing_value=".true." />
     
    2824    <field_group id="fields_COSP_CALIPSO_3D_height" grid_ref="grid_glo_height" freq_offset="0ts" freq_op="3h">
    2925      <field id="clcalipso"  long_name="Lidar Cloud Fraction (532 nm)" unit="1" detect_missing_value=".true." />
    30       <field id="pclcalipso" long_name="Lidar Cloud Fraction (532 nm)" unit="%" detect_missing_value=".true." > clcalipso*100 </field>
    3126      <field id="clcalipsoice"    long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="1" detect_missing_value=".true." />
    3227      <field id="clcalipsoliq"    long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="1" detect_missing_value=".true." />
  • LMDZ6/branches/LMDZ-tracers/DefLists/field_def_cospv2.xml

    r3653 r3851  
    1 <field_group operation="average" freq_offset="0ts" freq_op="3h">  <!-- ----------------------------COSP------------------------ -->
     1<field_group operation="instant" freq_offset="0ts" freq_op="3h">
    22
    33    <field_group id="fields_COSP_LIDAR_2D" grid_ref="grid_glo" freq_offset="0ts" freq_op="3h">
     
    77      <field id="clmcalipso"    long_name="CALIPSO Mid-level Cloud Fraction"   unit="1"  detect_missing_value=".true." />
    88      <field id="cltcalipso"    long_name="CALIPSO Total Cloud Fraction"   unit="1"  detect_missing_value=".true." />
    9       <field id="pcllcalipso"   long_name="CALIPSO Low-level Cloud Fraction"   unit="%"  detect_missing_value=".true." > cllcalipso*100 </field>
    10       <field id="pclhcalipso"   long_name="CALIPSO High-level Cloud Fraction"   unit="%"  detect_missing_value=".true." > clhcalipso*100 </field>
    11       <field id="pclmcalipso"   long_name="CALIPSO Mid-level Cloud Fraction"   unit="%"  detect_missing_value=".true." > clmcalipso*100 </field>
    12       <field id="pcltcalipso"   long_name="CALIPSO Total Cloud Fraction"   unit="%" detect_missing_value=".true." > cltcalipso*100 </field>
    139      <field id="cllcalipsoice"   long_name="CALIPSO Ice-Phase Low-level Cloud Fraction"   unit="1"  detect_missing_value=".true." />
    1410      <field id="clhcalipsoice"   long_name="CALIPSO Ice-Phase Hight-level Cloud Fraction"   unit="1"  detect_missing_value=".true." />
     
    5046<!-- CALIPSO 3D -->
    5147      <field id="clcalipso"  long_name="CALIPSO Cloud Fraction (532 nm)" unit="1" detect_missing_value=".true." />
    52       <field id="pclcalipso" long_name="CALIPSO Cloud Fraction (532 nm)" unit="%" detect_missing_value=".true." > clcalipso*100 </field>
    5348      <field id="clcalipsoice"    long_name="CALIPSO Ice-Phase Cloud Fraction (532 nm)" unit="1" detect_missing_value=".true." />
    5449      <field id="clcalipsoliq"    long_name="CALIPSO Liq-Phase Cloud Fraction (532 nm)" unit="1" detect_missing_value=".true." />
     
    163158      <field id="modis_ot_vs_reffliq" long_name="MODIS Joint-PDF of optical-depth and liquid particle size" unit="1" freq_offset="0ts" freq_op="3h" grid_ref="grid4Dreffl"  detect_missing_value=".true." />
    164159
    165     </field_group>  <!-- ----------------------------COSP------------------------ -->
     160    </field_group>
  • LMDZ6/branches/LMDZ-tracers/DefLists/field_def_lmdz.xml

    r3702 r3851  
    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>
     
    142148        <field id="SWdnSFCclr"    long_name="SWdn clear sky at surface"    unit="W/m2" />
    143149        <field id="SWdnSFCcleanclr"    long_name="SWdn clean (no aerosol) clear sky at surface"    unit="W/m2" />
     150        <field id="fdiffSWdnSFC"    long_name="Fraction of diffuse SWdn at surface"    unit="-" />
    144151        <field id="LWupSFC"    long_name="Upwd. IR rad. at surface"    unit="W/m2" />
    145152        <field id="LWupSFCclr"    long_name="CS Upwd. IR rad. at surface"    unit="W/m2" />
     
    521528        <field id="flx_co2_ff"     long_name="CO2 flux from ff"               unit="kg CO2/m2/s" />    <!-- Added OB -->
    522529        <field id="flx_co2_bb"     long_name="CO2 flux from bb"               unit="kg CO2/m2/s" />    <!-- Added OB -->
     530        <field id="delta_SST" long_name="ocean-air interface temperature minus bulk SST" unit="K" detect_missing_value=".true." />
     531        <field id="delta_sal"
     532               long_name="ocean-air interface salinity minus bulk salinity"
     533               unit="ppt" detect_missing_value=".true." />
     534        <field id="dS_ns" long_name="delta salinity near surface" unit="ppt" detect_missing_value=".true." />
     535        <field id="dT_ns" long_name="sub-skin temperature minus foundation temperature" unit="K" detect_missing_value=".true." />
     536        <field id="dTer"               long_name="interface temperature minus sub-skin temperature"            unit="K" detect_missing_value=".true." />
     537        <field id="dSer"
     538               long_name="salinity variation in the diffusive microlayer"
     539               unit="ppt" detect_missing_value=".true." />
     540        <field id="tkt" long_name="thickness of thermal microlayer"            unit="m"                detect_missing_value=".true." />
     541        <field id="tks" long_name="thickness of salinity microlayer"           unit="m"                detect_missing_value=".true." />
     542        <field id="taur" long_name="momentum flux due to rain"         unit="Pa"               detect_missing_value=".true." />
     543        <field id="SSS" long_name="bulk sea-surface salinity" unit="ppt" detect_missing_value=".true." />
    523544    </field_group>
    524545
    525546    <field_group id="fields_3D" grid_ref="grid_glo_presnivs" >
    526547        <field id="tke"    long_name="TKE"    unit="m2/s2" />
     548        <field id="tke_dissip" long_name="TKE DISSIPATION" unit="m2/s3" />
    527549        <field id="tke_ter"    long_name="Max Turb. Kinetic Energy ter"    unit="m2/s2" />
    528550        <field id="tke_lic"    long_name="Max Turb. Kinetic Energy lic"    unit="m2/s2" />
     
    584606        <field id="rneblsvol" long_name="LS Cloud fraction by volume"    unit="-" />
    585607        <field id="rhum"    long_name="Relative humidity"    unit="-" />
     608        <field id="rhl" long_name="Relative humidity wrt liquid" unit="%" />
     609        <field id="rhi" long_name="Relative humidity wrt ice" unit="%" />
    586610        <field id="ozone"    long_name="Ozone mole fraction"    unit="-" />
    587611        <field id="ozone_daylight"    long_name="Daylight ozone mole fraction"    unit="-" />
  • LMDZ6/branches/LMDZ-tracers/DefLists/file_def_histdayCOSP_lmdz.xml

    r3653 r3851  
    1010                <field field_ref="clhcalipso"         level="5" grid_ref="grid_out"/>
    1111                <field field_ref="cltcalipso"         level="5" grid_ref="grid_out"/>
    12                 <field field_ref="pcllcalipso"         level="5" grid_ref="grid_out"/>
    13                 <field field_ref="pclmcalipso"         level="5" grid_ref="grid_out"/>
    14                 <field field_ref="pclhcalipso"         level="5" grid_ref="grid_out"/>
    15                 <field field_ref="pcltcalipso"         level="5" grid_ref="grid_out"/>
    1612                <field field_ref="cllcalipsoice"         level="5" grid_ref="grid_out"/>
    1713                <field field_ref="clmcalipsoice"         level="5" grid_ref="grid_out"/>
  • LMDZ6/branches/LMDZ-tracers/DefLists/file_def_histhfCOSP_lmdz.xml

    r3653 r3851  
    88                <field field_ref="clhcalipso"         level="5" />
    99                <field field_ref="cltcalipso"         level="5" />
    10                 <field field_ref="pcllcalipso"         level="5" />
    11                 <field field_ref="pclmcalipso"         level="5" />
    12                 <field field_ref="pclhcalipso"         level="5" />
    13                 <field field_ref="pcltcalipso"         level="5" />
    1410                <field field_ref="cllcalipsoice"         level="5" />
    1511                <field field_ref="clmcalipsoice"         level="5" />
  • LMDZ6/branches/LMDZ-tracers/DefLists/file_def_histmthCOSP_lmdz.xml

    r3653 r3851  
    1111                <field field_ref="clhcalipso"         level="5" grid_ref="grid_out"/>
    1212                <field field_ref="cltcalipso"         level="5" grid_ref="grid_out"/>
    13                 <field field_ref="pcllcalipso"         level="5" grid_ref="grid_out"/>
    14                 <field field_ref="pclmcalipso"         level="5" grid_ref="grid_out"/>
    15                 <field field_ref="pclhcalipso"         level="5" grid_ref="grid_out"/>
    16                 <field field_ref="pcltcalipso"         level="5" grid_ref="grid_out"/>
    1713                <field field_ref="cllcalipsoice"         level="5" grid_ref="grid_out"/>
    1814                <field field_ref="clmcalipsoice"         level="5" grid_ref="grid_out"/>
Note: See TracChangeset for help on using the changeset viewer.