Changeset 8698 for trunk/NEMOGCM/CONFIG


Ignore:
Timestamp:
2017-11-13T15:24:50+01:00 (4 years ago)
Author:
davestorkey
Message:

Bug fixes for tracer trends diagnostics in trunk. See ticket #1877.
These fixes correspond to the changes to the 3.6 branch at revisions 8102 and 8305.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml

    r7968 r8698  
    2020      <field_group id="grid_T" grid_ref="grid_T_2D" > 
    2121         <field id="e3t"          long_name="T-cell thickness"   standard_name="cell_thickness"   unit="m"   grid_ref="grid_T_3D"/> 
     22         <field id="e3t_surf"     long_name="T-cell thickness"   field_ref="e3t"  standard_name="cell_thickness"   unit="m"   grid_ref="grid_T_SFC"/> 
    2223         <field id="e3t_0"        long_name="Initial T-cell thickness"   standard_name="ref_cell_thickness"   unit="m"   grid_ref="grid_T_3D"/> 
    2324 
     
    562563    --> 
    563564 
    564     <field_group id="trendT" grid_ref="grid_T_3D"> 
    565        <!-- variables available with ln_tra_trd --> 
     565   <!-- variables available with ln_tra_trd --> 
     566   <!-- Asselin trends  calculated on odd time steps--> 
     567   <field_group id="trendT_odd"  grid_ref="grid_T_3D"> 
     568      <field id="ttrd_atf"      long_name="temperature-trend: asselin time filter"       unit="degree_C/s" /> 
     569      <field id="strd_atf"      long_name="salinity   -trend: asselin time filter"       unit="0.001/s" /> 
     570      <!-- Thickness weighted versions: --> 
     571      <field id="ttrd_atf_e3t"      unit="degC/s * m"  >  ttrd_atf * e3t </field> 
     572      <field id="strd_atf_e3t"      unit="1e-3/s * m"  >  strd_atf * e3t </field> 
     573      <!-- OMIP  layer-integrated trends --> 
     574      <field id="ttrd_atf_li"      long_name="layer integrated heat-trend: asselin time filter "       unit="W/m^2" > ttrd_atf_e3t * 1026.0 * 3991.86795711963  </field> 
     575      <field id="strd_atf_li"      long_name="layer integrated salt   -trend: asselin time filter "       unit="kg/(m^2 s)" > strd_atf_e3t * 1026.0 * 0.001 </field> 
     576    </field_group> 
     577 
     578    <!-- Other trends  calculated on even time steps--> 
     579    <field_group id="trendT_even" grid_ref="grid_T_3D"> 
    566580       <field id="ttrd_xad"      long_name="temperature-trend: i-advection"                                                                                          unit="degC/s"                        /> 
    567581       <field id="strd_xad"      long_name="salinity   -trend: i-advection"                                                                                          unit="1e-3/s"                        /> 
     
    596610       <field id="ttrd_npc"      long_name="temperature-trend: non-penetrative conv."     unit="degC/s" /> 
    597611       <field id="strd_npc"      long_name="salinity   -trend: non-penetrative conv."     unit="1e-3/s" /> 
    598        <field id="ttrd_qns"      long_name="temperature-trend: non-solar flux + runoff"   unit="degC/s" /> 
    599        <field id="strd_cdt"      long_name="salinity   -trend: C/D term       + runoff"   unit="degC/s" /> 
     612       <field id="ttrd_qns"      long_name="temperature-trend: non-solar flux + runoff"   unit="degC/s" grid_ref="grid_T_2D" /> 
     613       <field id="strd_cdt"      long_name="salinity   -trend: C/D term       + runoff"   unit="degC/s" grid_ref="grid_T_2D" /> 
    600614       <field id="ttrd_qsr"      long_name="temperature-trend: solar penetr. heating"     unit="degC/s" /> 
    601615       <field id="ttrd_bbc"      long_name="temperature-trend: geothermal heating"        unit="degC/s" /> 
    602        <field id="ttrd_atf"      long_name="temperature-trend: asselin time filter"       unit="degC/s" /> 
    603        <field id="strd_atf"      long_name="salinity   -trend: asselin time filter"       unit="1e-3/s" /> 
    604        <field id="ttrd_tot"      long_name="temperature-trend: total model trend"         unit="degC/s" /> 
    605        <field id="strd_tot"      long_name="salinity   -trend: total model trend"         unit="1e-3/s" /> 
    606616 
    607617       <!-- Thickness weighted versions: --> 
     
    640650       <field id="ttrd_qsr_e3t"      unit="degC/s * m"  >  ttrd_qsr * e3t </field> 
    641651       <field id="ttrd_bbc_e3t"      unit="degC/s * m"  >  ttrd_bbc * e3t </field> 
    642        <field id="ttrd_atf_e3t"      unit="degC/s * m"  >  ttrd_atf * e3t </field> 
    643        <field id="strd_atf_e3t"      unit="1e-3/s * m"  >  strd_atf * e3t </field> 
     652 
     653       <!-- OMIP  layer-integrated trends --> 
     654       <field id="ttrd_totad_li"    long_name="layer integrated heat-trend : total advection"       unit="W/m^2"     > ttrd_totad_e3t * 1026.0 * 3991.86795711963 </field> 
     655       <field id="strd_totad_li"    long_name="layer integrated salt   -trend : total advection"      unit="kg/(m^2 s)"    > strd_totad_e3t * 1026.0 * 0.001  </field> 
     656       <field id="ttrd_evd_li"      long_name="layer integrated heat-trend : EVD convection"         unit="W/m^2"    > ttrd_evd_e3t * 1026.0 * 3991.86795711963 </field> 
     657       <field id="strd_evd_li"      long_name="layer integrated salt   -trend : EVD convection"      unit="kg/(m^2 s)"  > strd_evd_e3t * 1026.0 * 0.001  </field> 
     658       <field id="ttrd_iso_li"      long_name="layer integrated heat-trend : isopycnal diffusion"    unit="W/m^2" > ttrd_iso_e3t * 1026.0 * 3991.86795711963 </field> 
     659       <field id="strd_iso_li"      long_name="layer integrated salt   -trend : isopycnal diffusion"   unit="kg/(m^2 s)" > strd_iso_e3t * 1026.0 * 0.001  </field> 
     660       <field id="ttrd_zdfp_li"     long_name="layer integrated heat-trend : pure vert. diffusion"   unit="W/m^2" > ttrd_zdfp_e3t * 1026.0 * 3991.86795711963 </field> 
     661       <field id="strd_zdfp_li"     long_name="layer integrated salt   -trend : pure vert. diffusion"   unit="kg/(m^2 s)" > strd_zdfp_e3t * 1026.0 * 0.001  </field> 
     662       <field id="ttrd_qns_li"      long_name="layer integrated heat-trend : non-solar flux + runoff"   unit="W/m^2" grid_ref="grid_T_2D"> ttrd_qns_e3t * 1026.0 * 3991.86795711963 </field> 
     663       <field id="ttrd_qsr_li"      long_name="layer integrated heat-trend : solar flux"   unit="W/m^2"  grid_ref="grid_T_3D"> ttrd_qsr_e3t * 1026.0 * 3991.86795711963 </field> 
     664       <field id="ttrd_bbl_li"      long_name="layer integrated heat-trend: bottom boundary layer "     unit="W/m^2" > ttrd_bbl_e3t * 1026.0 * 3991.86795711963 </field> 
     665       <field id="strd_bbl_li"      long_name="layer integrated salt   -trend: bottom boundary layer "     unit="kg/(m^2 s)" > strd_bbl_e3t * 1026.0 * 0.001  </field> 
     666       <field id="ttrd_evd_li"      long_name="layer integrated heat -trend: evd convection "       unit="W/m^2" >ttrd_evd_e3t * 1026.0 * 3991.86795711963  </field> 
     667       <field id="strd_evd_li"      long_name="layer integrated salt -trend: evd convection "       unit="kg/(m^2 s)" > strd_evd_e3t * 1026.0 * 0.001  </field> 
     668 
     669    </field_group> 
     670 
     671    <!--  Total trends calculated every time step--> 
     672    <field_group id="trendT" grid_ref="grid_T_3D"> 
     673       <field id="ttrd_tot"      long_name="temperature-trend: total model trend"         unit="degC/s" /> 
     674       <field id="strd_tot"      long_name="salinity   -trend: total model trend"         unit="1e-3/s" /> 
     675       <!-- Thickness weighted versions: --> 
    644676       <field id="ttrd_tot_e3t"      unit="degC/s * m"  >  ttrd_tot * e3t </field> 
    645677       <field id="strd_tot_e3t"      unit="1e-3/s * m"  >  strd_tot * e3t </field> 
    646  
    647  
     678       <!-- OMIP  layer-integrated total trends --> 
     679       <field id="ttrd_tot_li"      long_name="layer integrated heat-trend: total model trend :"         unit="W/m^2" > ttrd_tot_e3t * 1026.0 * 3991.86795711963 </field> 
     680       <field id="strd_tot_li"      long_name="layer integrated salt   -trend: total model trend :"         unit="kg/(m^2 s)" > strd_tot_e3t * 1026.0 * 0.001  </field> 
     681 
     682       <!-- **** these trends have not been apportioned to all/even/odd ts yet **** --> 
    648683       <!-- variables available with ln_KE_trd --> 
    649684       <field id="ketrd_hpg"     long_name="ke-trend: hydrostatic pressure gradient"          unit="W/s^3"                        /> 
     
    736771    --> 
    737772 
     773     <field_group id="TRD" > 
     774          <field field_ref="ttrd_totad_li"   name="opottempadvect"  /> 
     775          <field field_ref="ttrd_iso_li"     name="opottemppmdiff"  /> 
     776          <field field_ref="ttrd_zdfp_li"    name="opottempdiff"  /> 
     777          <field field_ref="ttrd_evd_li"     name="opottempevd" /> 
     778          <field field_ref="strd_evd_li"     name="osaltevd" /> 
     779          <field field_ref="ttrd_qns_li"     name="opottempqns"  /> 
     780          <field field_ref="ttrd_qsr_li"     name="rsdoabsorb" operation="accumulate" /> 
     781          <field field_ref="strd_totad_li"   name="osaltadvect" /> 
     782          <field field_ref="strd_iso_li"     name="osaltpmdiff"  /> 
     783          <field field_ref="strd_zdfp_li"    name="osaltdiff" /> 
     784    </field_group> 
     785     
    738786    <field_group id="mooring" > 
    739787       <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      /> 
Note: See TracChangeset for help on using the changeset viewer.