Changeset 8168 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.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/dynldf_bilap.F90 (modified) (3 diffs)

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

@@ -76 +76 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
-      INTEGER  :: id_dia_vrt_ldf_int  = 1      ! TODO remove once flags set properly
-      INTEGER  :: id_dia_vrt_ldf_mean = 1      ! TODO remove once flags set properly
+      INTEGER  :: id_dia_vrt_ldf_int  = 31     ! TODO remove once flags set properly
+      INTEGER  :: id_dia_vrt_ldf_mean = 32     ! TODO remove once flags set properly
       INTEGER  ::   ji, jj, jk                  ! dummy loop indices
       REAL(wp) ::   zbt, ze2u, ze2v             ! temporary scalar
@@ -194 +194 @@
                ze2v = e1v(ji,jj) * fse3v(ji,jj,jk)
                ! horizontal biharmonic diffusive trends
-               zua(ji,jj,jk) = - ( zuf(ji  ,jj,jk) - zuf(ji,jj-1,jk) ) / ze2u   &
-                  &  + ( zut(ji+1,jj,jk) - zut(ji,jj  ,jk) ) / e1u(ji,jj)       &
+               zua(ji,jj,jk) = ( - ( zuf(ji  ,jj,jk) - zuf(ji,jj-1,jk) ) / ze2u   &
+                  &  + ( zut(ji+1,jj,jk) - zut(ji,jj  ,jk) ) / e1u(ji,jj) )       &
                   &  * ( fsahmu(ji,jj,jk)*nkahm_smag +(1 -nkahm_smag ))
-               zva(ji,jj,jk) = + ( zuf(ji,jj  ,jk) - zuf(ji-1,jj,jk) ) / ze2v   &
-                  &  + ( zut(ji,jj+1,jk) - zut(ji  ,jj,jk) ) / e2v(ji,jj)       &
+               zva(ji,jj,jk) = ( + ( zuf(ji,jj  ,jk) - zuf(ji-1,jj,jk) ) / ze2v   &
+                  &  + ( zut(ji,jj+1,jk) - zut(ji  ,jj,jk) ) / e2v(ji,jj) )       &
                   &  * ( fsahmv(ji,jj,jk)*nkahm_smag +(1 -nkahm_smag ))
                ! add it to the general momentum trends
@@ -209 +209 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF ( ( id_dia_vrt_ldf_int == 1 ) .or. ( id_dia_vrt_ldf_mean == 1 ) ) THEN
-          CALL dyn_vrt_dia_3d(zua, zva, id_dia_vrt_ldf_int, id_dia_vrt_ldf_mean)
+      IF ( ( id_dia_vrt_ldf_int == 31 ) .or. ( id_dia_vrt_ldf_mean == 32 ) ) THEN
+          ! TODO - remove kt only used for validation
+          CALL dyn_vrt_dia_3d(zua, zva, id_dia_vrt_ldf_int, id_dia_vrt_ldf_mean, kt)
       END IF
       !