Changeset 9694 for utils/tools/NESTING/src/agrif_create_bathy.f90

Timestamp:

2018-05-30T17:44:50+02:00 (6 years ago)

Author:

clem

Message:

change the nesting tools to choose the number of points copied from mother to child grids in the namelist (npt_copy) and change the name of nb_connection_pts to npt_connect

File:

• utils/tools/NESTING/src/agrif_create_bathy.f90 (modified) (13 diffs)

utils/tools/NESTING/src/agrif_create_bathy.f90

@@ -172 +172 @@
      CALL init_constant_bathy(G0%bathy_meter,bathy_fin_constant)
      !
-     boundary = connectionsize*irafx + nbghostcellsfine + 1 
+     boundary = npt_copy*irafx + nbghostcellsfine + 1 
      !
      ! connection carried out by copying parent grid values for the fine points
@@ -285 +285 @@
               Cell_lonmax = MAX(G1%glamf(ji-1,jj-1),G1%glamf(ji,jj-1),G1%glamf(ji,jj),G1%glamf(ji-1,jj))
               Cell_latmin = MIN(G1%gphif(ji-1,jj-1),G1%gphif(ji,jj-1),G1%gphif(ji,jj),G1%gphif(ji-1,jj))
-              Cell_latmax = MAX(G1%gphif(ji-1,jj-1),G1%gphif(ji,jj-1),G1%gphif(ji,jj),G1%gphif(ji-1,jj))                    
+              Cell_latmax = MAX(G1%gphif(ji-1,jj-1),G1%gphif(ji,jj-1),G1%gphif(ji,jj),G1%gphif(ji-1,jj)) 
               !               
               ! SEARCH FOR ALL POINTS CONTAINED IN THIS CELL
@@ -329 +329 @@
                  ALLOCATE( vardep(nxhr,nyhr) )
                  ALLOCATE( mask_oce(nxhr,nyhr) )
-                 mask_oce = 0        
+                 mask_oce = 0       
 
                  vardep(:,:) = G0%bathy_meter(iimin:iimax,jjmin:jjmax)
@@ -356 +356 @@
                           G1%bathy_meter(ji,jj) = ( vardep1d(SUM(mask_oce)/2) + vardep1d(SUM(mask_oce)/2+1) )/2.0
                        END IF
-                       DEALLOCATE(vardep1d)        
+                       DEALLOCATE(vardep1d)   
                     ENDIF
                  ENDIF
@@ -458 +458 @@
         CALL Check_interp(G0,gdepw_ps_interp)      ! interpolation in connection zone (3 coarse grid cells)
         !
-        boundary = connectionsize*irafx + nbghostcellsfine + 1                     
+        boundary = npt_copy*irafx + nbghostcellsfine + 1                     
 ! J chanut: exclude matching if no open boundaries
         IF (.NOT.ASSOCIATED(G1%wgt)) &
@@ -504 +504 @@
 
         IF(.NOT. smoothing) WRITE(*,*) 'No smoothing process only connection is carried out'
-        WRITE(*,*) ' linear connection on ',nb_connection_pts,'coarse grid points'
-
-        connectionsize = 2 + nb_connection_pts 
+        WRITE(*,*) ' linear connection on ',npt_connect,'coarse grid points'
+
         !            
         gdepw_ps_interp = 0.
@@ -521 +520 @@
         !
         wghts = 1.
-        DO ji = boundary + 1 , boundary + nb_connection_pts * irafx
-            wghts = wghts - (1. / (nb_connection_pts*irafx - 1. ) )
+        DO ji = boundary + 1 , boundary + npt_connect * irafx
+            wghts = wghts - (1. / (npt_connect*irafx - 1. ) )
             DO jj=1,nyfin
                IF (G1%gdepw_ps(nbghostcellsfine+1,jj) > 0.) THEN
@@ -531 +530 @@
       
         wghts = 1.
-        DO ji = nxfin - boundary , nxfin - boundary - nb_connection_pts * irafx +1 , -1
-            wghts = wghts - (1. / (nb_connection_pts*irafx - 1. ) )
+        DO ji = nxfin - boundary , nxfin - boundary - npt_connect * irafx +1 , -1
+            wghts = wghts - (1. / (npt_connect*irafx - 1. ) )
             DO jj=1,nyfin
                IF (G1%gdepw_ps(nxfin-nbghostcellsfine,jj) > 0.) THEN
@@ -541 +540 @@
 
         wghts = 1.
-        DO jj = boundary + 1 , boundary + nb_connection_pts * irafy
-            wghts = wghts - (1. / (nb_connection_pts*irafy - 1. ) )
+        DO jj = boundary + 1 , boundary + npt_connect * irafy
+            wghts = wghts - (1. / (npt_connect*irafy - 1. ) )
             DO ji=1,nxfin
                IF (G1%gdepw_ps(ji,nbghostcellsfine+1) > 0.) THEN
@@ -551 +550 @@
 
         wghts = 1.
-        DO jj = nyfin - boundary , nyfin - boundary - nb_connection_pts * irafy +1, -1
-            wghts = wghts - (1. / (nb_connection_pts*irafy - 1. ) )
+        DO jj = nyfin - boundary , nyfin - boundary - npt_connect * irafy +1, -1
+            wghts = wghts - (1. / (npt_connect*irafy - 1. ) )
             DO ji=1,nxfin
                IF (G1%gdepw_ps(ji,nyfin-nbghostcellsfine) > 0.) THEN
@@ -564 +563 @@
         G1%bathy_meter = G1%gdepw_ps
         !                     
-        connectionsize = 2 
         ! 
 ! Chanut: remove smoothing if child grid bathymetry is found to already exist
@@ -570 +568 @@
 
            !
-           ! Smoothing to connect the connection zone (3 + nb_connection_pts coarse grid cells) and the interior domain
+           ! Smoothing to connect the connection zone (3 + npt_connect coarse grid cells) and the interior domain
            !
 ! Chanut: smoothing everywhere then discard result in connection zone
            CALL smooth_topo(G1%gdepw_ps(1:nxfin,1:nyfin),nbiter)
            WHERE (G1%wgt(:,:)==0.) G1%bathy_meter(:,:) = G1%gdepw_ps(:,:)
-!           boundary = (connectionsize+nb_connection_pts)*irafx + nbghostcellsfine + 1 
+!           boundary = (npt_copy+npt_connect)*irafx + nbghostcellsfine + 1 
 !           CALL smooth_topo(G1%gdepw_ps(boundary:nxfin-boundary+1,boundary:nyfin-boundary+1),nbiter)
 !           G1%bathy_meter = G1%gdepw_ps                         
@@ -658 +656 @@
      CALL init_constant_bathy(G0%bathy_meter,bathy_fin_constant)
      !
-     boundary = connectionsize*irafx + nbghostcellsfine + 1   
+     boundary = npt_copy*irafx + nbghostcellsfine + 1   
      !             
      G1%bathy_meter(1:boundary,:) = bathy_fin_constant(1:boundary,:)