Changeset 7649 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

Timestamp:

2017-02-06T16:21:14+01:00 (7 years ago)

Author:

glong

Message:

dyn_vrt_dia subroutine added and calls added for most processes - spg, zdf, and bfr not yet done

File:

• branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) (5 diffs)

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

@@ -18 +18 @@
    USE trd_oce        ! trends: ocean variables
    USE trddyn         ! trend manager: dynamics
+   USE divcur         ! for dyn_vrt_dia
    !
    USE in_out_manager ! I/O manager
@@ -59 +60 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step inedx
       !
-      INTEGER  ::   ji, jj, jk      ! dummy loop indices
-      REAL(wp) ::   zua, zva        ! temporary scalars
+      INTEGER  ::   id_dia_vrt_zad_int  = 1  ! TODO remove once flags set properly
+      INTEGER  ::   id_dia_vrt_zad_mean = 1  ! TODO remove once flags set properly
+      INTEGER  ::   ji, jj, jk               ! dummy loop indices
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zwuw , zwvw
       REAL(wp), POINTER, DIMENSION(:,:  ) ::  zww
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zua, zva
       !!----------------------------------------------------------------------
       !
@@ -69 +72 @@
       !
       CALL wrk_alloc( jpi,jpj, zww ) 
-      CALL wrk_alloc( jpi,jpj,jpk, zwuw , zwvw ) 
+      CALL wrk_alloc( jpi,jpj,jpk, zwuw , zwvw, zua, zva ) 
       !
       IF( kt == nit000 ) THEN
@@ -121 +124 @@
             DO ji = fs_2, fs_jpim1       ! vector opt.
                !                         ! vertical momentum advective trends
-               zua = - ( zwuw(ji,jj,jk) + zwuw(ji,jj,jk+1) ) / ( e1u(ji,jj) * e2u(ji,jj) * fse3u(ji,jj,jk) )
-               zva = - ( zwvw(ji,jj,jk) + zwvw(ji,jj,jk+1) ) / ( e1v(ji,jj) * e2v(ji,jj) * fse3v(ji,jj,jk) )
+               zua(ji,jj,jk) = - ( zwuw(ji,jj,jk) + zwuw(ji,jj,jk+1) ) /            &
+                   &                ( e1u(ji,jj) * e2u(ji,jj) * fse3u(ji,jj,jk) )
+               zva(ji,jj,jk) = - ( zwvw(ji,jj,jk) + zwvw(ji,jj,jk+1) ) /            &
+                   &                ( e1v(ji,jj) * e2v(ji,jj) * fse3v(ji,jj,jk) )
                !                         ! add the trends to the general momentum trends
-               ua(ji,jj,jk) = ua(ji,jj,jk) + zua
-               va(ji,jj,jk) = va(ji,jj,jk) + zva
+               ua(ji,jj,jk) = ua(ji,jj,jk) + zua(ji,jj,jk)
+               va(ji,jj,jk) = va(ji,jj,jk) + zva(ji,jj,jk)
             END DO  
          END DO  
@@ -140 +145 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
+      IF ( ( id_dia_vrt_zad_int == 1 ) .or. ( id_dia_vrt_zad_mean == 1 ) ) THEN
+          CALL dyn_vrt_dia(zua, zva, id_dia_vrt_zad_int, id_dia_vrt_zad_mean)
+      END IF
+      !
       CALL wrk_dealloc( jpi,jpj, zww ) 
-      CALL wrk_dealloc( jpi,jpj,jpk, zwuw , zwvw ) 
+      CALL wrk_dealloc( jpi,jpj,jpk, zwuw , zwvw, zua, zva ) 
       !
       IF( nn_timing == 1 )  CALL timing_stop('dyn_zad')