Changeset 6777 for branches/2015

Timestamp:

2016-07-04T13:16:12+02:00 (8 years ago)

Author:

timgraham

Message:

Bug fixes in updateTS

File:

• branches/2015/dev_r5803_UKMO_AGRIF_Vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) (7 diffs)

branches/2015/dev_r5803_UKMO_AGRIF_Vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -263 +263 @@
       !!---------------------------------------------
       INTEGER, INTENT(in) :: i1,i2,j1,j2,k1,k2,n1,n2
-      REAL(wp),DIMENSION(i1:i2,j1:j2,k1:k2,n1:n2+1), INTENT(inout) :: ptab
+      REAL(wp),DIMENSION(i1:i2,j1:j2,k1:k2,n1:n2), INTENT(inout) :: ptab
       LOGICAL, INTENT(in) :: before
       !!
@@ -280 +280 @@
       IF (before) THEN
          zrho_xy = Agrif_rhox() * Agrif_rhoy() 
-         DO jn = n1,n2
+         DO jn = n1,n2-1
             DO jk=k1,k2
                DO jj=j1,j2
@@ -292 +292 @@
             DO jj=j1,j2
                DO ji=i1,i2
-                  ptab(ji,jj,jk,n2+1) = zrho_xy * e1e2t(ji,jj) * e3t_n(ji,jj,jk) * tmask(ji,jj,jk)
+                  ptab(ji,jj,jk,n2) = tmask(ji,jj,jk) * zrho_xy * e1e2t(ji,jj) * e3t_n(ji,jj,jk) 
                END DO
             END DO
@@ -305 +305 @@
            N_in = 0
            DO jk=k1,k2 !k2 = jpk of child grid
-             IF (ptab(ji,jj,jk,n2+1) == 0) EXIT
+             IF (ptab(ji,jj,jk,n2) == 0) EXIT
              N_in = N_in + 1
-             tabin(jk,:) = ptab(ji,jj,jk,n1:n2)/ptab(ji,jj,jk,n2+1)
-             h_in(N_in) = ptab(ji,jj,jk,n2+1)/e1e2t(ji,jj)
+             tabin(jk,:) = ptab(ji,jj,jk,n1:n2-1)/ptab(ji,jj,jk,n2)
+             h_in(N_in) = ptab(ji,jj,jk,n2)/e1e2t(ji,jj)
            ENDDO
            N_out = 0
@@ -331 +331 @@
 !               h_out(N_out) = - h_diff
              ENDIF
-             DO jn=n1,n2
+             DO jn=n1,n2-1
                CALL reconstructandremap(tabin(1:N_in,jn),h_in(1:N_in),ptab_child(ji,jj,1:N_out,jn),h_out(1:N_out),N_in,N_out)
              ENDDO
@@ -345 +345 @@
          IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN
             ! Add asselin part
-            DO jn = n1,n2
+            DO jn = n1,n2-1
                DO jk=1,jpk
                   DO jj=j1,j2
@@ -359 +359 @@
             ENDDO
          ENDIF
-         DO jn = n1,n2
+         DO jn = n1,n2-1
             DO jk=1,jpk
                DO jj=j1,j2