Changeset 9806 for NEMO/trunk/src/NST/agrif_oce_sponge.F90

Timestamp:

2018-06-15T17:57:53+02:00 (6 years ago)

Author:

jchanut

Message:

Differentiates x and y refinement in tracer bc ; correct sponge #2102 ; Passes x and y symmetry tests

File:

• NEMO/trunk/src/NST/agrif_oce_sponge.F90 (modified) (8 diffs)

NEMO/trunk/src/NST/agrif_oce_sponge.F90

@@ -103 +103 @@
          ! Store it in ztabramp
 
-         ispongearea  = 2 + nn_sponge_len * Agrif_irhox()
-         z1_spongearea = 1._wp / REAL( ispongearea - 1 )
+         ispongearea  = 1 + nn_sponge_len * Agrif_irhox()
+         z1_spongearea = 1._wp / REAL( ispongearea )
          
          ztabramp(:,:) = 0._wp
@@ -111 +111 @@
          IF( (nbondi == -1) .OR. (nbondi == 2) ) THEN
             ind1 = 1+nbghostcells
-            ind2 = 1+nbghostcells + (ispongearea-1)
+            ind2 = 1+nbghostcells + ispongearea 
             DO jj = 1, jpj
-               DO ji = ind1, ind2                  
+               DO ji = ind1, ind2                
                   ztabramp(ji,jj) = REAL( ind2 - ji ) * z1_spongearea * umask(ind1,jj,1)
                END DO
@@ -121 +121 @@
          ! --- East --- !
          IF( (nbondi == 1) .OR. (nbondi == 2) ) THEN
-            ind1 = nlci - (1+nbghostcells) - (ispongearea-1)
-            ind2 = nlci - (1+nbghostcells)
+            ind1 = nlci - nbghostcells - ispongearea
+            ind2 = nlci - nbghostcells
             DO jj = 1, jpj
                DO ji = ind1, ind2
@@ -133 +133 @@
          IF( (nbondj == -1) .OR. (nbondj == 2) ) THEN
             ind1 = 1+nbghostcells
-            ind2 = 1+nbghostcells + (ispongearea-1)
-            DO jj = ind1, ind2
+            ind2 = 1+nbghostcells + ispongearea
+            DO jj = ind1, ind2 
                DO ji = 1, jpi
                   ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( ind2 - jj ) * z1_spongearea * vmask(ji,ind1,1) )
@@ -143 +143 @@
          ! --- North --- !
          IF( (nbondj == 1) .OR. (nbondj == 2) ) THEN
-            ind1 = nlcj - (1+nbghostcells) - (ispongearea-1)
-            ind2 = nlcj - (1+nbghostcells)
+            ind1 = nlcj - nbghostcells - ispongearea
+            ind2 = nlcj - nbghostcells
             DO jj = ind1, ind2
                DO ji = 1, jpi
@@ -177 +177 @@
             DO ji = 2, jpim1   ! vector opt.
                fsahm_spt(ji,jj) = visc_dyn * ztabramp(ji,jj)
-               fsahm_spf(ji,jj) = 0.25_wp * visc_dyn * ( ztabramp(ji,jj) + ztabramp(ji  ,jj+1) &
-                                                     &  +ztabramp(ji,jj) + ztabramp(ji+1,jj  ) )
+               fsahm_spf(ji,jj) = 0.25_wp * visc_dyn * ( ztabramp(ji  ,jj  ) + ztabramp(ji  ,jj+1) &
+                                                     &  +ztabramp(ji+1,jj+1) + ztabramp(ji+1,jj  ) )
             END DO
          END DO
@@ -278 +278 @@
          DO jn = 1, jpts            
             DO jk = 1, jpkm1
-               DO jj = j1,j2-1
+               ztu(i1:i2,j1:j2,jk) = 0._wp
+               DO jj = j1,j2
                   DO ji = i1,i2-1
                      zabe1 = fsaht_spu(ji,jj) * umask(ji,jj,jk) * e2_e1u(ji,jj) * e3u_n(ji,jj,jk)
+                     ztu(ji,jj,jk) = zabe1 * ( tsbdiff(ji+1,jj  ,jk,jn) - tsbdiff(ji,jj,jk,jn) ) 
+                  END DO
+               END DO
+               ztv(i1:i2,j1:j2,jk) = 0._wp
+               DO ji = i1,i2
+                  DO jj = j1,j2-1
                      zabe2 = fsaht_spv(ji,jj) * vmask(ji,jj,jk) * e1_e2v(ji,jj) * e3v_n(ji,jj,jk)
-                     ztu(ji,jj,jk) = zabe1 * ( tsbdiff(ji+1,jj  ,jk,jn) - tsbdiff(ji,jj,jk,jn) ) 
                      ztv(ji,jj,jk) = zabe2 * ( tsbdiff(ji  ,jj+1,jk,jn) - tsbdiff(ji,jj,jk,jn) )
                   END DO
@@ -288 +294 @@
                !
                IF( ln_zps ) THEN      ! set gradient at partial step level
-                  DO jj = j1,j2-1
-                     DO ji = i1,i2-1
+                  DO jj = j1,j2
+                     DO ji = i1,i2
                         ! last level
                         iku = mbku(ji,jj)