Changeset 15179 for NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/cfgs

Timestamp:

2021-08-11T13:07:00+02:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.4_momentum_trends:

1. Bug fix for previous commit (correct wind stress and top friction trends for depth-mean flow).
2. Surface trends: Remove ice-ocean stress from wind stress trend and add to top friction trend.
3. Some tidying of trd_oce.F90 and trddyn.F90.

File:

• NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/cfgs/SHARED/field_def_nemo-oce.xml (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/cfgs/SHARED/field_def_nemo-oce.xml

@@ -840 +840 @@
      <field id="hu"             long_name="total time-varying depth at U-points"            unit="m" grid_ref="grid_U_2D" />
      <field id="utrd_hpg"       long_name="i-trend: hydrostatic pressure gradient"          unit="m/s^2"                        />
-     <field id="utrd_hpg_corr"  long_name="i-trend: HPG: correction"       unit="m/s^2"    grid_ref="grid_U_2D" />
      <field id="utrd_spg2d"     long_name="i-trend: surface pressure gradient: true trend"       unit="m/s^2"    grid_ref="grid_U_2D" />
-     <field id="utrd_spgexp"    long_name="i-trend: surface pressure gradient (explicit)"   unit="m/s^2"                        />
      <field id="utrd_keg"       long_name="i-trend: KE gradient         or hor. adv."       unit="m/s^2"                        />
      <field id="utrd_rvo"       long_name="i-trend: relative  vorticity or metric term"     unit="m/s^2"                        />
      <field id="utrd_pvo"       long_name="i-trend: planetary vorticity: 3D component"      unit="m/s^2"                        />
      <field id="utrd_pvo2d"     long_name="i-trend: planetary vorticity: 2D component"      unit="m/s^2"    grid_ref="grid_U_2D" />
-     <field id="utrd_pvo_corr"     long_name="i-trend: planetary vorticity: correction"      unit="m/s^2"    grid_ref="grid_U_2D" />
      <field id="utrd_zad"       long_name="i-trend: vertical  advection"                    unit="m/s^2"                        />
      <field id="utrd_udx"       long_name="i-trend: U.dx[U]"                                unit="m/s^2"                        />
@@ -865 +862 @@
      <field id="utrd_hpg_e3u"       unit="m2/s^2" > utrd_hpg * e3u </field>
      <field id="utrd_spg_e3u"       unit="m2/s^2" > utrd_spg * e3u </field>
-     <field id="utrd_spgexp_e3u"    unit="m2/s^2" > utrd_spgexp * e3u </field>
      <field id="utrd_keg_e3u"       unit="m2/s^2" > utrd_keg * e3u </field>
      <field id="utrd_rvo_e3u"       unit="m2/s^2" > utrd_rvo * e3u </field>
@@ -890 +886 @@
      <field id="hv"             long_name="total time-varying depth at V-points"            unit="m" grid_ref="grid_V_2D" />
      <field id="vtrd_hpg"       long_name="j-trend: hydrostatic pressure gradient"          unit="m/s^2"                        />
-     <field id="vtrd_hpg_corr"  long_name="j-trend: HPG: correction"       unit="m/s^2"    grid_ref="grid_V_2D" />
      <field id="vtrd_spg"       long_name="j-trend: surface     pressure gradient"          unit="m/s^2"                        />
      <field id="vtrd_spg2d"     long_name="j-trend: surface pressure gradient: true trend"       unit="m/s^2"    grid_ref="grid_V_2D" />
-     <field id="vtrd_spgexp"    long_name="j-trend: surface pressure gradient (explicit)"   unit="m/s^2"                        />
      <field id="vtrd_keg"       long_name="j-trend: KE gradient         or hor. adv."       unit="m/s^2"                        />
      <field id="vtrd_rvo"       long_name="j-trend: relative  vorticity or metric term"     unit="m/s^2"                        />
      <field id="vtrd_pvo"       long_name="j-trend: planetary vorticity: 3D component"      unit="m/s^2"                        />
      <field id="vtrd_pvo2d"     long_name="j-trend: planetary vorticity: 2D component"      unit="m/s^2"    grid_ref="grid_V_2D" />
-     <field id="vtrd_pvo_corr"     long_name="j-trend: planetary vorticity: correction"      unit="m/s^2"    grid_ref="grid_V_2D" />
      <field id="vtrd_zad"       long_name="j-trend: vertical  advection"                    unit="m/s^2"                        />
      <field id="vtrd_vdy"       long_name="j-trend: V.dx[V]"                                unit="m/s^2"                        />
@@ -916 +909 @@
      <field id="vtrd_hpg_e3v"       unit="m2/s^2" > vtrd_hpg * e3v </field>
      <field id="vtrd_spg_e3v"       unit="m2/s^2" > vtrd_spg * e3v </field>
-     <field id="vtrd_spgexp_e3v"    unit="m2/s^2" > vtrd_spgexp * e3v </field>
      <field id="vtrd_keg_e3v"       unit="m2/s^2" > vtrd_keg * e3v </field>
      <field id="vtrd_rvo_e3v"       unit="m2/s^2" > vtrd_rvo * e3v </field>