Changeset 11110


Ignore:
Timestamp:
2019-06-14T15:43:58+02:00 (17 months ago)
Author:
davestorkey
Message:

UKMO/NEMO_4.0_GO8_package branch: Enable product diagnostics uT, vT, wS etc. (as in GO6 package branch).

Location:
NEMO/branches/UKMO/NEMO_4.0_GO8_package
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/cfgs/METO_GO/EXPREF/context_nemo-BASIC.xml

    r10898 r11110  
    3535      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"            /> 
    3636      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"            /> 
     37      <axis id="deptht_surface" axis_ref="deptht" > 
     38         <zoom_axis begin=" 0 " n=" 1 " /> 
     39      </axis> 
    3740    </axis_definition> 
    3841  
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/cfgs/METO_GO/EXPREF/context_nemo-CMIP6.xml

    r10898 r11110  
    3535      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"            /> 
    3636      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"            /> 
     37      <axis id="deptht_surface" axis_ref="deptht" > 
     38         <zoom_axis begin=" 0 " n=" 1 " /> 
     39      </axis> 
    3740    </axis_definition> 
    3841  
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/cfgs/METO_GO/EXPREF/context_nemo-CUSTOM.xml

    r10898 r11110  
    3535      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"            /> 
    3636      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"            /> 
     37      <axis id="deptht_surface" axis_ref="deptht" > 
     38         <zoom_axis begin=" 0 " n=" 1 " /> 
     39      </axis> 
    3740    </axis_definition> 
    3841  
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-oce-CMIP6-10D.xml

    r10898 r11110  
    153153          <field field_ref="uoce"         name="uo"     operation="average" freq_op="10d" > @uoce_e3u / @e3u </field> 
    154154     <field field_ref="utau"         name="tauuo"   standard_name="surface_downward_x_stress"  /> 
    155 <!-- TO FIX 
    156155          <field field_ref="ut"           name="uto" standard_name="product_of_xward_sea_water_velocity_and_temperature" long_name="UT"  operation="average" freq_op="10d" > @ut_e3u / @e3u </field> 
    157156          <field field_ref="us"           name="uso" standard_name="product_of_xward_sea_water_velocity_and_salinity" long_name="US"    operation="average" freq_op="10d" > @us_e3u / @e3u </field> 
    158 --> 
    159157          <field field_ref="uoce"         name="u2o" standard_name="square_of_sea_water_x_velocity" long_name="UU"  operation="average" freq_op="10d" > @uoce2_e3u / @e3u </field> 
    160158          <!-- available with key_diaar5 --> 
     
    172170          <field field_ref="voce"         name="vo"     operation="average" freq_op="10d" > @voce_e3v / @e3v </field> 
    173171     <field field_ref="vtau"         name="tauvo"   standard_name="surface_downward_y_stress" /> 
    174 <!-- TO FIX 
    175172          <field field_ref="vt"           name="vto" standard_name="product_of_yward_sea_water_velocity_and_temperature" long_name="VT"  operation="average" freq_op="10d" > @vt_e3v / @e3v </field> 
    176173          <field field_ref="vs"           name="vso" standard_name="product_of_yward_sea_water_velocity_and_salinity" long_name="VS"  operation="average" freq_op="10d" > @vs_e3v / @e3v </field> 
    177 --> 
    178174          <field field_ref="voce"         name="v2o" standard_name="square_of_sea_water_y_velocity" long_name="VV"  operation="average" freq_op="10d" > @voce2_e3v / @e3v </field> 
    179175          <!-- available with key_diaar5 --> 
     
    195191     <field field_ref="woce"         name="wo" standard_name="upward_sea_water_velocity" long_name="W"                  /> 
    196192          <field field_ref="woce"         name="w2o" standard_name="square_of_upward_sea_water_velocity" long_name="WW"  operation="average" > woce * woce </field> 
    197 <!-- TO FIX 
    198193          <field field_ref="wt"           name="wt"         standard_name="product_of_upward_sea_water_velocity_and_temperature" long_name="WT"         /> 
    199194          <field field_ref="ws"           name="ws"         standard_name="product_of_upward_sea_water_velocity_and_salinity" long_name="WS"            /> 
     195<!-- TO FIX 
    200196          <field field_ref="wpt_dep"      name="zhalf"        /> 
    201197--> 
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-oce-CMIP6-1M.xml

    r10898 r11110  
    153153          <field field_ref="uoce"         name="uo"     operation="average" freq_op="1mo" > @uoce_e3u / @e3u </field> 
    154154     <field field_ref="utau"         name="tauuo"   standard_name="surface_downward_x_stress"  /> 
    155 <!-- TO FIX 
    156155          <field field_ref="ut"           name="uto" standard_name="product_of_xward_sea_water_velocity_and_temperature" long_name="UT"  operation="average" freq_op="1mo" > @ut_e3u / @e3u </field> 
    157156          <field field_ref="us"           name="uso" standard_name="product_of_xward_sea_water_velocity_and_salinity" long_name="US"    operation="average" freq_op="1mo" > @us_e3u / @e3u </field> 
    158 --> 
    159157          <field field_ref="uoce"         name="u2o" standard_name="square_of_sea_water_x_velocity" long_name="UU"  operation="average" freq_op="1mo" > @uoce2_e3u / @e3u </field> 
    160158          <!-- available with key_diaar5 --> 
     
    172170          <field field_ref="voce"         name="vo"     operation="average" freq_op="1mo" > @voce_e3v / @e3v </field> 
    173171     <field field_ref="vtau"         name="tauvo"   standard_name="surface_downward_y_stress" /> 
    174 <!-- TO FIX 
    175172          <field field_ref="vt"           name="vto" standard_name="product_of_yward_sea_water_velocity_and_temperature" long_name="VT"  operation="average" freq_op="1mo" > @vt_e3v / @e3v </field> 
    176173          <field field_ref="vs"           name="vso" standard_name="product_of_yward_sea_water_velocity_and_salinity" long_name="VS"  operation="average" freq_op="1mo" > @vs_e3v / @e3v </field> 
    177 --> 
    178174          <field field_ref="voce"         name="v2o" standard_name="square_of_sea_water_y_velocity" long_name="VV"  operation="average" freq_op="1mo" > @voce2_e3v / @e3v </field> 
    179175          <!-- available with key_diaar5 --> 
     
    195191     <field field_ref="woce"         name="wo" standard_name="upward_sea_water_velocity" long_name="W"                  /> 
    196192          <field field_ref="woce"         name="w2o" standard_name="square_of_upward_sea_water_velocity" long_name="WW"  operation="average" > woce * woce </field> 
    197 <!-- TO FIX 
    198193          <field field_ref="wt"           name="wt"         standard_name="product_of_upward_sea_water_velocity_and_temperature" long_name="WT"         /> 
    199194          <field field_ref="ws"           name="ws"         standard_name="product_of_upward_sea_water_velocity_and_salinity" long_name="WS"            /> 
     195<!-- TO FIX 
    200196          <field field_ref="wpt_dep"      name="zhalf"        /> 
    201197--> 
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/cfgs/SHARED/domain_def_nemo.xml

    r9930 r11110  
    182182     <!--   zonal mean grid   --> 
    183183     <domain id="gznl" long_name="gznl"/> 
     184     <domain id="ptr" domain_ref="gznl" > 
     185    <zoom_domain id="ptr" ibegin="0000" jbegin="0" ni="1" nj="0000" /> 
     186     </domain>   
    184187     <domain id="znl_T" domain_ref="gznl" > <zoom_domain id="znl_T"/> </domain> 
    185188     <domain id="znl_W" domain_ref="gznl" > <zoom_domain id="znl_W"/> </domain> 
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/cfgs/SHARED/field_def_nemo-oce.xml

    r10897 r11110  
    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"/> 
     22        <field id="e3t_surf"     long_name="T-cell thickness"   field_ref="e3t"  standard_name="cell_thickness"     unit="m"   grid_ref="grid_T_surface_extract"/> 
    2323        <field id="e3t_0"        long_name="Initial T-cell thickness"            standard_name="ref_cell_thickness" unit="m"   grid_ref="grid_T_3D" /> 
    2424 
     
    511511      <field id="ahmf_2d"      long_name=" surface f-eddy viscosity coefficient"   unit="m2/s or m4/s" /> 
    512512      <field id="ahmf_3d"      long_name=" 3D      f-eddy viscosity coefficient"   unit="m2/s or m4/s"  grid_ref="grid_T_3D"/> 
     513 
     514      <!-- product fields --> 
     515      <field_group id="diaprod"> 
     516   <field id="ut"           long_name="product_of_sea_water_x_velocity_and_potential_temperature"      unit="degree_C m/s"      grid_ref="grid_U_3D"   /> 
     517        <field id="ut_e3u"       long_name="product_of_sea_water_x_velocity_and_potential_temperature * e3u"  unit="degree_C m2/s"   grid_ref="grid_U_3D" > ut * e3u </field > 
     518   <field id="us"           long_name="product_of_sea_water_x_velocity_and_salinity"                   unit="PSU m/s"       grid_ref="grid_U_3D"   /> 
     519        <field id="us_e3u"       long_name="product_of_sea_water_x_velocity_and_salinity * e3u"             unit="PSU m2/s"      grid_ref="grid_U_3D" > us * e3u </field > 
     520   <field id="urhop"        long_name="product_of_sea_water_x_velocity_and_potential_density"          unit="(kg/m3).(m/s)" grid_ref="grid_U_3D"   /> 
     521        <field id="urhop_e3u"    long_name="product_of_sea_water_x_velocity_and_potential_density * e3u"    unit="(kg/m3).(m2/s)"   grid_ref="grid_U_3D" > urhop * e3u </field > 
     522   <field id="vt"           long_name="product_of_sea_water_y_velocity_and_potential_temperature"      unit="degree_C m/s"      grid_ref="grid_V_3D"   /> 
     523        <field id="vt_e3v"       long_name="product_of_sea_water_y_velocity_and_potential_temperature * e3v"  unit="degree_C m2/s"   grid_ref="grid_V_3D" > vt * e3v </field > 
     524   <field id="vs"           long_name="product_of_sea_water_y_velocity_and_salinity"                   unit="PSU m/s"       grid_ref="grid_V_3D"   /> 
     525        <field id="vs_e3v"       long_name="product_of_sea_water_y_velocity_and_salinity * e3t"             unit="PSU m2/s"      grid_ref="grid_V_3D" > vs * e3v </field > 
     526   <field id="vrhop"        long_name="product_of_sea_water_y_velocity_and_potential_density"          unit="(kg/m3).(m/s)" grid_ref="grid_V_3D"   /> 
     527        <field id="vrhop_e3v"    long_name="product_of_sea_water_y_velocity_and_potential_density * e3t"    unit="(kg/m3).(m2/s)"  grid_ref="grid_V_3D" > vrhop * e3v </field > 
     528   <field id="wt"           long_name="product_of_upward_sea_water_velocity_and_potential_temperature" unit="degree_C m/s"      grid_ref="grid_W_3D"   /> 
     529   <field id="ws"           long_name="product_of_upward_sea_water_velocity_and_salinity"              unit="PSU m/s"       grid_ref="grid_W_3D"   /> 
     530   <field id="wrhop"        long_name="product_of_upward_sea_water_velocity_and_potential_density"     unit="(kg/m3).(m/s)" grid_ref="grid_W_3D"   /> 
     531      </field_group> 
    513532 
    514533      <field_group id="scalar"  grid_ref="grid_T_2D"  > 
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/cfgs/SHARED/grid_def_nemo.xml

    r10226 r11110  
    5757         <axis id="nfloat" /> 
    5858       </grid> 
     59        <!--  --> 
     60       <grid id="grid_EqT" > 
     61         <domain id="EqT" /> 
     62       </grid> 
     63        <!--  --> 
     64       <grid id="gznl_T_2D"> 
     65         <domain id="ptr" /> 
     66       </grid> 
     67        <!--  --> 
     68       <grid id="gznl_T_3D"> 
     69         <domain id="ptr" /> 
     70         <axis axis_ref="deptht" /> 
     71       </grid> 
     72        <!--  --> 
     73       <grid id="gznl_W_2D"> 
     74         <domain id="ptr" /> 
     75       </grid> 
     76        <!--  --> 
     77       <grid id="gznl_W_3D"> 
     78         <domain id="ptr" /> 
     79         <axis axis_ref="depthw" /> 
     80       </grid> 
     81       <grid id="vert_sum"> 
     82         <domain id="grid_T"/> 
     83         <scalar> 
     84            <reduce_axis operation="sum" /> 
     85         </scalar> 
     86       </grid> 
     87       <grid id="zoom_300"> 
     88         <domain id="grid_T" /> 
     89         <axis axis_ref="deptht300"/> 
     90       </grid> 
     91       <grid id="zoom_300_sum"> 
     92         <domain id="grid_T" /> 
     93         <scalar> 
     94            <reduce_axis operation="sum" /> 
     95         </scalar> 
     96       </grid> 
     97       <grid id="grid_T_surface_extract"> 
     98         <domain id="grid_T" /> 
     99         <axis   axis_ref="deptht_surface" /> 
     100       </grid> 
    59101 
    60102    </grid_definition> 
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/src/OCE/step.F90

    r10888 r11110  
    218218                         CALL dia_ar5 ( kstp )        ! ar5 diag 
    219219      IF( lk_diaharm )   CALL dia_harm( kstp )        ! Tidal harmonic analysis 
     220                         CALL dia_prod( kstp )        ! ocean model: product diagnostics 
    220221                         CALL dia_wri ( kstp )        ! ocean model: outputs 
    221222      ! 
  • NEMO/branches/UKMO/NEMO_4.0_GO8_package/src/OCE/step_oce.F90

    r10888 r11110  
    8080   USE diahsb          ! heat, salt and volume budgets    (dia_hsb routine) 
    8181   USE diaharm 
     82   USE diaprod 
    8283   USE diacfl 
    8384   USE diaobs          ! Observation operator 
Note: See TracChangeset for help on using the changeset viewer.