Changeset 8168 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

Timestamp:

2017-06-13T18:50:51+02:00 (7 years ago)

Author:

glong

Message:

changes as of eod 13/16/17

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

@@ -69 +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
+      INTEGER  ::   id_dia_vrt_zdf_int = 71 ! TODO remove once flags set properly
+      INTEGER  ::   id_dia_vrt_zdf_mn  = 72 ! TODO remove once flags set properly
       REAL(wp) ::   z1_p2dt, zcoef, zzwi, zzws, zrhs   ! local scalars
       REAL(wp) ::   ze3ua, ze3va
@@ -262 +262 @@
       END DO
 
+      IF ( ( .NOT. lk_dynspg_ts ) .OR.            &
+           &    ( ( id_dia_vrt_zdf_int == 71 ) .OR. ( id_dia_vrt_zdf_mn == 72 ) ) ) THEN
       ! Normalization to obtain the general momentum trend ua
-      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   
@@ -367 +367 @@
       END DO
 
+      IF ( ( .NOT. lk_dynspg_ts ) .OR.            &
+           &    ( ( id_dia_vrt_zdf_int == 71 ) .OR. ( id_dia_vrt_zdf_mn == 72 ) ) ) THEN
       ! Normalization to obtain the general momentum trend va
-      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   
@@ -377 +377 @@
              END DO
           END DO
-          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)
+          IF ( ( id_dia_vrt_zdf_int == 71 ) .OR. (id_dia_vrt_zdf_mn == 72) ) THEN
+              ! TODO - remove kt only used for validation
+              CALL dyn_vrt_dia_3d(zua, zva, id_dia_vrt_zdf_int, id_dia_vrt_zdf_mn, kt)
           END IF
           IF ( .NOT. lk_dynspg_ts ) THEN