Changeset 7884

Timestamp:

2017-04-10T13:22:46+02:00 (7 years ago)

Author:

glong

Message:

Merged key_dynspg_ts check with dia_vrt_zdf checks to remove duplicate code

File:

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

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

@@ -262 +262 @@
       END DO
 
-#if ! defined key_dynspg_ts
       ! Normalization to obtain the general momentum trend ua
-      DO jk = 1, jpkm1
-         DO jj = 2, jpjm1   
-            DO ji = fs_2, fs_jpim1   ! vector opt.
-               ua(ji,jj,jk) = ( ua(ji,jj,jk) - ub(ji,jj,jk) ) * z1_p2dt
-            END DO
-         END DO
-      END DO
-#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
+      IF ( ( .NOT. lk_dynspg_ts ) .OR. 
+              ( ( id_dia_vrt_zdf_int == 1 ) .OR. ( id_dia_vrt_zdf_mean == 1 ) ) ) THEN
           DO jk = 1, jpkm1
              DO jj = 2, jpjm1   
@@ -283 +272 @@
              END DO
           END DO
+          IF ( .NOT. lk_dynspg_ts ) THEN
+             ua(:,:,:) = zua(:,:,:)
+          END IF
       END IF
 
@@ -376 +368 @@
 
       ! Normalization to obtain the general momentum trend va
-#if ! defined key_dynspg_ts
-      DO jk = 1, jpkm1
-         DO jj = 2, jpjm1   
-            DO ji = fs_2, fs_jpim1   ! vector opt.
-               va(ji,jj,jk) = ( va(ji,jj,jk) - vb(ji,jj,jk) ) * z1_p2dt
-            END DO
-         END DO
-      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
+      IF ( ( .NOT lk_dynspg_ts ) .OR.
+           ( ( id_dia_vrt_zdf_int == 1 ) .OR. ( id_dia_vrt_zdf_mean == 1 ) ) ) THEN
           DO jk = 1, jpkm1
              DO jj = 2, jpjm1   
@@ -396 +377 @@
              END DO
           END DO
-
-          CALL dyn_vrt_dia_3d(zua, zva, id_dia_vrt_zdf_int, id_dia_vrt_zdf_mean)
+          IF ( ( id_dia_vrt_zdf_int == 1 ) .OR. (id_dia_vrt_zdf_mean == 1) ) THEN
+              CALL dyn_vrt_dia_3d(zua, zva, id_dia_vrt_zdf_int, id_dia_vrt_zdf_mean)
+          END IF
+          IF ( .NOT lk_dynspg_ts ) THEN
+             va(:,:,:) = zva(:,:,:)
+          END IF
       END IF