Changeset 9022 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor_oce.F90

Timestamp:

2017-12-13T17:38:29+01:00 (7 years ago)

Author:

glong

Message:

Removed old dyn_vrt_dia subrouting and associated code. Updated trdvor to use new io and output vertical integrals as well as vertical averages.

File:

• branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor_oce.F90 (modified) (2 diffs)

branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor_oce.F90

@@ -13 +13 @@
 
    !                                               !!* vorticity trends index
-   INTEGER, PUBLIC, PARAMETER ::   jpltot_vor = 11  !: Number of vorticity trend terms
+   INTEGER, PUBLIC, PARAMETER ::   jpltot_vor = 10  !: Number of vorticity trend terms
    !
    INTEGER, PUBLIC, PARAMETER ::   jpvor_prg =  1   !: Pressure Gradient Trend
@@ -23 +23 @@
    INTEGER, PUBLIC, PARAMETER ::   jpvor_zdf =  7   !: Vertical Diffusion Trend
    INTEGER, PUBLIC, PARAMETER ::   jpvor_spg =  8   !: Surface Pressure Grad. Trend
-   INTEGER, PUBLIC, PARAMETER ::   jpvor_bev =  9   !: Beta V
-   INTEGER, PUBLIC, PARAMETER ::   jpvor_swf = 10   !: wind stress forcing term
-   INTEGER, PUBLIC, PARAMETER ::   jpvor_bfr = 11   !: bottom friction term
+   INTEGER, PUBLIC, PARAMETER ::   jpvor_swf =  9   !: wind stress forcing term
+   INTEGER, PUBLIC, PARAMETER ::   jpvor_bfr = 10   !: bottom friction term
+   !
+   INTEGER, PUBLIC, PARAMETER ::   jpvor_types = 2  !: bottom friction term
+   INTEGER, PUBLIC, PARAMETER ::   jpvor_int = 1    !: bottom friction term
+   INTEGER, PUBLIC, PARAMETER ::   jpvor_avr = 2    !: bottom friction term
 
    !!----------------------------------------------------------------------