Changeset 8902 for branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90

Timestamp:

2017-12-05T16:58:31+01:00 (6 years ago)

Author:

timgraham

Message:

Bug fixes for non key_vertical case, reverted to interpolating tracer rather than tracer content

File:

• branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) (5 diffs)

branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90

@@ -216 +216 @@
                DO jj=j1,j2
                   DO ji=i1,i2
-                     tabres(ji,jj,jk,jn) = tsn(ji,jj,jk,jn) * e1e2t(ji,jj) * e3t_n(ji,jj,jk)
+                     tabres(ji,jj,jk,jn) = tsn(ji,jj,jk,jn)
                   END DO
                END DO
@@ -239 +239 @@
                IF (tabres(ji,jj,jk,n2) == 0) EXIT
                N_in = N_in + 1
-               tabin(jk,:) = tabres(ji,jj,jk,n1:n2-1)/tabres(ji,jj,jk,n2)
+               tabin(jk,:) = tabres(ji,jj,jk,n1:n2-1)
                h_in(N_in) = tabres(ji,jj,jk,n2)/(e1e2t(ji,jj)*zrhoxy)
              END DO
@@ -264 +264 @@
             do jj=j1,j2
                do ji=i1,i2
-                  tsbdiff(ji,jj,jk,n1:n2-1) = tsb(ji,jj,jk,n1:n2) - tmask(ji,jj,jk)*tabres(ji,jj,jk,n1:n2-1)/e3t_n(ji,jj,jk)
+                  tsbdiff(ji,jj,jk,n1:n2-1) = tsb(ji,jj,jk,n1:n2) - tmask(ji,jj,jk)*tabres(ji,jj,jk,n1:n2-1)
                enddo
             enddo
@@ -397 +397 @@
          END DO         
 #else
-         ubdiff(i1:i2,j1:j2,:) = (ub(i1:i2,j1:j2,:) - tabres(:,:,:))*umask(i1:i2,j1:j2,:)
+         ubdiff(i1:i2,j1:j2,:) = (ub(i1:i2,j1:j2,:) - tabres(:,:,:,1))*umask(i1:i2,j1:j2,:)
 #endif
          !
@@ -506 +506 @@
          END DO
 #else
-         tabres = vn(i1:i2,j1:j2,:)
+         tabres(i1:i2,j1:j2,:,m1) = vn(i1:i2,j1:j2,:)
 #endif
       ELSE