Changeset 13024 for utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/dommsk.F90

Timestamp:

2020-06-03T16:26:23+02:00 (4 years ago)

Author:

rblod

Message:

First version of new nesting tools merged with domaincfg, see ticket #2129

File:

• utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/dommsk.F90 (modified) (8 diffs)

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/dommsk.F90

@@ -26 +26 @@
    USE domisf         ! domain: ice shelf
    USE domwri         ! domain: write the meshmask file
+   USE usrdef_fmask   ! user defined fmask
    USE bdy_oce        ! open boundary
    !
@@ -52 +53 @@
 CONTAINS
 
-   SUBROUTINE dom_msk
+   SUBROUTINE dom_msk( k_top, k_bot )
       !!---------------------------------------------------------------------
       !!                 ***  ROUTINE dom_msk  ***
@@ -62 +63 @@
       !!      and ko_bot, the indices of the fist and last ocean t-levels which 
       !!      are either defined in usrdef_zgr or read in zgr_read.
-      !!                The velocity masks (umask, vmask) 
+      !!                The velocity masks (umask, vmask, wmask, wumask, wvmask) 
       !!      are deduced from a product of the two neighboring tmask.
       !!                The vorticity mask (fmask) is deduced from tmask taking
@@ -77 +78 @@
       !!                due to cyclic or North Fold boundaries as well as MPP halos.
       !!
-      !! ** Action :   tmask, umask, vmask, wmask : land/ocean mask 
+      !! ** Action :   tmask, umask, vmask, wmask, wumask, wvmask : land/ocean mask 
       !!                         at t-, u-, v- w, wu-, and wv-points (=0. or 1.)
       !!               fmask   : land/ocean mask at f-point (=0., or =1., or 
@@ -85 +86 @@
       !!               ssmask , ssumask, ssvmask, ssfmask : 2D ocean mask
       !!----------------------------------------------------------------------
+
+      INTEGER, DIMENSION(:,:), INTENT(in) ::   k_top, k_bot   ! first and last ocean level
       !
       INTEGER  ::   ji, jj, jk     ! dummy loop indices
@@ -133 +136 @@
      ! N.B. tmask has already the right boundary conditions since mbathy is ok
      !
+!      tmask(:,:,:) = 0._wp
+!      DO jk = 1, jpk
+!         DO jj = 1, jpj
+!            DO ji = 1, jpi
+!               IF(      ( REAL( mbathy (ji,jj) - jk, wp ) + 0.1_wp >= 0._wp )         &
+!               &  .AND. ( REAL( misfdep(ji,jj) - jk, wp ) - 0.1_wp <= 0._wp ) ) THEN
+!                  tmask(ji,jj,jk) = 1._wp
+!               END IF  
+!            END DO
+!         END DO
+!      END DO    
+ 
+!      IF ( ln_isfsubgl ) CALL zgr_isf_subgl
+
+      !  Ocean/land mask at t-point  (computed from ko_top and ko_bot)
+      ! ----------------------------
+      !
       tmask(:,:,:) = 0._wp
-      DO jk = 1, jpk
+      IF( ln_read_cfg) THEN
          DO jj = 1, jpj
             DO ji = 1, jpi
-               IF(      ( REAL( mbathy (ji,jj) - jk, wp ) + 0.1_wp >= 0._wp )         &
-               &  .AND. ( REAL( misfdep(ji,jj) - jk, wp ) - 0.1_wp <= 0._wp ) ) THEN
-                  tmask(ji,jj,jk) = 1._wp
-               END IF  
+               iktop = k_top(ji,jj)
+               ikbot = k_bot(ji,jj)
+               IF( iktop /= 0 ) THEN       ! water in the column
+                  tmask(ji,jj,iktop:ikbot  ) = 1._wp
+               ENDIF
+            END DO  
+         END DO  
+         ELSE
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  IF(      ( REAL( mbathy (ji,jj) - jk, wp ) + 0.1_wp >= 0._wp )         &
+                  &  .AND. ( REAL( misfdep(ji,jj) - jk, wp ) - 0.1_wp <= 0._wp ) ) THEN
+                     tmask(ji,jj,jk) = 1._wp
+                  END IF
+               END DO
             END DO
          END DO
-      END DO    
- 
-      IF ( ln_isfsubgl ) CALL zgr_isf_subgl
+         IF ( ln_isfsubgl ) CALL zgr_isf_subgl
+      ENDIF
+
 
 !SF  add here lbc_lnk: bug not still understood : cause now domain configuration is read !
@@ -272 +304 @@
 #if defined key_agrif 
             IF( .NOT. AGRIF_Root() ) THEN 
-               IF ((nbondi ==  1).OR.(nbondi == 2)) fmask(nlci-1 , :     ,jk) = 0.e0      ! east 
-               IF ((nbondi == -1).OR.(nbondi == 2)) fmask(1      , :     ,jk) = 0.e0      ! west 
-               IF ((nbondj ==  1).OR.(nbondj == 2)) fmask(:      ,nlcj-1 ,jk) = 0.e0      ! north 
-               IF ((nbondj == -1).OR.(nbondj == 2)) fmask(:      ,1      ,jk) = 0.e0      ! south 
+               IF(lk_east)  fmask(nlci-1 , :     ,jk) = 0.e0      ! east 
+               IF(lk_west)  fmask(1      , :     ,jk) = 0.e0      ! west 
+               IF(lk_north) fmask(:      ,nlcj-1 ,jk) = 0.e0      ! north 
+               IF(lk_south) fmask(:      ,1      ,jk) = 0.e0      ! south 
             ENDIF 
 #endif 
@@ -287 +319 @@
          !
       ENDIF
-      !
-      ! write out mesh mask
-      IF ( nn_msh > 0 ) CALL dom_wri
+      
+      ! User defined alteration of fmask (use to reduce ocean transport in specified straits)
+      ! -------------------------------- 
+      !
+
+      CALL usr_def_fmask( cn_cfg, nn_cfg, fmask )
       !
    END SUBROUTINE dom_msk