Changeset 10030 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/NST/agrif_oce_update.F90

Timestamp:

2018-08-03T10:18:16+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.3 remove e3uw_$ e3vw_$, except e3.w_0 and use only after e3 in dyn/trazdf

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/NST/agrif_oce_update.F90 (modified) (6 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/NST/agrif_oce_update.F90

@@ -258 +258 @@
       e3u_a(:,:,:) = e3u_n(:,:,:)
       e3v_a(:,:,:) = e3v_n(:,:,:)
-!      ua(:,:,:) = e3u_b(:,:,:)
-!      va(:,:,:) = e3v_b(:,:,:)
-      hu_a(:,:) = hu_n(:,:)
-      hv_a(:,:) = hv_n(:,:)
-
+      hu_a (:,:)   = hu_n (:,:)
+      hv_a (:,:)   = hv_n (:,:)
+      !
       !                          !* NOW fields : 
-      CALL ssh2e3_now                  ! set: ht , hu , hv , r1_hu, r1_hv
-      !                                !      e3t, e3w, e3u, e3uw, e3v, e3vw, e3f   (from 1 to jpkm1)
-      !                                !      gdept_n, gdepw_n, gde3w_n
+      CALL ssh2e3_now                  ! set:  ht,  hu,  hv, r1_hu, r1_hv
+      !                                !      e3t, e3u, e3v, e3f               (from 1 to jpkm1)
+      !                                !      e3w, gdept_n, gdepw_n, gde3w_n   (from 1 to jpk  )
 
       !                          !* BEFORE fields : 
       IF (.NOT.( lk_agrif_fstep .AND. l_1st_euler ) ) THEN
          !
-         CALL ssh2e3_before               ! set:      hu , hv , r1_hu, r1_hv 
-         !                                !      e3t, e3w, e3u, e3uw, e3v, e3vw        (from 1 to jpkm1)
-         !
+         CALL ssh2e3_before               ! set:       hu,  hv, r1_hu, r1_hv 
+         !                                !      e3t, e3u, e3v                 (from 1 to jpkm1)
+         !                                !      e3w                           (from 1 to jpk  )
       ENDIF
       !
@@ -304 +302 @@
                DO jj = j1, j2
                   DO ji = i1, i2
-                     tabres(ji,jj,jk,jn) = (tsn(ji,jj,jk,jn) * e3t_n(ji,jj,jk) ) &
-                                           * tmask(ji,jj,jk) + (tmask(ji,jj,jk)-1)*999._wp
+                     tabres(ji,jj,jk,jn) =  tmask(ji,jj,jk)    * (tsn(ji,jj,jk,jn) * e3t_n(ji,jj,jk) )   &
+                                         + (tmask(ji,jj,jk)-1) * 999._wp
                   END DO
                END DO
@@ -313 +311 @@
             DO jj = j1, j2
                DO ji = i1, i2
-                  tabres(ji,jj,jk,n2) = tmask(ji,jj,jk) * e3t_n(ji,jj,jk) &
-                                           + (tmask(ji,jj,jk)-1)*999._wp
+                  tabres(ji,jj,jk,n2) =  tmask(ji,jj,jk)    * e3t_n(ji,jj,jk)   &
+                     &                + (tmask(ji,jj,jk)-1) * 999._wp
                END DO
             END DO
@@ -352 +350 @@
 
          IF ( .NOT.( lk_agrif_fstep .AND. l_1st_euler ) ) THEN       ! Add asselin part
-
-!!gm         IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN
             DO jn = n1, n2-1
                DO jk = 1, jpk
@@ -416 +412 @@
          END DO
 !< jc tmp
-         IF ( .NOT.( lk_agrif_fstep .AND. l_1st_euler ) ) THEN
-!!gm         IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN
-            ! Add asselin part
+         IF ( .NOT.( lk_agrif_fstep .AND. l_1st_euler ) ) THEN    ! Add asselin part
             DO jn = 1,jpts
                DO jk = k1, k2
@@ -447 +441 @@
          !
          IF ( l_1st_euler .AND. Agrif_Nb_Step() == 0 ) THEN
-!!gm         IF  ((neuler==0).AND.(Agrif_Nb_Step()==0) ) THEN
             tsb(i1:i2,j1:j2,k1:k2,1:jpts)  = tsn(i1:i2,j1:j2,k1:k2,1:jpts)
          ENDIF