Changeset 14931 for utils/tools/DOMAINcfg/src/domisf.F90

Timestamp:

2021-05-31T16:36:45+02:00 (3 years ago)

Author:

jchanut

Message:

#2638: restores Pierre's changes done in #2588 at r14199

File:

• utils/tools/DOMAINcfg/src/domisf.F90 (modified) (4 diffs)

utils/tools/DOMAINcfg/src/domisf.F90

@@ -295 +295 @@
          zrisfdep = risfdep
          WHERE ( mbathy(:,:) == 0 )
-            imask(:,:) = 0
+            imask(:,:) = jpk 
             imbathy(:,:) = jpk
          END WHERE
@@ -302 +302 @@
                IF(  (misfdep(ji,jj) > 1) .AND. (mbathy(ji,jj) > 0) ) THEN
                   !
-                  ! what it should be
+                  ! what it should be (1 = should be connected; >= jpk = should not be connected)
                   imskip1 = imask(ji,jj) * imask(ji+1,jj  )  ! 1 = should be connected
                   imskim1 = imask(ji,jj) * imask(ji-1,jj  )  ! 1 = should be connected
@@ -308 +308 @@
                   imskjm1 = imask(ji,jj) * imask(ji  ,jj-1)  ! 1 = should be connected
                   !
-                  ! what it is
+                  ! what it is ? ( 1 = no effective connection; jpk = effective connection )
                   imskip1_r=jpk ; imskim1_r=jpk; imskjp1_r=jpk; imskjm1_r=jpk
                   IF (misfdep(ji,jj) > imbathy(ji+1,jj  )) imskip1_r=1.0 ! 1 = no effective connection
@@ -317 +317 @@
                   ! defining level needed for connectivity
                   ! imskip1 * imskip1_r == 1 means connections need to be enforce
+                  ! imskip1 * imskip1_r >= jpk means no connection need to be enforce          
                   jk=MIN(imbathy(ji+1,jj  ) * imskip1_r * imskip1, &
                      &   imbathy(ji-1,jj  ) * imskim1_r * imskim1, &
                      &   imbathy(ji  ,jj+1) * imskjp1_r * imskjp1, &
                      &   imbathy(ji  ,jj-1) * imskjm1_r * imskjm1, &
-                     &   jpk+1 ) ! add jpk in the MIN to avoid out of boundary later on
+                     &   jpk ) ! add jpk in the MIN to avoid out of boundary later on
                   !
                   ! if connectivity is OK or no connection needed (grounding line) or grounded, zmisfdep=misfdep