Changeset 10009 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/NST/agrif_oce_interp.F90

Timestamp:

2018-07-29T11:23:51+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.1 time-level dimension on ssh

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/NST/agrif_oce_interp.F90 (modified) (16 diffs)

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

@@ -520 +520 @@
          DO jj = 1, jpj
             DO ji = 2, indx
-               ssha(ji,jj) = hbdy_w(ji-1,jj)
-            ENDDO
-         ENDDO
+               ssh(ji,jj,Naa) = hbdy_w(ji-1,jj)
+            END DO
+         END DO
       ENDIF
       !
@@ -530 +530 @@
          DO jj = 1, jpj
             DO ji = indx, nlci-1
-               ssha(ji,jj) = hbdy_e(ji-indx+1,jj)
-            ENDDO
-         ENDDO
+               ssh(ji,jj,Naa) = hbdy_e(ji-indx+1,jj)
+            END DO
+         END DO
       ENDIF
       !
@@ -540 +540 @@
          DO jj = 2, indy
             DO ji = 1, jpi
-               ssha(ji,jj) = hbdy_s(ji,jj-1)
-            ENDDO
-         ENDDO
+               ssh(ji,jj,Naa) = hbdy_s(ji,jj-1)
+            END DO
+         END DO
       ENDIF
       !
@@ -550 +550 @@
          DO jj = indy, nlcj-1
             DO ji = 1, jpi
-               ssha(ji,jj) = hbdy_n(ji,jj-indy+1)
-            ENDDO
-         ENDDO
+               ssh(ji,jj,Naa) = hbdy_n(ji,jj-indy+1)
+            END DO
+         END DO
       ENDIF
       !
@@ -576 +576 @@
             DO ji = 2, indx
                ssha_e(ji,jj) = hbdy_w(ji-1,jj)
-            ENDDO
-         ENDDO
+            END DO
+         END DO
       ENDIF
       !
@@ -586 +586 @@
             DO ji = indx, nlci-1
                ssha_e(ji,jj) = hbdy_e(ji-indx+1,jj)
-            ENDDO
-         ENDDO
+            END DO
+         END DO
       ENDIF
       !
@@ -596 +596 @@
             DO ji = 1, jpi
                ssha_e(ji,jj) = hbdy_s(ji,jj-1)
-            ENDDO
-         ENDDO
+            END DO
+         END DO
       ENDIF
       !
@@ -606 +606 @@
             DO ji = 1, jpi
                ssha_e(ji,jj) = hbdy_n(ji,jj-indy+1)
-            ENDDO
-         ENDDO
+            END DO
+         END DO
       ENDIF
       !
@@ -700 +700 @@
                   N_out = N_out + 1
                   h_out(jk) = e3t_n(iref,jref,jk)
-               ENDDO
+               END DO
                IF (N_in > 0) THEN
                   DO jn=1,jpts
                      call reconstructandremap(tabin(1:N_in,jn),h_in,ptab_child(ji,jj,1:N_out,jn),h_out,N_in,N_out)
-                  ENDDO
+                  END DO
                ENDIF
-            ENDDO
-         ENDDO
+            END DO
+         END DO
 # else
          ptab_child(i1:i2,j1:j2,1:jpk,1:jpts) = ptab(i1:i2,j1:j2,1:jpk,1:jpts)
@@ -848 +848 @@
    END SUBROUTINE interptsn
 
+
    SUBROUTINE interpsshn( ptab, i1, i2, j1, j2, before, nb, ndir )
       !!----------------------------------------------------------------------
@@ -861 +862 @@
       !
       IF( before) THEN
-         ptab(i1:i2,j1:j2) = sshn(i1:i2,j1:j2)
+         ptab(i1:i2,j1:j2) = ssh(i1:i2,j1:j2,Nnn)
       ELSE
          western_side  = (nb == 1).AND.(ndir == 1)
@@ -868 +869 @@
          northern_side = (nb == 2).AND.(ndir == 2)
          !! clem ghost
-         IF(western_side)  hbdy_w(1:nbghostcells,j1:j2) = ptab(i1:i2,j1:j2) * tmask(i1:i2,j1:j2,1)
-         IF(eastern_side)  hbdy_e(1:nbghostcells,j1:j2) = ptab(i1:i2,j1:j2) * tmask(i1:i2,j1:j2,1)
-         IF(southern_side) hbdy_s(i1:i2,1:nbghostcells) = ptab(i1:i2,j1:j2) * tmask(i1:i2,j1:j2,1) 
-         IF(northern_side) hbdy_n(i1:i2,1:nbghostcells) = ptab(i1:i2,j1:j2) * tmask(i1:i2,j1:j2,1)
+         IF(western_side )   hbdy_w(1:nbghostcells,j1:j2) = ptab(i1:i2,j1:j2) * tmask(i1:i2,j1:j2,1)
+         IF(eastern_side )   hbdy_e(1:nbghostcells,j1:j2) = ptab(i1:i2,j1:j2) * tmask(i1:i2,j1:j2,1)
+         IF(southern_side)   hbdy_s(i1:i2,1:nbghostcells) = ptab(i1:i2,j1:j2) * tmask(i1:i2,j1:j2,1) 
+         IF(northern_side)   hbdy_n(i1:i2,1:nbghostcells) = ptab(i1:i2,j1:j2) * tmask(i1:i2,j1:j2,1)
       ENDIF
       !
    END SUBROUTINE interpsshn
+
 
    SUBROUTINE interpun( ptab, i1, i2, j1, j2, k1, k2, m1, m2, before, nb, ndir )
@@ -925 +927 @@
                   tabin(jk) = ptab(ji,jj,jk,1)/ptab(ji,jj,jk,2)
                   h_in(N_in) = ptab(ji,jj,jk,2)/(e2u(ji,jj)*zrhoy) 
-              ENDDO
+              END DO
          
               IF (N_in == 0) THEN
@@ -937 +939 @@
                  N_out = N_out + 1
                  h_out(N_out) = e3u_a(iref,jj,jk)
-              ENDDO
+              END DO
          
               IF (N_out == 0) THEN
@@ -953 +955 @@
               ENDIF
               call reconstructandremap(tabin(1:N_in),h_in(1:N_in),ua(ji,jj,1:N_out),h_out(1:N_out),N_in,N_out)
-            ENDDO
-         ENDDO
+            END DO
+         END DO
 
 # else
@@ -1416 +1418 @@
                   N_out = N_out + 1
                   h_out(jk) = e3t_n(ji,jj,jk)
-               ENDDO
+               END DO
                IF (N_in > 0) THEN
                   CALL reconstructandremap(tabin(1:N_in),h_in,avm_k(ji,jj,1:N_out),h_out,N_in,N_out)
                ENDIF
-            ENDDO
-         ENDDO
+            END DO
+         END DO
 #else
          avm_k(i1:i2,j1:j2,k1:k2) = ptab (i1:i2,j1:j2,k1:k2,1)