Changeset 6930

Timestamp:

2016-09-15T15:19:19+02:00 (8 years ago)

Author:

timgraham

Message:

Modified interpun as discussed in Grenoble avoiding need for interpscales.

File:

• branches/2015/dev_r5803_UKMO_AGRIF_Vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) (2 diffs)

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

@@ -945 +945 @@
       !!---------------------------------------------    
       !
+      zrhoy = Agrif_rhoy()
       IF (before) THEN 
          DO jk=1,jpk
             DO jj=j1,j2
                DO ji=i1,i2
-                  ptab(ji,jj,jk,1) = e2u(ji,jj) * un(ji,jj,jk)
-                  ptab(ji,jj,jk,1) = ptab(ji,jj,jk,1) * e3u_n(ji,jj,jk)
-                  ptab(ji,jj,jk,2) = e3u_n(ji,jj,jk)
+                  ptab(ji,jj,jk,1) = e2u(ji,jj) * un(ji,jj,jk) * e3u_n(ji,jj,jk)/zrhoy
+                  ptab(ji,jj,jk,2) = e2u(ji,jj) * e3u_n(ji,jj,jk)/zrhoy
                END DO
             END DO
@@ -961 +961 @@
          
          ptab_child(:,:,:) = 0.
-         do jj=j1,j2
-         do ji=i1,i2
-         iref = ji
-         IF (western_side) iref = 2
-         IF (eastern_side) iref = nlci-2
-
-         N_in = 0
-         do jk=k1,k2
-           if (interp_scales_u(ji,jj,jk) == 0) EXIT
-             N_in = N_in + 1
-             tabin(jk) = ptab(ji,jj,jk,1)/ptab(ji,jj,jk,2)
-             h_in(N_in) = ptab(ji,jj,jk,2)
-         enddo
+         DO jj=j1,j2
+            DO ji=i1,i2
+               iref = ji
+               IF (western_side) iref = 2
+               IF (eastern_side) iref = nlci-2
+
+               N_in = 0
+               DO jk=k1,k2
+                  IF (ptab(ji,jj,jk,2) == 0) EXIT
+                  N_in = N_in + 1
+                  tabin(jk) = ptab(ji,jj,jk,1)/ptab(ji,jj,jk,2)
+                  h_in(N_in) = ptab(ji,jj,jk,2)/e2u(ji,jj)
+              ENDDO
          
-         IF (N_in == 0) THEN
-           ptab_child(ji,jj,:) = 0.
-           CYCLE
-         ENDIF
+              IF (N_in == 0) THEN
+                 ptab_child(ji,jj,:) = 0.
+                 CYCLE
+              ENDIF
          
-         N_out = 0
-         do jk=1,jpk
-           if (umask(iref,jj,jk) == 0) EXIT
-           N_out = N_out + 1
-           h_out(N_out) = e3u_n(ji,jj,jk)
-         enddo
+              N_out = 0
+              DO jk=1,jpk
+                 if (umask(iref,jj,jk) == 0) EXIT
+                 N_out = N_out + 1
+                 h_out(N_out) = e3u_n(ji,jj,jk)
+              ENDDO
          
-         IF (N_out == 0) THEN
-           ptab_child(ji,jj,:) = 0.
-           CYCLE
-         ENDIF
+              IF (N_out == 0) THEN
+                 ptab_child(ji,jj,:) = 0.
+                 CYCLE
+              ENDIF
          
-         h_diff = sum(h_out(1:N_out))-sum(h_in(1:N_in))
-         IF (h_diff > 0.) THEN
-           N_in = N_in + 1
-           h_in(N_in) = h_diff
-           tabin(N_in) = 0.
-         ELSE
-           h_out(N_out) = h_out(N_out) - h_diff
-         ENDIF
+              h_diff = sum(h_out(1:N_out))-sum(h_in(1:N_in))
+              IF (abs(h_diff) > 0.) THEN
+                 CALL ctl_stop
+              ENDIF
+              call reconstructandremap(tabin(1:N_in),h_in(1:N_in),ptab_child(ji,jj,1:N_out),h_out(1:N_out),N_in,N_out)
          
-         call reconstructandremap(tabin(1:N_in),h_in(1:N_in),ptab_child(ji,jj,1:N_out),h_out(1:N_out),N_in,N_out)
-         
-         ptab_child(ji,jj,N_out) = ptab_child(ji,jj,N_out) * h_out(N_out) / e3u_n(ji,jj,N_out)
-
+            ENDDO
          ENDDO
-         ENDDO
 
 ! in the following
-! remove division of ua by fs e3u (already done)
+! remove division of ua by fs e3u (already done) and also zrhoy and e2u
 ! VERTICAL REFINEMENT END
 
-         zrhoy = Agrif_Rhoy()
          DO jk = 1, jpkm1
             DO jj=j1,j2
-               ua(i1:i2,jj,jk) = (ptab_child(i1:i2,jj,jk)/(zrhoy*e2u(i1:i2,jj)))
+               ua(i1:i2,jj,jk) = ptab_child(i1:i2,jj,jk)
+!/(zrhoy*e2u(i1:i2,jj)))
+            write(numout,*) 'ua=',ua(i1:i2,jj,jk)
             END DO
          END DO