Changeset 9166 for branches/2017/dev_merge_2017/NEMOGCM/TOOLS/NESTING/src/agrif_connect_topo.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_connect_topo.f90 (modified) (2 diffs)

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

@@ -57 +57 @@
     indx = 2 + CEILING(irafx/2.0) + diff      
     indy = 2 + CEILING(irafy/2.0) + diff
-    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 = 1+nbghostcellsfine + CEILING(irafx/2.0) + diff - irafx
+    borney = 1+nbghostcellsfine + CEILING(irafy/2.0) + diff - irafy
+    bornex2 = nxfin - (nbghostcellsfine) + irafx - CEILING(irafx/2.0) 
+    borney2 = nyfin - (nbghostcellsfine) + irafy - CEILING(irafy/2.0) 
     !    
     ALLOCATE(bathy_fin_constant(bornex-FLOOR(irafx/2.0):bornex2+FLOOR(irafx/2.0), &
@@ -902 +902 @@
           ipt = imin + 3 - 1 + (ji - ideb) / irafx
           !
-          IF( G0%Bathy_meter(ipt,jpt) .LE. 0. .AND.                      &
-               MAXVAL(G1%Bathy_meter(ji-irafx/2+diff:ji+irafx/2, &
-               jj-irafy/2+diff:jj+irafy/2)).GT. 0.  ) THEN
-             G0%Bathy_meter(ipt,jpt) = zmin
+!          IF( G0%Bathy_meter(ipt,jpt) .LE. 0. .AND.                      &
+!               MAXVAL(G1%Bathy_meter(ji-irafx/2+diff:ji+irafx/2, &
+!               jj-irafy/2+diff:jj+irafy/2)).GT. 0.  ) THEN
+!             G0%Bathy_meter(ipt,jpt) = zmin
+             G0%Bathy_meter(ipt,jpt) =& 
+             SUM(G1%Bathy_meter(ji-irafx/2+diff:ji+irafx/2, &
+                                 jj-irafy/2+diff:jj+irafy/2))&
+                /irafx/irafy            
+             IF(G0%Bathy_meter(ipt,jpt).GT.0.) THEN
+                 G0%Bathy_meter(ipt,jpt) = MAX( G0%Bathy_meter(ipt,jpt),zmin)   
+             ENDIF
              !
              compt = compt + 1
              !
-          ENDIF
+!          ENDIF
           !
        ENDDO