Changeset 11868 for NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_oce_sponge.F90

Timestamp:

2019-11-06T16:43:51+01:00 (4 years ago)

Author:

jchanut

Message:

#2222, 1) Correct sponge mainly for using AGRIF in 2DV domains, 2) Add check of bathymetry consistency

File:

• NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_oce_sponge.F90 (modified) (15 diffs)

NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_oce_sponge.F90

@@ -60 +60 @@
 #endif
       !
-      CALL iom_put("agrif_spu", fspu(:,:))
-      CALL iom_put("agrif_spv", fspv(:,:))
+      CALL iom_put( 'agrif_spu', fspu(:,:))
+      CALL iom_put( 'agrif_spv', fspv(:,:))
       !
    END SUBROUTINE Agrif_Sponge_Tra
@@ -90 +90 @@
 #endif
       !
-      CALL iom_put("agrif_spt", fspt(:,:))
-      CALL iom_put("agrif_spf", fspf(:,:))
+      CALL iom_put( 'agrif_spt', fspt(:,:))
+      CALL iom_put( 'agrif_spf', fspf(:,:))
       !
    END SUBROUTINE Agrif_Sponge_dyn
@@ -128 +128 @@
          ind1 = 1+nbghostcells
          DO ji = mi0(ind1), mi1(ind1)                
-            ztabramp(ji,:) = umask(ji,:,1)
+            ztabramp(ji,:) = ssumask(ji,:)
          END DO
          !
@@ -138 +138 @@
          ind1 = jpiglo - nbghostcells - 1
          DO ji = mi0(ind1), mi1(ind1)                 
-            ztabramp(ji,:) = umask(ji,:,1)
+            ztabramp(ji,:) = ssumask(ji,:)
          END DO
          !
@@ -148 +148 @@
          ind1 = 1+nbghostcells
          DO jj = mj0(ind1), mj1(ind1)                 
-            ztabramp(:,jj) = vmask(:,jj,1)
+            ztabramp(:,jj) = ssvmask(:,jj)
          END DO
          !
@@ -158 +158 @@
          ind1 = jpjglo - nbghostcells - 1
          DO jj = mj0(ind1), mj1(ind1)                 
-            ztabramp(:,jj) = vmask(:,jj,1)
+            ztabramp(:,jj) = ssvmask(:,jj)
          END DO
          !
@@ -180 +180 @@
          
          ztabramp(:,:) = 0._wp
-         IF ( Agrif_irhox()==1 ) ispongearea =-1
-         IF ( Agrif_irhoy()==1 ) jspongearea =-1
+
+         ! Trick to remove sponge in 2DV domains:
+         IF ( nbcellsx <= 3 ) ispongearea = -1
+         IF ( nbcellsy <= 3 ) jspongearea = -1
 
          ! --- West --- !
@@ -192 +194 @@
          END DO
 
-         ! ghost cells (cosmetic):
+         ! ghost cells:
          ind1 = 1
-         ind2 = nbghostcells
+         ind2 = nbghostcells + 1
          DO ji = mi0(ind1), mi1(ind2)   
             DO jj = 1, jpj               
@@ -210 +212 @@
          END DO
 
-         ! ghost cells (cosmetic):
-         ind1 = jpiglo - nbghostcells + 1
+         ! ghost cells:
+         ind1 = jpiglo - nbghostcells
          ind2 = jpiglo
          DO ji = mi0(ind1), mi1(ind2)
@@ -228 +230 @@
          END DO
 
-         ! ghost cells (cosmetic):
+         ! ghost cells:
          ind1 = 1
-         ind2 = nbghostcells
+         ind2 = nbghostcells + 1
          DO jj = mj0(ind1), mj1(ind2) 
             DO ji = 1, jpi
@@ -246 +248 @@
          END DO
 
-         ! ghost cells (cosmetic):
-         ind1 = jpjglo - nbghostcells + 1
+         ! ghost cells:
+         ind1 = jpjglo - nbghostcells
          ind2 = jpjglo
          DO jj = mj0(ind1), mj1(ind2)
@@ -263 +265 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1   ! vector opt.
-               fspu(ji,jj) = 0.5_wp * ( ztabramp(ji,jj) + ztabramp(ji+1,jj  ) )
-               fspv(ji,jj) = 0.5_wp * ( ztabramp(ji,jj) + ztabramp(ji  ,jj+1) )
+               fspu(ji,jj) = 0.5_wp * ( ztabramp(ji,jj) + ztabramp(ji+1,jj  ) ) * ssumask(ji,jj)
+               fspv(ji,jj) = 0.5_wp * ( ztabramp(ji,jj) + ztabramp(ji  ,jj+1) ) * ssvmask(ji,jj)
             END DO
          END DO
@@ -279 +281 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1   ! vector opt.
-               fspt(ji,jj) = ztabramp(ji,jj)
-               fspf(ji,jj) = 0.25_wp * ( ztabramp(ji  ,jj  ) + ztabramp(ji  ,jj+1) &
-                                     &  +ztabramp(ji+1,jj+1) + ztabramp(ji+1,jj  ) )
+               fspt(ji,jj) = ztabramp(ji,jj) * ssmask(ji,jj)
+               fspf(ji,jj) = 0.25_wp * ( ztabramp(ji  ,jj  ) + ztabramp(ji  ,jj+1)   &
+                                     &  +ztabramp(ji+1,jj+1) + ztabramp(ji+1,jj  ) ) &
+                                     &  * ssvmask(ji,jj) * ssvmask(ji,jj+1)
             END DO
          END DO
@@ -291 +294 @@
 
 #if defined key_vertical
-      ! Trick to vertical remove interpolation in sponge layer in case of 2DV domains:
+      ! Remove vertical interpolation where not needed:
       DO jj = 2, jpjm1
          DO ji = 2, jpim1
@@ -303 +306 @@
             &   (fspf(ji-1,jj)==0._wp).AND.(fspf(ji,jj)==0._wp)) mbkv_parent(ji,jj) = 0
 !
-            IF (mbkt(ji,jj) == 0) mbkt_parent(ji,jj) = 0
-            IF (mbku(ji,jj) == 0) mbku_parent(ji,jj) = 0
-            IF (mbkv(ji,jj) == 0) mbkv_parent(ji,jj) = 0
+            IF ( ssmask(ji,jj) == 0._wp) mbkt_parent(ji,jj) = 0
+            IF (ssumask(ji,jj) == 0._wp) mbku_parent(ji,jj) = 0
+            IF (ssvmask(ji,jj) == 0._wp) mbkv_parent(ji,jj) = 0
          END DO
       END DO