Changeset 13024 for utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_connection.F90

Timestamp:

2020-06-03T16:26:23+02:00 (4 years ago)

Author:

rblod

Message:

First version of new nesting tools merged with domaincfg, see ticket #2129

File:

• utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_connection.F90 (modified) (7 diffs)

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_connection.F90

@@ -7 +7 @@
       !!----------------------------------------------------------------------
       INTEGER  ::   ji, jj, ind1, ind2
-      INTEGER  ::   ispongearea
+      INTEGER  ::   ispongearea, istart
       REAL(wp) ::   z1_spongearea
       !!----------------------------------------------------------------------
@@ -15 +15 @@
 
          ALLOCATE(ztabramp(jpi,jpj))
-         ispongearea  = 1 + npt_connect * Agrif_irhox()
+         ispongearea = 1 + npt_connect * Agrif_irhox()
+         istart = npt_copy * Agrif_irhox()
          z1_spongearea = 1._wp / REAL( ispongearea )
          
@@ -21 +22 @@
 
          ! --- West --- !
-         IF( (nbondi == -1) .OR. (nbondi == 2) ) THEN
-            ind1 = 1+nbghostcells
-            ind2 = 1+nbghostcells + ispongearea 
+         IF( ((nbondi == -1) .OR. (nbondi == 2) ).AND. .NOT. (jperio == 1 .OR. jperio == 4 .OR. jperio == 6)) THEN
+            ind1 = 1+nbghostcells + istart
+            ind2 = ind1 + ispongearea 
             DO jj = 1, jpj
                DO ji = ind1, ind2                
@@ -32 +33 @@
 
          ! --- East --- !
-         IF( (nbondi == 1) .OR. (nbondi == 2) ) THEN
-            ind1 = nlci - nbghostcells - ispongearea
-            ind2 = nlci - nbghostcells
+         IF( ((nbondi == 1) .OR. (nbondi == 2) ).AND. .NOT. (jperio == 1 .OR. jperio == 4 .OR. jperio == 6)) THEN
+            !ind1 = nlci - nbghostcells - ispongearea
+            ind2 = nlci - nbghostcells - istart
+            ind1 = ind2 -ispongearea
+           
+            
             DO jj = 1, jpj
                DO ji = ind1, ind2
@@ -43 +47 @@
 
          ! --- South --- !
-         IF( (nbondj == -1) .OR. (nbondj == 2) ) THEN
-            ind1 = 1+nbghostcells
-            ind2 = 1+nbghostcells + ispongearea
+         IF(( (nbondj == -1) .OR. (nbondj == 2) ).AND.(ln_bry_south)) THEN
+            ! ind1 = 1+nbghostcells
+            ! ind2 = 1+nbghostcells + ispongearea
+            ind1 = 1+nbghostcells + istart
+            ind2 = ind1 + ispongearea 
             DO jj = ind1, ind2 
                DO ji = 1, jpi
@@ -55 +61 @@
          ! --- North --- !
          IF( (nbondj == 1) .OR. (nbondj == 2) ) THEN
-            ind1 = nlcj - nbghostcells - ispongearea
-            ind2 = nlcj - nbghostcells
+            ! ind1 = nlcj - nbghostcells - ispongearea
+            ! ind2 = nlcj - nbghostcells
+            
+            ind2 = nlcj - nbghostcells - istart
+            ind1 = ind2 -ispongearea
+            
             DO jj = ind1, ind2
                DO ji = 1, jpi
@@ -67 +77 @@
    END SUBROUTINE Agrif_connection
    
+   SUBROUTINE Agrif_make_connection
+   use dom_oce
+   use agrif_parameters
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE  Agrif_Sponge ***
+      !!----------------------------------------------------------------------
+      INTEGER  ::   ji, jj, ind1, ind2
+      INTEGER  ::   ispongearea, istart
+      REAL(wp) ::   z1_spongearea
+      !!----------------------------------------------------------------------
+      !
+         ! Define ramp from boundaries towards domain interior at T-points
+         ! Store it in ztabramp
+
+         ispongearea = 1 + npt_connect * Agrif_irhox()
+         istart = npt_copy * Agrif_irhox()
+
+         ! --- West --- !
+         IF( (nbondi == -1) .OR. (nbondi == 2) ) THEN
+            
+            ind1 = 1+nbghostcells + istart
+            ind2 = ind1 + ispongearea
+            DO jk=1,jpk            
+             DO jj = 1, jpj
+               DO ji = ind1, ind2
+                
+                ! print *,'VAL = ',ztabramp(ji,jj)*e3t_interp(ji,jj,jk)+(1.-ztabramp(ji,jj))*e3t_0(ji,jj,jk), &
+                ! e3t_0(ji,jj,jk)
+                  e3t_0(ji,jj,jk) = ztabramp(ji,jj)*e3t_interp(ji,jj,jk)+(1.-ztabramp(ji,jj))*e3t_0(ji,jj,jk)
+               ENDDO
+              ENDDO
+            ENDDO
+         ENDIF
+
+         ! --- East --- !
+         IF( (nbondi == 1) .OR. (nbondi == 2) ) THEN
+            ind2 = nlci - nbghostcells - istart
+            ind1 = ind2 -ispongearea
+            DO jk=1,jpk    
+            DO jj = 1, jpj
+               DO ji = ind1, ind2
+                  e3t_0(ji,jj,jk) = ztabramp(ji,jj)*e3t_interp(ji,jj,jk)+(1.-ztabramp(ji,jj))*e3t_0(ji,jj,jk)
+               ENDDO
+            ENDDO
+            ENDDO
+         ENDIF
+
+         ! --- South --- !
+         IF( (nbondj == -1) .OR. (nbondj == 2) ) THEN
+            ind1 = 1+nbghostcells + istart
+            ind2 = ind1 + ispongearea 
+            DO jk=1,jpk    
+            DO jj = ind1, ind2 
+               DO ji = 1, jpi
+                  e3t_0(ji,jj,jk) = ztabramp(ji,jj)*e3t_interp(ji,jj,jk)+(1.-ztabramp(ji,jj))*e3t_0(ji,jj,jk)
+               END DO
+            ENDDO
+            ENDDO
+         ENDIF
+
+         ! --- North --- !
+         IF( (nbondj == 1) .OR. (nbondj == 2) ) THEN
+            
+            ind2 = nlcj - nbghostcells - istart
+            ind1 = ind2 -ispongearea
+            DO jk=1,jpk               
+            DO jj = ind1, ind2
+               DO ji = 1, jpi
+                  e3t_0(ji,jj,jk) = ztabramp(ji,jj)*e3t_interp(ji,jj,jk)+(1.-ztabramp(ji,jj))*e3t_0(ji,jj,jk)
+               END DO
+            ENDDO
+            ENDDO
+         ENDIF
+      !
+      !
+   END SUBROUTINE Agrif_make_connection
+   
 #else
 subroutine agrif_connection_empty