Changeset 15130

Timestamp:

2021-07-19T16:54:25+02:00 (3 years ago)

Author:

jchanut

Message:

#2638, Remove useless interpolation over land points around zoom + revert external switch in the i direction to the previous one (issue with north fold corssing with nn_hls=2)

File:

• NEMO/trunk/src/NST/agrif_user.F90 (modified) (6 diffs)

NEMO/trunk/src/NST/agrif_user.F90

@@ -434 +434 @@
       ! 1. Declaration of the type of variable which have to be interpolated
       !---------------------------------------------------------------------
-      ind1 =              nbghostcells
+      ind1 =              nbghostcells - 1 ! Remove one land cell in ghosts 
       ind2 = nn_hls + 1 + nbghostcells_x_w
       ind3 = nn_hls + 1 + nbghostcells_y_s
@@ -634 +634 @@
       !                            2,2 = two ghost lines
       !-------------------------------------------------------------------------------------
-      ind1 =              nbghostcells
+      ind1 =              nbghostcells - 1 ! Remove one land cell in ghosts 
       ind2 = nn_hls + 1 + nbghostcells_x_w
       ind3 = nn_hls + 1 + nbghostcells_y_s
@@ -661 +661 @@
       ! 3. Set location of interpolations
       !----------------------------------
-      CALL Agrif_Set_bc(tra_ice_id,(/0,ind1/))
-      CALL Agrif_Set_bc(u_ice_id  ,(/0,ind1/))
-      CALL Agrif_Set_bc(v_ice_id  ,(/0,ind1/))
-
-      CALL Agrif_Set_bc(tra_iceini_id,(/0,ind1/))
-      CALL Agrif_Set_bc(u_iceini_id  ,(/0,ind1/))
-      CALL Agrif_Set_bc(v_iceini_id  ,(/0,ind1/))
+      CALL Agrif_Set_bc(tra_ice_id,(/0,ind1-1/))
+      CALL Agrif_Set_bc(u_ice_id  ,(/0,ind1-1/))
+      CALL Agrif_Set_bc(v_ice_id  ,(/0,ind1-1/))
+
+      CALL Agrif_Set_bc(tra_iceini_id,(/0,ind1-1/))
+      CALL Agrif_Set_bc(u_iceini_id  ,(/0,ind1-1/))
+      CALL Agrif_Set_bc(v_iceini_id  ,(/0,ind1-1/))
 
       ! 4. Set update type in case 2 ways (child=>parent) (normal & tangent to the grid cell for velocities)
@@ -782 +782 @@
       ! 1. Declaration of the type of variable which have to be interpolated
       !---------------------------------------------------------------------
-      ind1 =              nbghostcells
+      ind1 =              nbghostcells - 1 ! Remove one land cell in ghosts 
       ind2 = nn_hls + 1 + nbghostcells_x_w
       ind3 = nn_hls + 1 + nbghostcells_y_s
@@ -1106 +1106 @@
           
             bounds_chunks(1,1,1,1) = bounds(1,1,2)
-            bounds_chunks(1,1,2,1) = nn_hls+1
+            bounds_chunks(1,1,2,1) = nn_hls+1 
        
             bounds_chunks(2,1,1,2) = nn_hls+1 
@@ -1161 +1161 @@
       IF( isens == 1 ) THEN
          IF( ptx == 2 ) THEN ! T, V points
-            agrif_external_switch_index = jpiglo-i1+2*nn_hls
+            agrif_external_switch_index = jpiglo-i1+2
          ELSE ! U, F points
-            agrif_external_switch_index = jpiglo-i1+2*nn_hls-1      
+            agrif_external_switch_index = jpiglo-i1+1 
          ENDIF
       ELSE IF( isens ==2 ) THEN