Changeset 7875

Timestamp:

2017-04-05T16:22:33+02:00 (7 years ago)

Author:

glong

Message:

Removed changes to dynzdf.F90 as they were placeholds. Added calls (and associated required variables) to dyn_vrt_dia_3d in dynzdf_imp.F90 - still required modification. This is the next step placeholder

Location:

branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN

Files:

• dynzdf.F90 (modified) (4 diffs)
• dynzdf_imp.F90 (modified) (6 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
@@ -59 +58 @@
       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
       !!---------------------------------------------------------------------
@@ -71 +68 @@
       ENDIF
 
-      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
+      IF( l_trddyn )   THEN                      ! temporary save of ta and sa trends
          CALL wrk_alloc( jpi, jpj, jpk, ztrdu, ztrdv ) 
          ztrdu(:,:,:) = ua(:,:,:)
@@ -91 +88 @@
       END SELECT
 
-      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
+      IF( l_trddyn )   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 ) 

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

@@ -26 +26 @@
    USE timing          ! Timing
    USE dynadv          ! dynamics: vector invariant versus flux form
+   USE divcur          ! for dyn_vrt_dia_3d
    USE dynspg_oce, ONLY: lk_dynspg_ts
 
@@ -68 +69 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       INTEGER  ::   ikbu, ikbv   ! local integers
+      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) ::   z1_p2dt, zcoef, zzwi, zzws, zrhs   ! local scalars
       REAL(wp) ::   ze3ua, ze3va
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zwi, zwd, zws
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zua, zva
       !!----------------------------------------------------------------------
       !
@@ -76 +80 @@
       !
       CALL wrk_alloc( jpi,jpj,jpk, zwi, zwd, zws ) 
+      CALL wrk_alloc( jpi,jpj,jpk, zua, zva      ) 
       !
       IF( kt == nit000 ) THEN
@@ -268 +273 @@
 #endif
 
+      ! TODO merge with above if possible
+      ! Calculate the values in preparation to calculate dia_vor_int & dia_vor_mn if required
+      IF ( ( id_dia_vrt_zdf_int == 1 ) .or. ( id_dia_vrt_zdf_mean == 1 ) ) THEN
+          DO jk = 1, jpkm1
+             DO jj = 2, jpjm1   
+                DO ji = fs_2, fs_jpim1   ! vector opt.
+                   zua(ji,jj,jk) = ( ua(ji,jj,jk) - ub(ji,jj,jk) ) * z1_p2dt
+                END DO
+             END DO
+          END DO
+      END IF
+
+
       ! 3. Vertical diffusion on v
       ! ---------------------------
@@ -367 +385 @@
       END DO
 #endif
+
+      ! TODO merge with above if possible
+      ! Calculate dia_vor_int & dia_vor_mn if required
+      IF ( ( id_dia_vrt_zdf_int == 1 ) .or. ( id_dia_vrt_zdf_mean == 1 ) ) THEN
+          DO jk = 1, jpkm1
+             DO jj = 2, jpjm1   
+                DO ji = fs_2, fs_jpim1   ! vector opt.
+                   zva(ji,jj,jk) = ( va(ji,jj,jk) - vb(ji,jj,jk) ) * z1_p2dt
+                END DO
+             END DO
+          END DO
+
+          CALL dyn_vrt_dia_3d(zua, zva, id_dia_vrt_zdf_int, id_dia_vrt_zdf_mean)
+      END IF
 
       ! J. Chanut: Lines below are useless ?
@@ -392 +424 @@
       !
       CALL wrk_dealloc( jpi,jpj,jpk, zwi, zwd, zws) 
+      CALL wrk_dealloc( jpi,jpj,jpk, zua, zva     ) 
       !
       IF( nn_timing == 1 )  CALL timing_stop('dyn_zdf_imp')