Changeset 14931

Timestamp:

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

Author:

jchanut

Message:

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

Location:

utils/tools/DOMAINcfg/src

Files:

• domain.F90 (modified) (1 diff)
• domisf.F90 (modified) (4 diffs)
• dommsk.F90 (modified) (2 diffs)
• domngb.F90 (modified) (2 diffs)
• domwri.F90 (modified) (1 diff)
• lib_fortran_generic.h90 (modified) (1 diff)
• par_oce.f90 (modified) (1 diff)

utils/tools/DOMAINcfg/src/domain.F90

@@ -78 +78 @@
       CALL dom_glo                     ! global domain versus local domain
       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

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

utils/tools/DOMAINcfg/src/dommsk.F90

@@ -156 +156 @@
             END DO  
          END DO  
-         ELSE
+      ELSE
          DO jk = 1, jpk
             DO jj = 1, jpj
@@ -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 )
       !

utils/tools/DOMAINcfg/src/domngb.F90

@@ -46 +46 @@
       INTEGER :: ik         ! working level
       INTEGER , DIMENSION(2) ::   iloc
-      REAL(wp)               ::   zlon, zmini
       REAL(wp), DIMENSION(jpi,jpj) ::   zglam, zgphi, zmask, zdist
       !!--------------------------------------------------------------------
@@ -60 +59 @@
       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  

utils/tools/DOMAINcfg/src/domwri.F90

@@ -215 +215 @@
       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(Nis0:Nie0,Njs0:Nje0) = REAL( COUNT( lldbl(Nis0:Nie0,Njs0:Nje0,:), dim = 3 ) , wp )
+      puniq(:,:) = REAL( COUNT( lldbl(:,:,:), dim = 3 ) , wp ) 
       !
    END SUBROUTINE dom_uniq

utils/tools/DOMAINcfg/src/lib_fortran_generic.h90

@@ -117 +117 @@
       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
 

utils/tools/DOMAINcfg/src/par_oce.f90

@@ -28 +28 @@
    !!                   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