Changeset 11868 for NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_user.F90

Timestamp:

2019-11-06T16:43:51+01:00 (4 years ago)

Author:

jchanut

Message:

#2222, 1) Correct sponge mainly for using AGRIF in 2DV domains, 2) Add check of bathymetry consistency

File:

• NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_user.F90 (modified) (5 diffs)

NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_user.F90

@@ -126 +126 @@
       CALL Agrif_Bc_variable(mbkt_id,calledweight=1.,procname=interpmbkt)
       !
+      ! Assume step wise change of bathymetry near interface
+      ! TODO: Switch to linear interpolation of bathymetry in the s-coordinate case
+      !       and no refinement
       DO jj = 1, jpjm1
          DO ji = 1, jpim1
@@ -140 +143 @@
       mbku_parent(:,:) = MAX( NINT( zk(:,:) ), 1 )
       zk(:,:) = REAL( mbkv_parent(:,:), wp )   ;   CALL lbc_lnk( 'Agrif_InitValues_cont', zk, 'V', 1. )
-      mbkv_parent(:,:) = MAX( NINT( zk(:,:) ), 1 )      
+      mbkv_parent(:,:) = MAX( NINT( zk(:,:) ), 1 )   
 #endif
 
@@ -238 +241 @@
          ENDIF
 
-         ! check if masks and bathymetries match
-         IF(ln_chk_bathy) THEN
-            !
-            IF(lwp) WRITE(numout,*) 'AGRIF: Check Bathymetry and masks near bdys. Level: ', Agrif_Level()
-            !
-            kindic_agr = 0
-            ! check if umask agree with parent along western and eastern boundaries:
-            CALL Agrif_Bc_variable(umsk_id,calledweight=1.,procname=interpumsk)
-            ! check if vmask agree with parent along northern and southern boundaries:
-            CALL Agrif_Bc_variable(vmsk_id,calledweight=1.,procname=interpvmsk)
-            ! check if tmask and vertical scale factors agree with parent over first two coarse grid points:
-            CALL Agrif_Bc_variable(e3t_id,calledweight=1.,procname=interpe3t)
-            !
-            CALL mpp_sum( 'agrif_user', kindic_agr )
-            IF( kindic_agr /= 0 ) THEN
-               CALL ctl_stop('Child Bathymetry is not correct near boundaries.')
-            ELSE
-               IF(lwp) WRITE(numout,*) 'Child Bathymetry is ok near boundaries.'
-            END IF
-         ENDIF
-
-#if defined key_vertical
-    IF ( Agrif_Parent(jpk).GT.jpk ) THEN
-       CALL ctl_stop( ' With key_vertical, child grids must have jpk greater or equal to the parent value' )
-         ENDIF
-#endif
+      ENDIF
+
+      ! check if masks and bathymetries match
+      IF(ln_chk_bathy) THEN
          !
-      ENDIF
+         IF(lwp) WRITE(numout,*) ' '
+         IF(lwp) WRITE(numout,*) 'AGRIF: Check Bathymetry and masks near bdys. Level: ', Agrif_Level()
+         !
+         kindic_agr = 0
+# if ! defined key_vertical
+         !
+         ! check if umask agree with parent along western and eastern boundaries:
+         CALL Agrif_Bc_variable(umsk_id,calledweight=1.,procname=interpumsk)
+         ! check if vmask agree with parent along northern and southern boundaries:
+         CALL Agrif_Bc_variable(vmsk_id,calledweight=1.,procname=interpvmsk)
+         ! check if tmask and vertical scale factors agree with parent over first two coarse grid points:
+         CALL Agrif_Bc_variable(e3t_id,calledweight=1.,procname=interpe3t)
+         !
+# else
+         !
+         ! In case of vertical interpolation, check only that total depths agree between child and parent:
+         DO ji = 1, jpi
+            DO jj = 1, jpj
+               IF ((mbkt_parent(ji,jj)/=0).AND.(ht0_parent(ji,jj)/=ht_0(ji,jj))) kindic_agr = kindic_agr + 1
+               IF ((mbku_parent(ji,jj)/=0).AND.(hu0_parent(ji,jj)/=hu_0(ji,jj))) kindic_agr = kindic_agr + 1
+               IF ((mbkv_parent(ji,jj)/=0).AND.(hv0_parent(ji,jj)/=hv_0(ji,jj))) kindic_agr = kindic_agr + 1
+            END DO
+         END DO
+# endif
+         CALL mpp_sum( 'agrif_user', kindic_agr )
+         IF( kindic_agr /= 0 ) THEN
+            CALL ctl_stop('==> Child Bathymetry is NOT correct near boundaries.')
+         ELSE
+            IF(lwp) WRITE(numout,*) '==> Child Bathymetry is ok near boundaries.'
+            IF(lwp) WRITE(numout,*) ' '
+         END IF  
+         !    
+      ENDIF
+
+# if defined key_vertical
+      ! Additional constrain that should be removed someday:
+      IF ( Agrif_Parent(jpk).GT.jpk ) THEN
+    CALL ctl_stop( ' With key_vertical, child grids must have jpk greater or equal to the parent value' )
+      ENDIF
+# endif
       ! 
    END SUBROUTINE Agrif_InitValues_cont
@@ -379 +399 @@
       ! 3. Location of interpolation
       !-----------------------------
-      CALL Agrif_Set_bc(       tsn_id, (/0,ind1-1/) )
-      CALL Agrif_Set_bc( un_interp_id, (/0,ind1-1/) )
+      CALL Agrif_Set_bc(       tsn_id, (/0,ind1-1/) ) ! if west,  rhox=3 and nbghost=3: columns 2 to 4
+      CALL Agrif_Set_bc( un_interp_id, (/0,ind1-1/) ) 
       CALL Agrif_Set_bc( vn_interp_id, (/0,ind1-1/) )
 
-      CALL Agrif_Set_bc( tsn_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) )  ! if west and rhox=3 and sponge=2 and ghost=1: columns 2 to 9 
-      CALL Agrif_Set_bc(  un_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) )
-      CALL Agrif_Set_bc(  vn_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) )
+      CALL Agrif_Set_bc( tsn_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) )  ! if west,  rhox=3, nn_sponge_len=2 
+      CALL Agrif_Set_bc(  un_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) )  ! and nbghost=3: 
+      CALL Agrif_Set_bc(  vn_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) )  ! columns 4 to 11
 
       CALL Agrif_Set_bc(        sshn_id, (/0,ind1-1/) )
@@ -393 +413 @@
       CALL Agrif_Set_bc( vb2b_interp_id, (/0,ind1-1/) )
 
-      CALL Agrif_Set_bc(  e3t_id, (/-nn_sponge_len*Agrif_irhox(),ind1-1/) )   ! if west and rhox=3 and ghost=1: column 2 to 6 
-      CALL Agrif_Set_bc( umsk_id, (/0,0/) )
-      CALL Agrif_Set_bc( vmsk_id, (/0,0/) )
-# if defined key_vertical
+      CALL Agrif_Set_bc(  e3t_id, (/-nn_sponge_len*Agrif_irhox(),ind1-1/) )     ! if west,  rhox=3, nn_sponge_len=2
+      CALL Agrif_Set_bc( umsk_id, (/0,0/) )                                     ! and nbghost=3:
+      CALL Agrif_Set_bc( vmsk_id, (/0,0/) )                                     ! columns 2 to 10
+# if defined key_vertical 
       ! extend the interpolation zone by 1 more point than necessary:
       CALL Agrif_Set_bc(  mbkt_id, (/-nn_sponge_len*Agrif_irhox()-2,ind1/) )