Changeset 14623 for utils/tools/DOMAINcfg/src/agrif_connect.F90

Timestamp:

2021-03-21T19:40:22+01:00 (3 years ago)

Author:

ldebreu

Message:

AGFdomcfg: 1) Update DOMAINcfg to be compliant with the removal of halo cells 2) Update most of the LBC ... subroutines to a recent NEMO 4 version #2638

File:

• utils/tools/DOMAINcfg/src/agrif_connect.F90 (modified) (3 diffs)

utils/tools/DOMAINcfg/src/agrif_connect.F90

@@ -74 +74 @@
          ELSEWHERE
            ssmask(i1:i2,j1:j2) = 1.
-         END WHERE           
+         END WHERE  
       ENDIF
       !
@@ -146 +146 @@
                   IF( e3t_interp(ji,jj,jk) == -10 ) THEN ! the connection has not yet been done
                      e3t_interp(ji,jj,jk) = MAX( ptab(ji,jj,jk),MIN(e3zps_min, e3t_1d(jk)*e3zps_rat) )
-                     e3t_interp(ji,jj,jk) = MIN( e3t_interp(ji,jj,jk),e3t_1d(jk) )
+                  !   e3t_interp(ji,jj,jk) = MIN( e3t_interp(ji,jj,jk),e3t_1d(jk) )
                      e3t_0(ji,jj,jk) = ( 1. - ztabramp(ji,jj) )*e3t_0(ji,jj,jk) + ztabramp(ji,jj)*e3t_interp(ji,jj,jk)
                   ENDIF
@@ -180 +180 @@
       ! --- West --- !
       IF( ((nbondi == -1) .OR. (nbondi == 2) ).AND. .NOT. (jperio == 1 .OR. jperio == 4 .OR. jperio == 6)) THEN
-         ind1 = 1+nbghostcells + istart
+         ind1 = nn_hls + 1 + nbghostcells + istart
          ind2 = ind1 + ispongearea 
-         DO jj = 1, jpj
-            DO ji = ind1, ind2                
-               ztabramp(ji,jj) = REAL( ind2 - ji ) * z1_spongearea * umask(ind1,jj,1)
-            END DO
-         ENDDO
+         DO ji = mi0(ind1), mi1(ind2)   
+            DO jj = 1, jpj               
+               ztabramp(ji,jj) = REAL(ind2 - mig(ji), wp) * z1_spongearea * umask(ind1,jj,1)
+            END DO
+         ENDDO
+            ! ghost cells:
+            ind1 = 1
+            ind2 = nn_hls + 1 + nbghostcells + istart  ! halo + land + nbghostcells
+            DO ji = mi0(ind1), mi1(ind2)   
+               DO jj = 1, jpj               
+                  ztabramp(ji,jj) = 1._wp
+               END DO
+            END DO
       ENDIF
 
       ! --- East --- !
       IF( ((nbondi == 1) .OR. (nbondi == 2) ).AND. .NOT. (jperio == 1 .OR. jperio == 4 .OR. jperio == 6)) THEN
-         ind2 = nlci - nbghostcells - istart
+         ind2 = jpiglo -  (nn_hls + nbghostcells ) - istart
          ind1 = ind2 -ispongearea       
-         DO jj = 1, jpj
-            DO ji = ind1, ind2
-               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( ji - ind1 ) * z1_spongearea * umask(ind2-1,jj,1) )
+         DO ji = mi0(ind1), mi1(ind2)
+            DO jj = 1, jpj
+               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( mig(ji) - ind1 ) * z1_spongearea * umask(ind2-1,jj,1) )
             ENDDO
          ENDDO
+            ! ghost cells:
+            ind1 = jpiglo -  (nn_hls + nbghostcells ) - istart   ! halo + land + nbghostcells - 1
+            ind2 = jpiglo - 1
+            DO ji = mi0(ind1), mi1(ind2)
+               DO jj = 1, jpj
+                  ztabramp(ji,jj) = 1._wp
+               END DO
+            END DO
       ENDIF
 
       ! --- South --- !
       IF(( (nbondj == -1) .OR. (nbondj == 2) ).AND.(lk_south)) THEN
-         ind1 = 1+nbghostcells + istart
+         ind1 = nn_hls + 1 + nbghostcells + istart
          ind2 = ind1 + ispongearea 
-         DO jj = ind1, ind2 
+         DO jj = mj0(ind1), mj1(ind2) 
             DO ji = 1, jpi
-               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( ind2 - jj ) * z1_spongearea * vmask(ji,ind1,1) )
-            END DO
-         ENDDO
+               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( ind2 - mjg(jj) ) * z1_spongearea * vmask(ji,ind1,1) )
+            END DO
+         ENDDO
+            ! ghost cells:
+            ind1 = 1
+            ind2 = nn_hls + 1 + nbghostcells + istart                 ! halo + land + nbghostcells
+            DO jj = mj0(ind1), mj1(ind2) 
+               DO ji = 1, jpi
+                  ztabramp(ji,jj) = 1._wp
+               END DO
+            END DO
       ENDIF
 
       ! --- North --- !
       IF( (nbondj == 1) .OR. (nbondj == 2) ) THEN
-         ind2 = nlcj - nbghostcells - istart
-         ind1 = ind2 -ispongearea         
-         DO jj = ind1, ind2
+         ind2 = jpjglo - (nn_hls + nbghostcells) - istart
+         ind1 = ind2 -ispongearea
+         DO jj = mj0(ind1), mj1(ind2)
             DO ji = 1, jpi
-               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( jj - ind1 ) * z1_spongearea * vmask(ji,ind2-1,1) )
-            END DO
-         ENDDO
+               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( mjg(jj) - ind1 ) * z1_spongearea * vmask(ji,ind2-1,1) )
+            END DO
+         ENDDO
+            ! ghost cells:
+            ind1 = jpjglo - (nn_hls + nbghostcells) - istart      ! halo + land + nbghostcells - 1
+            ind2 = jpjglo
+            DO jj = mj0(ind1), mj1(ind2)
+               DO ji = 1, jpi
+                  ztabramp(ji,jj) = 1._wp
+               END DO
+            END DO
       ENDIF
       !