Changeset 9166 for branches/2017/dev_merge_2017/NEMOGCM/TOOLS/NESTING/src/agrif_partial_steps.f90

Timestamp:

2017-12-22T16:45:51+01:00 (6 years ago)

Author:

jchanut

Message:

NESTING TOOLS:
Fixes to account for user defined number of ghostcells - still set to 1 to be consistent with NEMO
Set child grid bathymetry near boundaries to nearest neighbor interpolation from parent
Update Coarse grid bathymetry so that each cell volume matches child grid average

File:

• branches/2017/dev_merge_2017/NEMOGCM/TOOLS/NESTING/src/agrif_partial_steps.f90 (modified) (8 diffs)

branches/2017/dev_merge_2017/NEMOGCM/TOOLS/NESTING/src/agrif_partial_steps.f90

@@ -352 +352 @@
     IF ( MOD(irafx,2) .EQ. 0 ) diff = 1
     !       
-    bornex = nbghostcellsfine + CEILING(irafx/2.0) + diff - irafx
-    borney = nbghostcellsfine + CEILING(irafy/2.0) + diff - irafy
-    bornex2 = nxfin - (nbghostcellsfine-1) - irafx - CEILING(irafx/2.0) 
-    borney2 = nyfin - (nbghostcellsfine-1) - irafy - CEILING(irafy/2.0)                      
+    bornex = nbghostcellsfine + 1 + CEILING(irafx/2.0) + diff - irafx
+    borney = nbghostcellsfine + 1 + CEILING(irafy/2.0) + diff - irafy
+    bornex2 = nxfin - nbghostcellsfine - irafx - CEILING(irafx/2.0) 
+    borney2 = nyfin - nbghostcellsfine - irafy - CEILING(irafy/2.0)                      
     !
     !
@@ -361 +361 @@
     !
 
-    CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,3+connectionsize*irafx-1, &
+    CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,2+nbghostcellsfine+connectionsize*irafx-1, &
          1,nyfin)
 
@@ -368 +368 @@
     !
 
-    CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,nxfin-2-(connectionsize*irafx-1),nxfin, &
+    CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,nxfin-1-nbghostcellsfine-(connectionsize*irafx-1),nxfin, &
          1,nyfin)
 
@@ -376 +376 @@
 
     CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,nxfin, &
-         nyfin-2-(connectionsize*irafy-1),nyfin )
+         nyfin-1 - nbghostcellsfine -(connectionsize*irafy-1),nyfin )
 
     !
@@ -382 +382 @@
     !
     CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,nxfin, &
-         1,3+connectionsize*irafy-1 )
+         1,2+nbghostcellsfine+connectionsize*irafy-1 )
 
     !       
@@ -430 +430 @@
     dyfin = 1./irafy
 
-    ptx = 3
-    pty = 3
+    ptx = 1 + nbghostcellsfine + 1
+    pty = 1 + nbghostcellsfine + 1
 
     xmin = (imin-1) * 1
@@ -526 +526 @@
           DO ii = i-FLOOR(irafx/2.0)+diff,i+FLOOR(irafx/2.0)
              x = ii-i - xdiff/2.
-             val = parentgrid%gdepw_ps(ipt,jpt)+slopex * x
+!!             val = parentgrid%gdepw_ps(ipt,jpt)+slopex * x
 !! chanut: uncomment this to get nearest neighbor interpolation
-!!             val = parentgrid%gdepw_ps(ipt,jpt)          
+             val = parentgrid%gdepw_ps(ipt,jpt)          
              gdepwtemp(ii,j) = val
              IF (gdepwtemp(ii,j) < mindepth) THEN
@@ -585 +585 @@
           DO jj = j-FLOOR(irafy/2.0)+diff,j+FLOOR(irafy/2.0)
              y = jj-j - xdiff/2.
-             val = gdepwtemp(i,j) + slopey*y
+!!             val = gdepwtemp(i,j) + slopey*y
 !! chanut: uncomment this to get nearest neighbor interpolation
-!!             val = gdepwtemp(i,j)
+             val = gdepwtemp(i,j)
              gdepwtemp(i,jj) = val     
           ENDDO