Changeset 7193 for branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

Timestamp:

2016-11-04T15:23:32+01:00 (7 years ago)

Author:

jcastill

Message:

Update latest changes to the INGV branch, fix small bug (read ln_zdfqiao from the namelist)

File:

• branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) (6 diffs)

branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

@@ -56 +56 @@
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: usd2d, vsd2d
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)     :: usd3d, vsd3d, wsd3d 
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)     :: usd3dt, vsd3dt
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: zusd2dt, zvsd2dt
 
@@ -94 +95 @@
             ztransp = 2.0_wp*rpi*swh(ji,jj)**2.0_wp/(16.0_wp*MAX(wmp(ji,jj),0.0000001_wp))
             ! Stokes surface speed
-            zsp0 = SQRT( sf_sd(jp_usd)%fnow(ji,jj,1)**2 + sf_sd(jp_vsd)%fnow(ji,jj,1)**2)
+            zsp0 = SQRT( zusd2dt(ji,jj)**2 + zvsd2dt(ji,jj)**2)
             ! Wavenumber scale
             zk = ABS(zsp0)/MAX(ABS(5.97_wp*ztransp),0.0000001_wp)
@@ -101 +102 @@
             END DO
          END DO
-
+         !
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               usd3dt(ji,jj,jk) = zfac(ji,jj) * zusd2dt(ji,jj) * tmask(ji,jj,jk) 
+               vsd3dt(ji,jj,jk) = zfac(ji,jj) * zvsd2dt (ji,jj) * tmask(ji,jj,jk) 
+            END DO 
+         END DO 
+      END DO 
+      ! Into the U and V Grid 
+      DO jk = 1, jpkm1 
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
-               ! Into the U and V Grid 
-               zus = 0.5 * ( 2. - umask(ji,jj,1) ) * ( zfac(ji,jj) * tmask(ji,jj,1) &
-                  &                                + zfac(ji+1,jj) * tmask(ji+1,jj,1) )
-               zvs = 0.5 * ( 2. - vmask(ji,jj,1) ) * ( zfac(ji,jj) * tmask(ji,jj,1) &
-                  &                                + zfac(ji,jj+1) * tmask(ji,jj+1,1) )
-               usd2d(ji,jj) = 0.5 * ( 2. - umask(ji,jj,1) ) * ( zusd2dt(ji,jj) * tmask(ji,jj,1) &
-                  &                                         + zusd2dt(ji+1,jj) * tmask(ji+1,jj,1) )
-               vsd2d(ji,jj) = 0.5 * ( 2. - vmask(ji,jj,1) ) * ( zvsd2dt(ji,jj) * tmask(ji,jj,1) &
-                  &                                         + zvsd2dt(ji,jj+1) * tmask(ji,jj+1,1) )
-               usd3d(ji,jj,jk) = usd2d(ji,jj) * zus
-               vsd3d(ji,jj,jk) = vsd2d(ji,jj) * zvs
+               usd3d(ji,jj,jk) =   0.5 *  umask(ji,jj,jk)  *        &
+                               &  (usd3dt(ji,jj,jk) + usd3dt(ji+1,jj,jk))
+               vsd3d(ji,jj,jk) =  0.5 *  vmask(ji,jj,jk)  *           &
+                               &  (vsd3dt(ji,jj,jk) + vsd3dt(ji,jj+1,jk))
             END DO
          END DO
@@ -170 +173 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            tsd2d(ji,jj) = ((zusd2dt(ji,jj) * tmask(ji,jj,1))**2.0  + &
-            &               (zvsd2dt(ji,jj) * tmask(ji,jj,1))**2.0)**0.5
+            tsd2d(ji,jj) = SQRT( zusd2dt(ji,jj)**2 + zvsd2dt(ji,jj)**2)
          END DO
       END DO
@@ -287 +289 @@
             ALLOCATE( usd2d(jpi,jpj),vsd2d(jpi,jpj) )
             ALLOCATE( usd3d(jpi,jpj,jpk),vsd3d(jpi,jpj,jpk),wsd3d(jpi,jpj,jpk) )
+            ALLOCATE( usd3dt(jpi,jpj,jpk),vsd3dt(jpi,jpj,jpk) )
             ALLOCATE( swh(jpi,jpj), wmp(jpi,jpj) )
             ALLOCATE( zusd2dt(jpi,jpj), zvsd2dt(jpi,jpj) )
@@ -292 +295 @@
             vsd3d(:,:,:) = 0._wp   ;   vsd2d(:,:) = 0._wp   ; 
             wsd3d(:,:,:) = 0._wp   ;
+            usd3dt(:,:,:) = 0._wp  ;   vsd3dt(:,:,:) = 0._wp   ;
             swh  (:,:)   = 0._wp   ;    wmp (:,:) = 0._wp ;
             IF ( ln_zdfqiao ) THEN     !==  Vertical mixing enhancement using Qiao,2010  ==!