Changeset 15331

Timestamp:

2021-10-05T14:51:14+02:00 (20 months ago)

Author:

jchanut

Message:

#2638, add closed seas filling algorithm (inside AGRIF zooms only)

Location:

utils/tools/DOMAINcfg

Files:

• 1_namelist_ref (modified) (1 diff)
• 2_namelist_ref (modified) (1 diff)
• 3_namelist_ref (modified) (1 diff)
• namelist_ref (modified) (1 diff)
• src/agrif_parameters.F90 (modified) (1 diff)
• src/agrif_user.F90 (modified) (3 diffs)
• src/dombat.F90 (modified) (3 diffs)

utils/tools/DOMAINcfg/1_namelist_ref

@@ -171 +171 @@
 &namagrif      !  AGRIF zoom                                            ("key_agrif")
 !-----------------------------------------------------------------------
+   ln_remove_closedseas = .true. ! Fill lakes inside zoom
    ln_vert_remap = .false. ! volume conserving update 
    npt_connect   = 2

utils/tools/DOMAINcfg/2_namelist_ref

@@ -171 +171 @@
 &namagrif      !  AGRIF zoom                                            ("key_agrif")
 !-----------------------------------------------------------------------
+   ln_remove_closedseas = .true. ! Fill lakes inside zoom
    ln_vert_remap = .false. ! volume conserving update 
    npt_connect   = 2

utils/tools/DOMAINcfg/3_namelist_ref

@@ -171 +171 @@
 &namagrif      !  AGRIF zoom                                            ("key_agrif")
 !-----------------------------------------------------------------------
+   ln_remove_closedseas = .true. ! Fill lakes inside zoom
    ln_vert_remap = .false. ! volume conserving update 
    npt_connect   = 2

utils/tools/DOMAINcfg/namelist_ref

@@ -171 +171 @@
 &namagrif      !  AGRIF zoom                                            ("key_agrif")
 !-----------------------------------------------------------------------
+   ln_remove_closedseas = .true. ! Fill lakes inside zoom
    ln_vert_remap = .false. ! volume conserving update 
    npt_connect   = 2

utils/tools/DOMAINcfg/src/agrif_parameters.F90

@@ -6 +6 @@
 
 #if defined key_agrif
-
-        LOGICAL :: ln_vert_remap ! =T is using volume conserving update
+        LOGICAL :: ln_remove_closedseas=.FALSE.
+        LOGICAL :: ln_vert_remap=.FALSE. ! =T is using volume conserving update
    INTEGER :: npt_copy      ! area (in coarse grid points) with piecewise
                                  ! constant bathymetry inside child zoom: should equal the sponge length

utils/tools/DOMAINcfg/src/agrif_user.F90

@@ -1107 +1107 @@
       INTEGER :: imin, imax, jmin, jmax
 
-      NAMELIST/namagrif/ ln_vert_remap, npt_connect, npt_copy 
+      NAMELIST/namagrif/ ln_vert_remap, ln_remove_closedseas, npt_connect, npt_copy 
 
   !    REWIND( numnam_ref )              ! Namelist namagrif in reference namelist : nesting parameters
@@ -1126 +1126 @@
             WRITE(numout,*) '   Namelist namagrif : set nesting parameters'
             WRITE(numout,*) '      ln_vert_remap        = ', ln_vert_remap 
+            WRITE(numout,*) '      ln_remove_closedseas = ', ln_remove_closedseas
             WRITE(numout,*) '      npt_copy             = ', npt_copy
             WRITE(numout,*) '      npt_connect          = ', npt_connect
@@ -1234 +1235 @@
       ENDIF
 
+      IF ( .NOT.Agrif_Root() ) THEN
+         IF( (.NOT.ln_vert_remap).AND.(jpkglo>Agrif_Parent(jpkglo)) ) & 
+         CALL ctl_stop( 'STOP',    &
+               &   'AGRIF children must have less or equal number of &
+               &     vertical levels without ln_vert_remap defined' )
+      ENDIF
       IF(lwp) THEN                     ! Control print
          WRITE(numout,*)

utils/tools/DOMAINcfg/src/dombat.F90

@@ -12 +12 @@
 #endif   
    USE bilinear_interp
+   USE dom_oce
 
    IMPLICIT NONE
@@ -25 +26 @@
       INTEGER :: iimin,iimax,jjmin,jjmax
       INTEGER :: tabdim1, tabdim2, nxhr, nyhr, nxyhr
+      INTEGER :: nbadd, istart, iend, jstart, jend
       INTEGER, DIMENSION(2) :: ddims
       INTEGER, DIMENSION(3) :: status
@@ -410 +412 @@
       CALL lbc_lnk( 'dom_bat', bathy, 'T', 1.,kfillmode = jpfillcopy)
 
+#if defined key_agrif
+      IF (ln_remove_closedseas.AND.(.NOT.Agrif_Root())) THEN
+         ALLOCATE(bathy_test(jpi,jpj))
+         bathy_test(:,:) = 0._wp 
+         !
+         ! --- West --- !
+         IF(lk_west) THEN
+            istart = nn_hls + 2
+            iend   = nn_hls + nbghostcells 
+            DO ji = mi0(istart), mi1(iend)
+               DO jj = 1, jpj
+                  IF ( bathy (ji,jj)/=0._wp )   bathy_test(ji,jj) = 1._wp
+               END DO
+            END DO
+         ENDIF
+         !
+         ! --- East --- !
+         IF(lk_east) THEN
+            istart = jpiglo - ( nn_hls + nbghostcells -1 ) 
+            iend   = jpiglo - ( nn_hls + 1 )
+            DO ji = mi0(istart), mi1(iend)
+               DO jj = 1, jpj
+                  IF ( bathy (ji,jj)/=0._wp )   bathy_test(ji,jj) = 1._wp
+               END DO
+            END DO
+         ENDIF
+         !
+         ! --- South --- !
+         IF(lk_south) THEN
+            jstart = nn_hls + 2
+            jend   = nn_hls + nbghostcells
+            DO jj = mj0(jstart), mj1(jend)
+               DO ji = 1, jpi
+                  IF ( bathy (ji,jj)/=0._wp )   bathy_test(ji,jj) = 1._wp
+               END DO
+            END DO
+         ENDIF
+         !
+         ! --- North --- !
+         IF(lk_north) THEN
+            jstart = jpjglo - ( nn_hls + nbghostcells -1 )
+            jend   = jpjglo - ( nn_hls + 1 )
+            DO jj = mj0(jstart), mj1(jend)
+               DO ji = 1, jpi
+                  IF ( bathy (ji,jj)/=0._wp )  bathy_test(ji,jj) = 1._wp
+               END DO
+            END DO
+         ENDIF
+         
+         nbadd = 1
+         DO WHILE ( nbadd/=0 )
+            nbadd = 0
+            DO ji = 1+nn_hls, jpi-nn_hls
+               DO jj = 1+nn_hls, jpj-nn_hls           
+                  IF (bathy(ji,jj) > 0._wp) THEN
+                     IF (MAX(bathy_test(ji,jj+1),bathy_test(ji,jj-1), & 
+                     &       bathy_test(ji-1,jj),bathy_test(ji+1,jj))==1._wp)  THEN
+                        IF (bathy_test(ji,jj)/=1._wp) nbadd = nbadd + 1
+                        bathy_test(ji,jj)=1._wp
+                     ENDIF
+                  ENDIF
+               END DO
+            END DO
+            IF( lk_mpp )   CALL mpp_sum('dom_bat', nbadd )
+            CALL lbc_lnk( 'dom_bat', bathy_test, 'T', 1.,kfillmode = jpfillcopy)
+
+         END DO
+
+         WHERE(bathy_test==0._wp) bathy = 0._wp
+         DEALLOCATE(bathy_test)
+      ENDIF
+#endif
+
+
        ! Correct South and North
 ! #if defined key_agrif