Changeset 11613 for NEMO/branches/UKMO/NEMO_4.0_momentum_trends/src/OCE/DYN/dynzdf.F90

Timestamp:

2019-09-30T11:07:57+02:00 (5 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0_momentum_trends branch : first set of code changes.

File:

• NEMO/branches/UKMO/NEMO_4.0_momentum_trends/src/OCE/DYN/dynzdf.F90 (modified) (7 diffs)

NEMO/branches/UKMO/NEMO_4.0_momentum_trends/src/OCE/DYN/dynzdf.F90

@@ -25 +25 @@
    !
    USE in_out_manager ! I/O manager
+   USE iom             ! IOM library
    USE lib_mpp        ! MPP library
    USE prtctl         ! Print control
@@ -69 +70 @@
       INTEGER  ::   ji, jj, jk         ! dummy loop indices
       INTEGER  ::   iku, ikv           ! local integers
+      INTEGER  ::   ikbu, ikbv         ! local integers
       REAL(wp) ::   zzwi, ze3ua, zdt   ! local scalars
       REAL(wp) ::   zzws, ze3va        !   -      -
@@ -99 +101 @@
       !
       !
-      IF( l_trddyn )   THEN         !* temporary save of ta and sa trends
-         ALLOCATE( ztrdu(jpi,jpj,jpk), ztrdv(jpi,jpj,jpk) ) 
-         ztrdu(:,:,:) = ua(:,:,:)
-         ztrdv(:,:,:) = va(:,:,:)
-      ENDIF
-      !
       !              !==  RHS: Leap-Frog time stepping on all trends but the vertical mixing  ==!   (put in ua,va)
       !
@@ -131 +127 @@
             va(:,:,jk) = ( va(:,:,jk) - va_b(:,:) ) * vmask(:,:,jk)
          END DO
+         IF( l_trddyn )   THEN         !* temporary save of ta and sa trends
+            ALLOCATE( ztrdu(jpi,jpj,jpk), ztrdv(jpi,jpj,jpk) ) 
+            ztrdu(:,:,:) = ua(:,:,:)
+            ztrdv(:,:,:) = va(:,:,:)
+         ENDIF
          DO jj = 2, jpjm1        ! Add bottom/top stress due to barotropic component only
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -141 +142 @@
             END DO
          END DO
+         IF( l_trddyn )   THEN                      ! save explicit part of bottom friction trends
+            ztrdu(:,:,:) = ( ua(:,:,:) - ztrdu(:,:,:) ) / r2dt 
+            ztrdv(:,:,:) = ( va(:,:,:) - ztrdv(:,:,:) ) / r2dt 
+            CALL trd_dyn( ztrdu, ztrdv, jpdyn_bfr, kt )
+         ENDIF
          IF( ln_isfcav ) THEN    ! Ocean cavities (ISF)
             DO jj = 2, jpjm1        
@@ -153 +159 @@
             END DO
          END IF
+      ENDIF
+      !
+      IF( l_trddyn )   THEN         !* temporary save of ta and sa trends
+         IF( .NOT. ALLOCATED(ztrdu) ) ALLOCATE( ztrdu(jpi,jpj,jpk), ztrdv(jpi,jpj,jpk) ) 
+         ztrdu(:,:,:) = ua(:,:,:)
+         ztrdv(:,:,:) = va(:,:,:)
       ENDIF
       !
@@ -486 +498 @@
       !
       IF( l_trddyn )   THEN                      ! save the vertical diffusive trends for further diagnostics
-         ztrdu(:,:,:) = ( ua(:,:,:) - ub(:,:,:) ) / r2dt - ztrdu(:,:,:)
-         ztrdv(:,:,:) = ( va(:,:,:) - vb(:,:,:) ) / r2dt - ztrdv(:,:,:)
+
+         ztrdu(:,:,:) = ( ua(:,:,:) - ztrdu(:,:,:) ) / r2dt 
+         ztrdv(:,:,:) = ( va(:,:,:) - ztrdv(:,:,:) ) / r2dt 
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_zdf, kt )
+         !
+         IF( ln_drgimp ) THEN
+            ztrdu(:,:,:) = 0._wp    ;   ztrdv(:,:,:) = 0._wp
+            DO jk = 1, jpkm1
+               DO jj = 2, jpjm1
+                  DO ji = 2, jpim1
+                     ikbu = mbku(ji,jj)          ! deepest ocean u- & v-levels
+                     ikbv = mbkv(ji,jj)
+                     ztrdu(ji,jj,jk) = 0.5 * ( rCdU_bot(ji+1,jj) + rCdU_bot(ji,jj) )  & 
+     &                               * un(ji,jj,ikbu) / e3u_n(ji,jj,ikbu)
+                     ztrdv(ji,jj,jk) = 0.5 * ( rCdU_bot(ji,jj+1) + rCdU_bot(ji,jj) )  &
+     &                               * vn(ji,jj,ikbv) / e3v_n(ji,jj,ikbv)
+                  END DO
+               END DO
+            END DO
+            CALL trd_dyn( ztrdu, ztrdv, jpdyn_bfri, kt )
+         ENDIF
+         !
          DEALLOCATE( ztrdu, ztrdv ) 
       ENDIF