Changeset 6253 for branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfqiao.F90

Timestamp:

2016-01-14T19:22:56+01:00 (8 years ago)

Author:

emanuelaclementi

Message:

#1643 : Changes after review phase, thanks to Rachid Benshila

File:

• branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfqiao.F90 (modified) (3 diffs)

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfqiao.F90

@@ -53 +53 @@
       !!---------------------------------------------------------------------
       INTEGER, INTENT( in  ) ::  kt   ! ocean time step
-      INTEGER                ::  ierror   ! return error code
-      INTEGER                ::  jj,ji,jk
+      !
+      INTEGER                ::  jj, ji, jk
       !!---------------------------------------------------------------------
-      !!----------------------------------------------------------------------
       !
       !
       !                                         ! -------------------- !
       IF( kt == nit000 ) THEN                   ! First call kt=nit000 !
-      !                                         ! -------------------- !
-         ALLOCATE(QBv(jpi,jpj,jpk))
+         ALLOCATE(QBv(jpi,jpj,jpk))             ! -------------------- !
          ALLOCATE(QBvu(jpi,jpj,jpk))
          ALLOCATE(QBvv(jpi,jpj,jpk))
-
       ENDIF
 
-         QBv (:,:,:) = 0.0
-         QBvu(:,:,:) = 0.0
-         QBvv(:,:,:) = 0.0
+      QBv (:,:,:) = 0.0
+      QBvu(:,:,:) = 0.0
+      QBvv(:,:,:) = 0.0
+
       !
       ! Compute the Qiao term Bv (QBv) to be added to
@@ -80 +78 @@
       IF ( ln_wave ) THEN
          DO jk = 1, jpk
-          DO jj = 1, jpjm1
-            DO ji = 1, jpim1
-
-               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),     & 
+            DO jj = 1, jpjm1
+               DO ji = 1, jpim1
+                  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))))
-
-            ENDDO
-          ENDDO
-         ENDDO
+               END DO
+            END DO
+         END DO
 
          QBv(jpi,:,:)=QBv(jpim1,:,:)
@@ -98 +94 @@
          ! Interpolate Qiao parameter QBv into the grid_U and grid_V
          !-------------------------------------------------
-
+         !
          DO jk = 1, jpk
-           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)                   & 
+            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)                   &
+                  QBvv(ji,jj,jk)=0.5 * ( 2. - vmask(ji,jj,jk) ) *                 &
+               &           ( QBv(ji,jj,jk) * tmask(ji,jj,jk)                      &
                &           + QBv(ji,jj+1,jk) * tmask(ji,jj+1,jk) )
 
-             ENDDO
-            ENDDO
-          ENDDO
-!
+               END DO
+            END DO
+         END DO
+         ! 
          QBvu(jpi,:,:)=QBvu(jpim1,:,:)
          QBvu(:,jpj,:)=QBvu(:,jpjm1,:)
          QBvv(jpi,:,:)=QBvv(jpim1,:,:)
          QBvv(:,jpj,:)=QBvv(:,jpjm1,:)
-!
+
         ELSE
+           CALL ctl_stop( 'STOP', 'To use Qiao formulation you have to set: ln_wave=.true.')
+        ENDIF
         !
-        CALL ctl_stop( 'STOP', 'To use Qiao formulation you have to set: ln_wave=.true.')
-        !
-        ENDIF
-!
    END SUBROUTINE zdf_qiao