Changeset 7845 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90

Timestamp:

2017-03-30T11:39:38+02:00 (7 years ago)

Author:

glong

Message:

Split dyn_vrt_diag in divcur.F90 into two parts - and changed calls in dynhpg.F90, dynkeg.F90, dynldf_bilap.F90, dynvor.F90, dynzad.F90. Added calls to dyn_vrt_diag in dynspg_ts.F90. Also added call in dynzdf.F90 but this is more of a place holder as it is not currently correct.

File:

• branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) (4 diffs)

branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90

@@ -27 +27 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
+   USE divcur          ! for dyn_vrt_dia_3d
 
    IMPLICIT NONE
@@ -58 +59 @@
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
       !
+      INTEGER :: id_dia_vrt_zdf_int  = 1 ! TODO remove once flags set properly
+      INTEGER :: id_dia_vrt_zdf_mean = 1 ! TODO remove once flags set properly
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
       !!---------------------------------------------------------------------
@@ -68 +71 @@
       ENDIF
 
-      IF( l_trddyn )   THEN                      ! temporary save of ta and sa trends
+      IF ( ( l_trddyn ) .or. ( id_dia_vrt_zdf_int == 1 ) .or. ( id_dia_vrt_zdf_mean == 1 ) ) THEN                      ! temporary save of ta and sa trends
          CALL wrk_alloc( jpi, jpj, jpk, ztrdu, ztrdv ) 
          ztrdu(:,:,:) = ua(:,:,:)
@@ -88 +91 @@
       END SELECT
 
-      IF( l_trddyn )   THEN                      ! save the vertical diffusive trends for further diagnostics
+      IF ( ( l_trddyn ) .or. ( id_dia_vrt_zdf_int == 1 ) .or. ( id_dia_vrt_zdf_mean == 1 ) ) THEN                      ! save the vertical diffusive trends for further diagnostics
          ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)
          ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
+
+         ! Calculate dia_vor_int & dia_vor_mn if required.
+         IF ( ( id_dia_vrt_zdf_int == 1 ) .or. ( id_dia_vrt_zdf_mean == 1 ) ) THEN
+             CALL dyn_vrt_dia_3d(ztrdu, ztrdv, id_dia_vrt_zdf_int, id_dia_vrt_zdf_mean)
+         END IF
+
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_zdf, kt )
          CALL wrk_dealloc( jpi, jpj, jpk, ztrdu, ztrdv )