Changeset 7193 for branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfqiao.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/ZDF/zdfqiao.F90 (modified) (3 diffs)

branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfqiao.F90

@@ -31 +31 @@
    REAL(wp),PUBLIC,ALLOCATABLE,DIMENSION (:,:,:)     :: QBv, QBvu, QBvv
 
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OPA 4.0 , NEMO Consortium (2011) 
@@ -82 +84 @@
                   QBv(ji,jj,jk) = 1.0 * 0.353553 * swh(ji,jj) * tsd2d(ji,jj) *       &
                &              exp(3.0 * wnum(ji,jj) *                                &                     
-               &              (-MIN( gdept_0(ji  ,jj  ,jk) , gdept_0(ji+1,jj  ,jk),  & 
-               &               gdept_0(ji  ,jj+1,jk),gdept_0(ji+1,jj+1,jk))))
+               &              (-MIN( fsdept(ji  ,jj  ,jk) , fsdept(ji+1,jj  ,jk),    &
+               &                     fsdept(ji  ,jj+1,jk) , fsdept(ji+1,jj+1,jk))))
                END DO
             END DO
@@ -98 +100 @@
             DO jj = 1, jpjm1
                DO ji = 1, jpim1
-                  QBvu(ji,jj,jk)=0.5 * ( 2. - umask(ji,jj,jk) ) *                 &
-               &           ( QBv(ji,jj,jk) * tmask(ji,jj,jk)                      & 
-               &           + QBv(ji+1,jj,jk) * tmask(ji+1,jj,jk) )               
-                  QBvv(ji,jj,jk)=0.5 * ( 2. - vmask(ji,jj,jk) ) *                 &
-               &           ( QBv(ji,jj,jk) * tmask(ji,jj,jk)                      &
+                  QBvu(ji,jj,jk) = 0.5 *  umask(ji,jj,jk)  *               &
+               &           ( QBv(ji  ,jj,jk) * tmask(ji  ,jj,jk)           &
+               &           + QBv(ji+1,jj,jk) * tmask(ji+1,jj,jk) )
+                  QBvv(ji,jj,jk) = 0.5 *  vmask(ji,jj,jk)  *               &
+               &           ( QBv(ji,jj  ,jk) * tmask(ji,jj  ,jk)           &
                &           + QBv(ji,jj+1,jk) * tmask(ji,jj+1,jk) )
-
                END DO
             END DO