Changeset 9031 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90

Timestamp:

2017-12-14T11:10:02+01:00 (6 years ago)

Author:

timgraham

Message:

Resolved AGRIF conflicts

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90

@@ -44 +44 @@
       !
 #if defined SPONGE_TOP
-      zcoef = REAL( Agrif_NbStepint(), wp ) / Agrif_rhot()
+!! Assume persistence 
+      timecoeff = REAL(Agrif_rhot()-1,wp)/REAL(Agrif_rhot())
       CALL Agrif_sponge
       Agrif_SpecialValue    = 0._wp
@@ -68 +69 @@
       REAL(wp), DIMENSION(i1:i2,j1:j2)             ::   ztu, ztv
       REAL(wp), DIMENSION(i1:i2,j1:j2,k1:k2,n1:n2) ::   trbdiff
+      ! vertical interpolation:
+      REAL(wp), DIMENSION(i1:i2,j1:j2,jpk,n1:n2) ::tabres_child
+      REAL(wp), DIMENSION(k1:k2,n1:n2-1) :: tabin
+      REAL(wp), DIMENSION(k1:k2) :: h_in
+      REAL(wp), DIMENSION(1:jpk) :: h_out
+      INTEGER :: N_in, N_out
+      REAL(wp) :: h_diff
       !!----------------------------------------------------------------------
       !
       IF( before ) THEN
-         tabres(i1:i2,j1:j2,k1:k2,n1:n2) = trn(i1:i2,j1:j2,k1:k2,n1:n2)
+         DO jn = 1, jptra
+            DO jk=k1,k2
+               DO jj=j1,j2
+                  DO ji=i1,i2
+                     tabres(ji,jj,jk,jn) = trb(ji,jj,jk,jn)
+                  END DO
+               END DO
+            END DO
+         END DO
+
+# if defined key_vertical
+         DO jk=k1,k2
+            DO jj=j1,j2
+               DO ji=i1,i2
+                  tabres(ji,jj,jk,jpts+1) = tmask(ji,jj,jk) * e3t_n(ji,jj,jk) 
+               END DO
+            END DO
+         END DO
+# endif
       ELSE      
-!!gm line below use of :,:  versus i1:i2,j1:j2  ....   strange, not wrong.    ===>> to be corrected
-         trbdiff(:,:,:,:) = trb(i1:i2,j1:j2,:,:) - tabres(:,:,:,:)      
+# if defined key_vertical
+         tabres_child(:,:,:,:) = 0.
+         DO jj=j1,j2
+            DO ji=i1,i2
+               N_in = 0
+               DO jk=k1,k2 !k2 = jpk of parent grid
+                  IF (tabres(ji,jj,jk,n2) == 0) EXIT
+                  N_in = N_in + 1
+                  tabin(jk,:) = tabres(ji,jj,jk,n1:n2-1)
+                  h_in(N_in) = tabres(ji,jj,jk,n2)
+               END DO
+               N_out = 0
+               DO jk=1,jpk ! jpk of child grid
+                  IF (tmask(ji,jj,jk) == 0) EXIT 
+                  N_out = N_out + 1
+                  h_out(jk) = e3t_n(ji,jj,jk) !Child grid scale factors. Could multiply by e1e2t here instead of division above
+               ENDDO
+               IF (N_in > 0) THEN
+                  h_diff = sum(h_out(1:N_out))-sum(h_in(1:N_in))
+                  tabres(ji,jj,k2,:) = tabres(ji,jj,k2-1,:) !what is this line for?????
+                  DO jn=1,jptra
+                     call reconstructandremap(tabin(1:N_in,jn),h_in,tabres_child(ji,jj,1:N_out,jn),h_out,N_in,N_out)
+                  ENDDO
+               ENDIF
+            ENDDO
+         ENDDO
+# endif
+
+         DO jj=j1,j2
+            DO ji=i1,i2
+               DO jk=1,jpkm1
+# if defined key_vertical
+                  trbdiff(ji,jj,jk,1:jptra) = trb(ji,jj,jk,1:jptra) - tabres_child(ji,jj,jk,1:jptra)
+# else
+                  trbdiff(ji,jj,jk,1:jptra) = trb(ji,jj,jk,1:jptra) - tabres(ji,jj,jk,1:jptra)
+# endif
+               ENDDO
+            ENDDO
+         ENDDO
+
          DO jn = 1, jptra
             DO jk = 1, jpkm1