domain_cfg: various issues

[mathiot]

Context

• out of bound in some configuration with isf (domisf.F90)
• dom_clo needs to be reactivated (domain.F90, see also #2503)
• dom_wri needs to be reactivated (dommsk.F90, see also #2503)
• restore proper computation of distance in domngb.F90 (see also #2503)
• glob_* function use tmask_i. However some call it before tmask_i is initialised. As these calls are only used for sanity check and print, I suggest to remove tmask_i from the function. (lib_fortran_generic.h90)
• initialised ln_read_cfg to False as it is used before the namelist bloc is read.

Analysis

...

Fix

domain.F90

@@ -76 +76 @@
       !                       !==  Reference coordinate system  ==!
       !
       CALL dom_nam               ! read namelist ( namrun, namdom )
-                  !   CALL dom_clo               ! Closed seas and lake
          
       CALL dom_hgr               ! Horizontal mesh
       CALL dom_zgr( ik_top, ik_bot )  ! Vertical mesh and bathymetry
       CALL dom_msk( ik_top, ik_bot )  ! Masks
+      IF ( ln_domclo ) CALL dom_clo               ! Closed seas and lake
       !
-      !
       CALL dom_ctl                  ! print extrema of masked scale factors
       ! 
 #if ! defined key_agrif

domisf.F90

@@ -294 +294 @@
          imisfdep = misfdep
          zrisfdep = risfdep
          WHERE ( mbathy(:,:) == 0 )
-            imask(:,:) = 0
+            imask(:,:) = jpk
             imbathy(:,:) = jpk
          END WHERE
          DO jj = 2, jpjm1
@@ -301 +301 @@
             DO ji = 2, jpim1
                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
                   imskjp1 = imask(ji,jj) * imask(ji  ,jj+1)  ! 1 = should be connected
                   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
                   IF (misfdep(ji,jj) > imbathy(ji-1,jj  )) imskim1_r=1.0 ! 1 = no effective connection
@@ -315 +315 @@
                   IF (misfdep(ji,jj) > imbathy(ji  ,jj-1)) imskjm1_r=1.0 ! 1 = no effective connection
                   !
                   ! defining level needed for connectivity
-                  ! imskip1 * imskip1_r == 1 means connections need to be enforce
+                  ! imskip1 * imskip1_r == 1   means    connection 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
                   imisfdep(ji,jj)=MIN(misfdep(ji,jj),jk-1)
@@ -328 +329 @@
                   ! update isf draft if needed (need to be done here because next test is in meter and level)
                   IF ( imisfdep(ji,jj) < misfdep(ji,jj) ) THEN
                      jk = imisfdep(ji,jj)
+                     PRINT *, jk, ji, jj, misfdep(ji,jj),  narea
                      zrisfdep(ji,jj)  = gdepw_1d(jk+1) - MIN( e3zps_min, e3t_1d(jk)*e3zps_rat )
                   END IF
    

dommsk.F90

@@ -155 +155 @@
                ENDIF
             END DO  
          END DO  
-         ELSE
+      ELSE
          DO jk = 1, jpk
             DO jj = 1, jpj
                DO ji = 1, jpi
@@ -293 +293 @@
       ! User defined alteration of fmask (use to reduce ocean transport in specified straits)
       ! -------------------------------- 
       !
-
+      ! write mesh mask
+      IF ( nn_msh > 0 ) CALL dom_wri
+      !
       CALL usr_def_fmask( cp_cfg, jp_cfg, fmask )
       !
    END SUBROUTINE dom_msk

domngb.F90

@@ -45 +45 @@
       !
       INTEGER :: ik         ! working level
       INTEGER , DIMENSION(2) ::   iloc
-      REAL(wp)               ::   zlon, zmini
       REAL(wp), DIMENSION(jpi,jpj) ::   zglam, zgphi, zmask, zdist
       !!--------------------------------------------------------------------
       !
@@ -59 +58 @@
       CASE DEFAULT ; zglam(:,:) = glamt(:,:) ; zgphi(:,:) = gphit(:,:) ; zmask(nldi:nlei,nldj:nlej) = tmask(nldi:nlei,nldj:nlej,ik)
       END SELECT
 
-      zlon       = MOD( plon       + 720., 360. )                                     ! plon between    0 and 360
-      zglam(:,:) = MOD( zglam(:,:) + 720., 360. )                                     ! glam between    0 and 360
-      IF( zlon > 270. )   zlon = zlon - 360.                                          ! zlon between  -90 and 270
-      IF( zlon <  90. )   WHERE( zglam(:,:) > 180. ) zglam(:,:) = zglam(:,:) - 360.   ! glam between -180 and 180
-      zglam(:,:) = zglam(:,:) - zlon
+      zdist = dist(plon, plat, zglam, zgphi)
 
       IF( lk_mpp ) THEN  
          CALL mpp_minloc( 'domngb', zdist(:,:), zmask, rdist, iloc)

domwri.F90

@@ -214 +214 @@
       CALL lbc_lnk( 'domwri', puniq, cdgrd, 1. )            ! apply boundary conditions
       lldbl(:,:,1) = puniq(:,:) == ztstref(:,:)   ! check which values have been changed 
       !
-      puniq(:,:) = 1.                             ! default definition
-      ! fill only the inner part of the cpu with llbl converted into real 
-      puniq(nldi:nlei,nldj:nlej) = REAL( COUNT( lldbl(nldi:nlei,nldj:nlej,:), dim = 3 ) , wp )
+      puniq(:,:) = REAL( COUNT( lldbl(:,:,:), dim = 3 ) , wp )
       !
    END SUBROUTINE dom_uniq
 

lib_fortran_generic.h90

@@ -116 +116 @@
       !
       ipk = K_SIZE(ptab)   ! 3rd dimension
       !
-      ztmp = ARRAY_OPERATION( ARRAY_IN(:,:,1)*tmask_i(:,:) )
+      ztmp = ARRAY_OPERATION( ARRAY_IN(:,:,1))
       DO jk = 2, ipk
-         ztmp = SCALAR_OPERATION(ztmp, ARRAY_OPERATION( ARRAY_IN(:,:,jk)*tmask_i(:,:) ))
+         ztmp = SCALAR_OPERATION(ztmp, ARRAY_OPERATION( ARRAY_IN(:,:,jk)))
       ENDDO
 
       CALL MPP_OPERATION( cdname, ztmp)

par_oce.f90

@@ -27 +27 @@
    !!----------------------------------------------------------------------
    !!                   namcfg namelist parameters
    !!----------------------------------------------------------------------
-   LOGICAL       ::   ln_read_cfg      !: (=T) read the domain configuration file or (=F) not
+   LOGICAL       ::   ln_read_cfg = .FALSE.      !: (=T) read the domain configuration file or (=F) not
    CHARACTER(lc) ::      cn_domcfg        !: filename the configuration file to be read
    LOGICAL       ::   ln_write_cfg     !: (=T) create the domain configuration file
    CHARACTER(lc) ::      cn_domcfg_out    !: filename the configuration file to be read

[clem]

Good points. It looks to me that it concerns both 4.0-HEAD and the trunk

[mathiot]

In 14199:

Error: Failed to load processor CommitTicketReference

No macro or processor named 'CommitTicketReference' found

[mathiot]

ticket re-open: see #2643

[jchanut]

In 14931:

Error: Failed to load processor CommitTicketReference

No macro or processor named 'CommitTicketReference' found