Changeset 8762 for branches/2017/dev_r8624_AGRIF3_VVL/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90

Timestamp:

2017-11-21T11:15:35+01:00 (6 years ago)

Author:

jchanut

Message:

AGRIF + vvl: Final changes, update SETTE tests (these are ok except SAS) - #1965

File:

• branches/2017/dev_r8624_AGRIF3_VVL/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) (2 diffs)

branches/2017/dev_r8624_AGRIF3_VVL/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90

@@ -65 +65 @@
 
 
-   SUBROUTINE updateTRC( ptab, i1, i2, j1, j2, k1, k2, n1, n2, before, nb, ndir )
+   SUBROUTINE updateTRC( tabres, i1, i2, j1, j2, k1, k2, n1, n2, before )
       !!----------------------------------------------------------------------
-      !!                      *** ROUTINE updateT ***
+      !!                      *** ROUTINE updateTRC ***
       !!----------------------------------------------------------------------
       INTEGER                                    , INTENT(in   ) ::   i1, i2, j1, j2, k1, k2, n1, n2
-      REAL(wp),DIMENSION(i1:i2,j1:j2,k1:k2,n1:n2), INTENT(inout) ::   ptab
+      REAL(wp),DIMENSION(i1:i2,j1:j2,k1:k2,n1:n2), INTENT(inout) ::   tabres
       LOGICAL                                    , INTENT(in   ) ::   before
-      INTEGER, INTENT(in) :: nb, ndir
       !!
-      LOGICAL :: western_side, eastern_side, southern_side, northern_side 
       INTEGER :: ji,jj,jk,jn
       REAL(wp) :: ztb, ztnu, ztno
@@ -134 +132 @@
          ENDIF
          !
-         !
-# if defined DECAL_FEEDBACK
-         IF (.NOT.ln_linssh) THEN 
-            western_side  = (nb == 1).AND.(ndir == 1)
-            eastern_side  = (nb == 1).AND.(ndir == 2)
-            southern_side = (nb == 2).AND.(ndir == 1)
-            northern_side = (nb == 2).AND.(ndir == 2)
-            !
-            ! Asselin correction 
-            IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN
-               IF (southern_side) THEN
-                  DO jn = n1,n2
-                     DO jk=k1,k2
-                        DO ji=i1,i2
-                           ztb  = trb(ji,j1-1,jk,jn) * e3t_b(ji,j1-1,jk) ! fse3t_b prior update should be used
-                           ztnu = trn(ji,j1-1,jk,jn) * e3t_n(ji,j1-1,jk)
-                           ztno = trn(ji,j1-1,jk,jn) * e3t_a(ji,j1-1,jk)
-                           trb(ji,j1-1,jk,jn) = ( ztb + atfp * ( ztnu - ztno) )  & 
-                                     &        * tmask(ji,j1-1,jk) / e3t_b(ji,j1-1,jk)
-                        END DO
-                     ENDDO
-                  ENDDO
-               ENDIF
-               IF (northern_side) THEN
-                  DO jn = n1,n2
-                     DO jk=k1,k2
-                        DO ji=i1,i2
-                           ztb  = trb(ji,j2+1,jk,jn) * e3t_b(ji,j2+1,jk) ! fse3t_b prior update should be used
-                           ztnu = trn(ji,j2+1,jk,jn) * e3t_n(ji,j2+1,jk)
-                           ztno = trn(ji,j2+1,jk,jn) * e3t_a(ji,j2+1,jk)
-                           trb(ji,j2+1,jk,jn) = ( ztb + atfp * ( ztnu - ztno) )  & 
-                                     &        * tmask(ji,j2+1,jk) / e3t_b(ji,j2+1,jk)
-                        END DO
-                     ENDDO
-                  ENDDO
-               ENDIF
-               IF (western_side) THEN
-                  DO jn = n1,n2
-                     DO jk=k1,k2
-                        DO jj=j1,j2
-                           ztb  = trb(i1-1,jj,jk,jn) * e3t_b(i1-1,jj,jk) ! fse3t_b prior update should be used
-                           ztnu = trn(i1-1,jj,jk,jn) * e3t_n(i1-1,jj,jk)
-                           ztno = trn(i1-1,jj,jk,jn) * e3t_a(i1-1,jj,jk)
-                           trb(i1-1,jj,jk,jn) = ( ztb + atfp * ( ztnu - ztno) )  & 
-                                     &        * tmask(i1-1,jj,jk) / e3t_b(i1-1,jj,jk)
-                        END DO
-                     ENDDO
-                  ENDDO
-               ENDIF
-               IF (eastern_side) THEN
-                  DO jn = n1,n2
-                     DO jk=k1,k2
-                        DO jj=j1,j2
-                           ztb  = trb(i2+1,jj,jk,jn) * e3t_b(i2+1,jj,jk) ! fse3t_b prior update should be used
-                           ztnu = trn(i2+1,jj,jk,jn) * e3t_n(i2+1,jj,jk)
-                           ztno = trn(i2+1,jj,jk,jn) * e3t_a(i2+1,jj,jk)
-                           trb(i2+1,jj,jk,jn) = ( ztb + atfp * ( ztnu - ztno) )  & 
-                                     &        * tmask(i2+1,jj,jk) / e3t_b(i2+1,jj,jk)
-                        END DO
-                     ENDDO
-                  ENDDO
-               ENDIF
-            ENDIF ! Asselin correction
-
-            IF (southern_side) THEN
-               DO jn = n1,n2
-                  DO jk=k1,k2
-                     DO ji=i1,i2
-                        trn(ji,j1-1,jk,jn) = trn(ji,j1-1,jk,jn) * e3t_a(ji,j1-1,jk) / e3t_n(ji,j1-1,jk)
-                     END DO
-                  ENDDO
-               ENDDO
-            ENDIF
-            IF (northern_side) THEN
-               DO jn = n1,n2
-                  DO jk=k1,k2
-                     DO ji=i1,i2
-                        trn(ji,j2+1,jk,jn) = trn(ji,j2+1,jk,jn) * e3t_a(ji,j2+1,jk) / e3t_n(ji,j2+1,jk)
-                     END DO
-                  ENDDO
-               ENDDO
-            ENDIF
-            IF (western_side) THEN
-               DO jn = n1,n2
-                  DO jk=k1,k2
-                     DO jj=j1,j2
-                        trn(i1-1,jj,jk,jn) = trn(i1-1,jj,jk,jn) * e3t_a(i1-1,jj,jk) / e3t_n(i1-1,jj,jk)
-                     END DO
-                  ENDDO
-               ENDDO
-            ENDIF
-            IF (eastern_side) THEN
-               DO jn = n1,n2
-                  DO jk=k1,k2
-                     DO jj=j1,j2
-                        trn(i2+1,jj,jk,jn) = trn(i2+1,jj,jk,jn) * e3t_a(i2+1,jj,jk) / e3t_n(i2+1,jj,jk)
-                     END DO
-                  ENDDO
-               ENDDO
-            ENDIF
-         ENDIF
-#endif
       ENDIF
       !