Changeset 11201 for NEMO/branches/2019/ENHANCE-03_domcfg/src/domzgr.F90

Timestamp:

2019-07-01T12:10:15+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-03_domcfg : add management of closed seas in domain cfg by flood filling and lat/lon seed instead of i/j box definition (ticket #2143)

File:

• NEMO/branches/2019/ENHANCE-03_domcfg/src/domzgr.F90 (modified) (4 diffs)

NEMO/branches/2019/ENHANCE-03_domcfg/src/domzgr.F90

@@ -36 +36 @@
    !!---------------------------------------------------------------------
    USE dom_oce           ! ocean domain
-!   USE closea            ! closed seas
    !
    USE in_out_manager    ! I/O manager
@@ -164 +163 @@
       ! final adjustment of mbathy & check 
       ! -----------------------------------
-      IF( lzoom       )   CALL zgr_bat_zoom     ! correct mbathy in case of zoom subdomain
                           CALL zgr_bat_ctl      ! check bathymetry (mbathy) and suppress isolated ocean points
                           CALL zgr_bot_level    ! deepest ocean level for t-, u- and v-points
@@ -622 +620 @@
       ENDIF
       !
-    !  IF( nn_closea == 0 )   CALL clo_bat( bathy, mbathy )    !==  NO closed seas or lakes  ==!
-      !                       
       IF ( .not. ln_sco ) THEN                                !==  set a minimum depth  ==!
          IF( rn_hmin < 0._wp ) THEN    ;   ik = - INT( rn_hmin )                                      ! from a nb of level
@@ -636 +632 @@
       !
    END SUBROUTINE zgr_bat
-
-
-   SUBROUTINE zgr_bat_zoom
-      !!----------------------------------------------------------------------
-      !!                    ***  ROUTINE zgr_bat_zoom  ***
-      !!
-      !! ** Purpose : - Close zoom domain boundary if necessary
-      !!              - Suppress Med Sea from ORCA R2 and R05 arctic zoom
-      !!
-      !! ** Method  : 
-      !!
-      !! ** Action  : - update mbathy: level bathymetry (in level index)
-      !!----------------------------------------------------------------------
-      INTEGER ::   ii0, ii1, ij0, ij1   ! temporary integers
-      !!----------------------------------------------------------------------
-      !
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '    zgr_bat_zoom : modify the level bathymetry for zoom domain'
-      IF(lwp) WRITE(numout,*) '    ~~~~~~~~~~~~'
-      !
-      ! Zoom domain
-      ! ===========
-      !
-      ! Forced closed boundary if required
-      IF( lzoom_s )   mbathy(  : , mj0(jpjzoom):mj1(jpjzoom) )      = 0
-      IF( lzoom_w )   mbathy(      mi0(jpizoom):mi1(jpizoom) , :  ) = 0
-      IF( lzoom_e )   mbathy(      mi0(jpiglo+jpizoom-1):mi1(jpiglo+jpizoom-1) , :  ) = 0
-      IF( lzoom_n )   mbathy(  : , mj0(jpjglo+jpjzoom-1):mj1(jpjglo+jpjzoom-1) )      = 0
-      !
-      ! Configuration specific domain modifications
-      ! (here, ORCA arctic configuration: suppress Med Sea)
-      IF( cp_cfg == "orca" .AND. cp_cfz == "arctic" ) THEN
-         SELECT CASE ( jp_cfg )
-         !                                        ! =======================
-         CASE ( 2 )                               !  ORCA_R2 configuration
-            !                                     ! =======================
-            IF(lwp) WRITE(numout,*) '                   ORCA R2 arctic zoom: suppress the Med Sea'
-            ii0 = 141   ;   ii1 = 162      ! Sea box i,j indices
-            ij0 =  98   ;   ij1 = 110
-            !                                     ! =======================
-         CASE ( 05 )                              !  ORCA_R05 configuration
-            !                                     ! =======================
-            IF(lwp) WRITE(numout,*) '                   ORCA R05 arctic zoom: suppress the Med Sea'
-            ii0 = 563   ;   ii1 = 642      ! zero over the Med Sea boxe
-            ij0 = 314   ;   ij1 = 370 
-         END SELECT
-         !
-         mbathy( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0   ! zero over the Med Sea boxe
-         !
-      ENDIF
-      !
-   END SUBROUTINE zgr_bat_zoom
-
 
    SUBROUTINE zgr_bat_ctl