From eece361ff637835cf73d5175676e06a0b5f6fe56 Mon Sep 17 00:00:00 2001
From: jchanut <jchanut@kara.mercator-ocean.fr>
Date: Mon, 20 Dec 2021 12:01:09 +0100
Subject: [PATCH] Fixes issues #4 and #5
Remove silly change on mbku/mbkv/mbkf at the surface: this is useless
and is not compatible with 1 layer configurations (e.g. SWG and
ICE_AGRIF). Revert changes to namelists in ICE_AGRIF
---
src/OCE/DOM/dommsk.F90 | 3 ---
tests/ICE_AGRIF/EXPREF/1_namelist_cfg | 1 -
tests/ICE_AGRIF/EXPREF/namelist_cfg | 2 --
3 files changed, 6 deletions(-)
diff --git a/src/OCE/DOM/dommsk.F90 b/src/OCE/DOM/dommsk.F90
index 5c7b801a..f153b531 100644
--- a/src/OCE/DOM/dommsk.F90
+++ b/src/OCE/DOM/dommsk.F90
@@ -160,9 +160,6 @@ CONTAINS
! In case of a coarsened grid, account her for possibly aditionnal
! masked points; these have been read in the mesh file and stored in mbku, mbkv, mbkf
DO_2D( 0, 0, 0, 0 )
- IF (mbku(ji,jj)<=1 ) umask(ji,jj,:) = 0._wp
- IF (mbkv(ji,jj)<=1 ) vmask(ji,jj,:) = 0._wp
- IF (mbkf(ji,jj)<=1 ) fmask(ji,jj,:) = 0._wp
IF ( MAXVAL(umask(ji,jj,:))/=0._wp ) umask(ji,jj,mbku(ji,jj)+1:jpk) = 0._wp
IF ( MAXVAL(vmask(ji,jj,:))/=0._wp ) vmask(ji,jj,mbkv(ji,jj)+1:jpk) = 0._wp
IF ( MAXVAL(fmask(ji,jj,:))/=0._wp ) fmask(ji,jj,mbkf(ji,jj)+1:jpk) = 0._wp
diff --git a/tests/ICE_AGRIF/EXPREF/1_namelist_cfg b/tests/ICE_AGRIF/EXPREF/1_namelist_cfg
index d21e9769..d1028790 100644
--- a/tests/ICE_AGRIF/EXPREF/1_namelist_cfg
+++ b/tests/ICE_AGRIF/EXPREF/1_namelist_cfg
@@ -105,7 +105,6 @@
&namagrif ! AGRIF zoom ("key_agrif")
!-----------------------------------------------------------------------
ln_init_chfrpar = .true. ! initialize child grids from parent
- ln_chk_bathy = .false. ! =T check the parent bathymetry
/
!!======================================================================
!! *** Top/Bottom boundary condition *** !!
diff --git a/tests/ICE_AGRIF/EXPREF/namelist_cfg b/tests/ICE_AGRIF/EXPREF/namelist_cfg
index 4e54a36b..4c246687 100644
--- a/tests/ICE_AGRIF/EXPREF/namelist_cfg
+++ b/tests/ICE_AGRIF/EXPREF/namelist_cfg
@@ -104,8 +104,6 @@
!-----------------------------------------------------------------------
&namagrif ! AGRIF zoom ("key_agrif")
!-----------------------------------------------------------------------
- ln_init_chfrpar = .true. ! initialize child grids from parent
- ln_chk_bathy = .false. ! =T check the parent bathymetry
/
!!======================================================================
!! *** Top/Bottom boundary condition *** !!
--
GitLab