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

Timestamp:

2020-12-14T19:43:17+01:00 (4 years ago)

Author:

jchanut

Message:

#2222, 2129: 1) Corrected ssh initialization from parent in line with what has been introduced by Sibylle 2) Fixed bug in dyn interp with expliciit free surface 3) Added check on number of levels in child grid without vertical remapping (must be < jpk_parent) 4) Removed the constrain on initialization from parent only when starting from climatology (requires Euler first step though).

File:

• NEMO/trunk/src/NST/agrif_oce_sponge.F90 (modified) (1 diff)

NEMO/trunk/src/NST/agrif_oce_sponge.F90

@@ -441 +441 @@
                   N_in = mbkt_parent(ji,jj)
                   ! Input grid (account for partial cells if any):
-                  DO jk=1,N_in
-                     z_in(jk) = tabres(ji,jj,jk,n2) - tabres(ji,jj,k2,n2)
-                     tabin(jk,1:jpts) = tabres(ji,jj,jk,1:jpts)
-                  END DO
+                  IF ( N_in > 0 ) THEN 
+                     DO jk=1,N_in
+                        z_in(jk) = tabres(ji,jj,jk,n2) - tabres(ji,jj,k2,n2)
+                        tabin(jk,1:jpts) = tabres(ji,jj,jk,1:jpts)
+                     END DO
                   
-                  ! Intermediate grid:
-                  DO jk = 1, N_in
-                     h_in_i(jk) = e3t0_parent(ji,jj,jk) * & 
-                       &       (1._wp + tabres(ji,jj,k2,n2)/(ht0_parent(ji,jj)*ssmask(ji,jj) + 1._wp - ssmask(ji,jj)))
-                  END DO
-                  z_in_i(1) = 0.5_wp * h_in_i(1)
-                  DO jk=2,N_in
-                     z_in_i(jk) = z_in_i(jk-1) + 0.5_wp * ( h_in_i(jk) + h_in_i(jk-1) )
-                  END DO
-                  z_in_i(1:N_in) = z_in_i(1:N_in)  - tabres(ji,jj,k2,n2)
-
+                     ! Intermediate grid:
+                     DO jk = 1, N_in
+                        h_in_i(jk) = e3t0_parent(ji,jj,jk) * & 
+                          &       (1._wp + tabres(ji,jj,k2,n2)/(ht0_parent(ji,jj)*ssmask(ji,jj) + 1._wp - ssmask(ji,jj)))
+                     END DO
+                     z_in_i(1) = 0.5_wp * h_in_i(1)
+                     DO jk=2,N_in
+                        z_in_i(jk) = z_in_i(jk-1) + 0.5_wp * ( h_in_i(jk) + h_in_i(jk-1) )
+                     END DO
+                     z_in_i(1:N_in) = z_in_i(1:N_in)  - tabres(ji,jj,k2,n2)
+                  END IF
                   ! Output (Child) grid:
                   N_out = mbkt(ji,jj)