Merge pull request #42 from p-costa/simplify-geo-setup

p-costa · web-flow · commit 2d853a8f8348 · 2022-07-08T15:51:02.000Z
Simplify setup of multi-block geometry
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ P. Costa. *A FFT-accelerated multi-block finite-difference solver for massively
 Comput. Phys. Commun. 271 : 108194 (2022) [[DOI:10.1016/j.cpc.2021.108194]](doi.org/10.1016/j.cpc.2021.108194) [[arXiv:2106.03583]](https://arxiv.org/pdf/2106.03583.pdf).
 
 ## News
+[08/07/2022] The input files describing the block geometry (under `geo/block.???`) have been simplified. Now, instead of prescribing the lower and upper extents of each block `lo(:)` and `hi(:)`, the number of grid points `ng(:)` is prescribed. This change makes it much easier to refine the grid without, since one does not need to correct extents of neighboring blocks. See the updated [`src/INFO_INPUT.md`](src/INFO_INPUT.md) for more details.
 
 ## Features
 
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/L_channel/block.001 b/examples/__MULTI_BLOCK_GEOMETRY/L_channel/block.001
@@ -1,6 +1,5 @@
 1 1 1                    ! dims(1:3)
-1  1  1                  ! lo(1:3)
-32 32 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 0. 0. 0.                 ! lmin(1:3)
 .5 .5 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/L_channel/block.002 b/examples/__MULTI_BLOCK_GEOMETRY/L_channel/block.002
@@ -1,6 +1,5 @@
 1 1 1                    ! dims(1:3)
-1  33 1                  ! lo(1:3)
-32 64 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 0. .5 0.                 ! lmin(1:3)
 .5 1. 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/L_channel/block.003 b/examples/__MULTI_BLOCK_GEOMETRY/L_channel/block.003
@@ -1,6 +1,5 @@
 2 1 1                    ! dims(1:3)
-33  33 1                 ! lo(1:3)
-128 64 64                ! hi(1:3)
+96 32 64                 ! ng(1:3)
 .5 .5 0.                 ! lmin(1:3)
 2.0 1. 1.                ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/dns.in b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/dns.in
@@ -0,0 +1,8 @@
+0.95 0.01                   ! cfl, dtmin
+1. 1. 150.                  ! uref, lref, rey
+2501    100. 100.           ! nstep,time_max,tw_max
+T F F                       ! stop_type(1:3)
+F T 0                       ! restart,is_overwrite_save
+10  250 250 2500 250 2500   ! icheck, iout0d, iout1d, iout2d, iout3d, isave
+0. 0. 0.                    ! bforce(1:3)
+4                           ! nthreadsmax
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.001 b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.001
@@ -0,0 +1,17 @@
+1 1 1                    ! dims(1:3)
+48 48 2                  ! ng(1:3)
+-9. -9. 0.               ! lmin(1:3)
+-0.5 -0.5 0.01           ! lmax(1:3)
+3 3 0                    ! gt(1:3)
+3.1 3.1 0.               ! gr(1:3)
+D F  N F  F F            ! cbcvel(0:1,1:3,1) [u BC type]
+D F  N F  F F            ! cbcvel(0:1,1:3,2) [v BC type]
+D F  N F  F F            ! cbcvel(0:1,1:3,3) [w BC type]
+N F  D F  F F            ! cbcpre(0:1,1:3  ) [p BC type]
+1. 2.  0. 8.  1. 1.      !  bcvel(0:1,1:3,1) [u BC value]
+0. 2.  0. 8.  1. 1.      !  bcvel(0:1,1:3,2) [v BC value]
+0. 2.  0. 8.  1. 1.      !  bcvel(0:1,1:3,3) [w BC value]
+0. 2.  0. 8.  1. 1.      !  bcpre(0:1,1:3  ) [p BC value]
+0 0  0 0  0 0            !  is_inflow( 0:1,1:3)
+uni                      ! inivel
+1                        ! id
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.002 b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.002
@@ -0,0 +1,17 @@
+1 1 1                    ! dims(1:3)
+34 48 2                  ! ng(1:3)
+-0.5 -9. 0.              ! lmin(1:3)
+0.5 -0.5 0.01            ! lmax(1:3)
+0 3 0                    ! gt(1:3)
+4. 3.1 0.                ! gr(1:3)
+F F  N D  F F            ! cbcvel(0:1,1:3,1) [u BC type]
+F F  N D  F F            ! cbcvel(0:1,1:3,2) [v BC type]
+F F  N D  F F            ! cbcvel(0:1,1:3,3) [w BC type]
+F F  D N  F F            ! cbcpre(0:1,1:3  ) [p BC type]
+1. 3.  0. 0.  2. 2.      !  bcvel(0:1,1:3,1) [u BC value]
+1. 3.  0. 0.  2. 2.      !  bcvel(0:1,1:3,2) [v BC value]
+1. 3.  0. 0.  2. 2.      !  bcvel(0:1,1:3,3) [w BC value]
+1. 3.  0. 0.  2. 2.      !  bcpre(0:1,1:3  ) [p BC value]
+0 0  0 0  0 0            !  is_inflow(0:1,1:3)
+uni                      ! inivel
+2                        ! id
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.003 b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.003
@@ -0,0 +1,17 @@
+1 1 1                    ! dims(1:3)
+128 48 2                 ! hi(1:3)
+0.5 -9. 0.               ! lmin(1:3)
+12.5 -0.5 0.01           ! lmax(1:3)
+1 3 0                    ! gt(1:3)
+2.6 3.1 0.               ! gr(1:3)
+F N  N F  F F            ! cbcvel(0:1,1:3,1) [u BC type]
+F N  N F  F F            ! cbcvel(0:1,1:3,2) [v BC type]
+F N  N F  F F            ! cbcvel(0:1,1:3,3) [w BC type]
+F D  D F  F F            ! cbcpre(0:1,1:3  ) [p BC type]
+2. 1.  0. 4.  3. 3.      !  bcvel(0:1,1:3,1) [u BC value]
+2. 0.  0. 4.  3. 3.      !  bcvel(0:1,1:3,2) [v BC value]
+2. 0.  0. 4.  3. 3.      !  bcvel(0:1,1:3,3) [w BC value]
+2. 0.  0. 4.  3. 3.      !  bcpre(0:1,1:3  ) [p BC value]
+0 1  0 0  0 0            !  is_inflow(0:1,1:3)
+uni                      ! inivel
+3                        ! id
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.004 b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.004
@@ -0,0 +1,17 @@
+1 1 1                    ! dims(1:3)
+128 34 2                 ! ng(1:3)
+0.5 -0.5 0.              ! lmin(1:3)
+12.5 0.5 0.01            ! lmax(1:3)
+1 0 0                    ! gt(1:3)
+2.6 4. 0.                ! gr(1:3)
+D N  F F  F F            ! cbcvel(0:1,1:3,1) [u BC type]
+D N  F F  F F            ! cbcvel(0:1,1:3,2) [v BC type]
+D N  F F  F F            ! cbcvel(0:1,1:3,3) [w BC type]
+N D  F F  F F            ! cbcpre(0:1,1:3  ) [p BC type]
+0. 1.  3. 5.  4. 4.      !  bcvel(0:1,1:3,1) [u BC value]
+0. 0.  3. 5.  4. 4.      !  bcvel(0:1,1:3,2) [v BC value]
+0. 0.  3. 5.  4. 4.      !  bcvel(0:1,1:3,3) [w BC value]
+0. 0.  3. 5.  4. 4.      !  bcpre(0:1,1:3  ) [p BC value]
+0 1  0 0  0 0            !  is_inflow(0:1,1:3)
+uni                      ! inivel
+4                        ! id
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.005 b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.005
@@ -0,0 +1,17 @@
+1 1 1                    ! dims(1:3)
+128 48  2                ! ng(1:3)
+0.5 0.5 0.               ! lmin(1:3)
+12.5 9. 0.01             ! lmax(1:3)
+1 1 0                    ! gt(1:3)
+2.6 3.1 0.               ! gr(1:3)
+F N  F N  F F            ! cbcvel(0:1,1:3,1) [u BC type]
+F N  F N  F F            ! cbcvel(0:1,1:3,2) [v BC type]
+F N  F N  F F            ! cbcvel(0:1,1:3,3) [w BC type]
+F D  F D  F F            ! cbcpre(0:1,1:3  ) [p BC type]
+6. 1.  4. 0.  5. 5.      !  bcvel(0:1,1:3,1) [u BC value]
+6. 0.  4. 0.  5. 5.      !  bcvel(0:1,1:3,2) [v BC value]
+6. 0.  4. 0.  5. 5.      !  bcvel(0:1,1:3,3) [w BC value]
+6. 0.  4. 0.  5. 5.      !  bcpre(0:1,1:3  ) [p BC value]
+0 1  0 0  0 0            !  is_inflow(0:1,1:3)
+uni                      ! inivel
+5                        ! id
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.006 b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.006
@@ -0,0 +1,17 @@
+1 1 1                    ! dims(1:3)
+34 48  2                 ! ng(1:3)
+-0.5 0.5 0.              ! lmin(1:3)
+0.5 9. 0.01              ! lmax(1:3)
+0 1 0                    ! gt(1:3)
+4. 3.1 0.                ! gr(1:3)
+F F  D N  F F            ! cbcvel(0:1,1:3,1) [u BC type]
+F F  D N  F F            ! cbcvel(0:1,1:3,2) [v BC type]
+F F  D N  F F            ! cbcvel(0:1,1:3,3) [w BC type]
+F F  N D  F F            ! cbcpre(0:1,1:3  ) [p BC type]
+7. 5.  0. 0.  6. 6.      !  bcvel(0:1,1:3,1) [u BC value]
+7. 5.  0. 0.  6. 6.      !  bcvel(0:1,1:3,2) [v BC value]
+7. 5.  0. 0.  6. 6.      !  bcvel(0:1,1:3,3) [w BC value]
+7. 5.  0. 0.  6. 6.      !  bcpre(0:1,1:3  ) [p BC value]
+0 0  0 0  0 0            !  is_inflow(0:1,1:3)
+uni                      ! inivel
+6                        ! id
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.007 b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.007
@@ -0,0 +1,17 @@
+1 1 1                    ! dims(1:3)
+48 48 2                  ! ng(1:3)
+-9. 0.5 0.               ! lmin(1:3)
+-0.5 9. 0.01             ! lmax(1:3)
+3 1 0                    ! gt(1:3)
+3.1 3.1 0.               ! gr(1:3)
+D F  F N  F F            ! cbcvel(0:1,1:3,1) [u BC type]
+D F  F N  F F            ! cbcvel(0:1,1:3,2) [v BC type]
+D F  F N  F F            ! cbcvel(0:1,1:3,3) [w BC type]
+N F  F D  F F            ! cbcpre(0:1,1:3  ) [p BC type]
+1. 6.  8. 0.  7. 7.      !  bcvel(0:1,1:3,1) [u BC value]
+0. 6.  8. 0.  7. 7.      !  bcvel(0:1,1:3,2) [v BC value]
+0. 6.  8. 0.  7. 7.      !  bcvel(0:1,1:3,3) [w BC value]
+0. 6.  8. 0.  7. 7.      !  bcpre(0:1,1:3  ) [p BC value]
+0 0  0 0  0 0            !  is_inflow(0:1,1:3)
+uni                      ! inivel
+7                        ! id
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.008 b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/geo/block.008
@@ -0,0 +1,17 @@
+1 1 1                    ! dims(1:3)
+48  34 2                 ! ng(1:3)
+-9. -0.5 0.              ! lmin(1:3)
+-0.5 0.5 0.01            ! lmax(1:3)
+3 0 0                    ! gt(1:3)
+3.1 4. 0.                ! gr(1:3)
+D D  F F  F F            ! cbcvel(0:1,1:3,1) [u BC type]
+D D  F F  F F            ! cbcvel(0:1,1:3,2) [v BC type]
+D D  F F  F F            ! cbcvel(0:1,1:3,3) [w BC type]
+N N  F F  F F            ! cbcpre(0:1,1:3  ) [p BC type]
+1. 0.  1. 7.  8. 8.      !  bcvel(0:1,1:3,1) [u BC value]
+0. 0.  1. 7.  8. 8.      !  bcvel(0:1,1:3,2) [v BC value]
+0. 0.  1. 7.  8. 8.      !  bcvel(0:1,1:3,3) [w BC value]
+0. 0.  1. 7.  8. 8.      !  bcpre(0:1,1:3  ) [p BC value]
+0 0  0 0  0 0            !  is_inflow(0:1,1:3)
+uni                      ! inivel
+8                        ! id
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/hypre.in b/examples/__MULTI_BLOCK_GEOMETRY/flow_around_square/hypre.in
@@ -0,0 +1 @@
+1 1.e-3 50  ! hypre_solver_i,hypre_tol,hypre_maxiter | note: hypre_solver_i = [1->SMG;2->PFMG;3->GMRES;4->BiCGSTAB]
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/kovasznay_flow/block.001 b/examples/__MULTI_BLOCK_GEOMETRY/kovasznay_flow/block.001
@@ -1,8 +1,7 @@
 1 1 1                    ! dims(1:3)
-1  1  1                  ! lo(1:3)
-320 2 64                 ! hi(1:3)
--0.5 0. -0.5                 ! lmin(1:3)
-4.5 .03125  0.5                 ! lmax(1:3)
+320 2 64                 ! ng(1:3)
+-0.5 0. -0.5             ! lmin(1:3)
+4.5 .03125  0.5          ! lmax(1:3)
 0 0 0                    ! gt(1:3)
 0. 0. 0.                 ! gr(1:3)
 D N  F F  F F            ! cbcvel(0:1,1:3,1) [u BC type]
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/lid_driven_cavity/block.002 b/examples/__MULTI_BLOCK_GEOMETRY/lid_driven_cavity/block.002
@@ -1,6 +1,5 @@
 1 1 1                    ! dims(1:3)
-33 1  1                  ! lo(1:3)
-64 32 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 .5 0. 0.                 ! lmin(1:3)
 1. .5 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/lid_driven_cavity/block.003 b/examples/__MULTI_BLOCK_GEOMETRY/lid_driven_cavity/block.003
@@ -1,6 +1,5 @@
 1 1 1                    ! dims(1:3)
-1  33 1                  ! lo(1:3)
-32 64 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 0. .5 0.                 ! lmin(1:3)
 .5 1. 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/examples/__MULTI_BLOCK_GEOMETRY/lid_driven_cavity/block.004 b/examples/__MULTI_BLOCK_GEOMETRY/lid_driven_cavity/block.004
@@ -1,6 +1,5 @@
 1 1 1                    ! dims(1:3)
-33 33 1                  ! lo(1:3)
-64 64 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 .5 .5 0.                 ! lmin(1:3)
 1. 1. 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/src/INFO_INPUT.md b/src/INFO_INPUT.md
@@ -16,7 +16,7 @@ Let us start with block-independent parameters in `dns.in`. Consider the followi
  100    100. 0.1             ! nstep,time_max,tw_max
  T F F                       ! stop_type(1:3)
  F T                         ! restart,is_overwrite_save
-10 10 20 5000 10000 2000     ! icheck, iout0d, iout1d, iout2d, iout3d, isave
+ 10 10 20 5000 10000 2000    ! icheck, iout0d, iout1d, iout2d, iout3d, isave
  0. 0. 0.                    ! bforce(1:3)
  4                           ! nthreadsmax
 ~~~
@@ -114,8 +114,7 @@ The geometry, boundary and initial conditions, domain decompositions is set in a
 `geo/block.001`:
 ~~~
 1 1 1                    ! dims(1:3)
-1  1  1                  ! lo(1:3)
-32 32 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 0. 0. 0.                 ! lmin(1:3)
 .5 .5 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
@@ -135,8 +134,7 @@ zer                      ! inivel
 `geo/block.002`:
 ~~~
 1 1 1                    ! dims(1:3)
-1  33 1                  ! lo(1:3)
-32 64 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 0. .5 0.                 ! lmin(1:3)
 .5 1. 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
@@ -156,8 +154,7 @@ zer                      ! inivel
 `geo/block.003`:
 ~~~
 2 1 1                    ! dims(1:3)
-33  33 1                 ! lo(1:3)
-128 64 64                ! hi(1:3)
+96 32 64                 ! ng(1:3)
 .5 .5 0.                 ! lmin(1:3)
 2.0 1. 1.                ! lmax(1:3)
 0 0 0                    ! gt(1:3)
@@ -180,8 +177,7 @@ zer                      ! inivel
 
 ~~~
 1 1 1                    ! dims(1:3)
-1  1  1                  ! lo(1:3)
-32 32 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 0. 0. 0.                 ! lmin(1:3)
 .5 .5 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
@@ -192,7 +188,7 @@ These lines set the domain decomposition and computational grid for each block.
 `dims` is the **number of computational** subdomains in each direction.
 
 
-`lo(1:3)` and `hi(1:3)` are the **coordinates of the lower and upper corners** of the block in question, **in index space**.
+`ng(1:3)` is the **number of grid points along each direction** of the block in question.
 
 `lmin(1:3)` and `lmax(1:3)` are the **physical coordinates of the lower and upper corners** of the block in question.
 
diff --git a/src/geo/block.001 b/src/geo/block.001
@@ -1,6 +1,5 @@
 1 1 1                    ! dims(1:3)
-1  1  1                  ! lo(1:3)
-32 32 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 0. 0. 0.                 ! lmin(1:3)
 .5 .5 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/src/geo/block.002 b/src/geo/block.002
@@ -1,6 +1,5 @@
 1 1 1                    ! dims(1:3)
-1  33 1                  ! lo(1:3)
-32 64 64                 ! hi(1:3)
+32 32 64                 ! ng(1:3)
 0. .5 0.                 ! lmin(1:3)
 .5 1. 1.                 ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/src/geo/block.003 b/src/geo/block.003
@@ -1,6 +1,5 @@
 2 1 1                    ! dims(1:3)
-33  33 1                 ! lo(1:3)
-128 64 64                ! hi(1:3)
+96 32 64                 ! ng(1:3)
 .5 .5 0.                 ! lmin(1:3)
 2.0 1. 1.                ! lmax(1:3)
 0 0 0                    ! gt(1:3)
diff --git a/src/initgrid.f90 b/src/initgrid.f90
@@ -88,16 +88,19 @@ subroutine distribute_grid(lo_g,lo,hi,grid_g,grid)
     real(rp), intent(out), dimension(lo  -1:) :: grid
     grid(lo-1:hi+1) = grid_g(lo-1:hi+1)
   end subroutine distribute_grid
-  subroutine bound_grid(lo_g,hi_g,lo,hi,nb,is_periodic,lo_min,hi_max,grid_f,grid_c)
+  subroutine bound_grid(lo_g,hi_g,lo,hi,nb,is_periodic,grid_f,grid_c)
     implicit none
     integer , intent(in   )                   :: lo_g,hi_g,lo,hi
     integer , intent(in   ), dimension(0:1)   :: nb
     logical , intent(in   )                   :: is_periodic
-    integer , intent(in   )                   :: lo_min,hi_max
     real(rp), intent(inout), dimension(lo-1:) :: grid_f,grid_c
+    integer                                   :: lo_min,hi_max
     integer                                   :: shift
     type(MPI_REQUEST), dimension(4)           :: requests
     integer                                   :: nrequests
+    !
+    call MPI_ALLREDUCE(lo,lo_min,1,MPI_INTEGER,MPI_MIN,MPI_COMM_WORLD)
+    call MPI_ALLREDUCE(hi,hi_max,1,MPI_INTEGER,MPI_MAX,MPI_COMM_WORLD)
     nrequests = 0
     shift = 0
     if(lo == lo_g) then
diff --git a/src/initmpi.f90 b/src/initmpi.f90
diff --git a/src/main.f90 b/src/main.f90
diff --git a/src/param.f90 b/src/param.f90
diff --git a/src/sanity.f90 b/src/sanity.f90
diff --git a/tests/lid_driven_cavity/geo/block.001 b/tests/lid_driven_cavity/geo/block.001
diff --git a/tests/lid_driven_cavity/geo/block.002 b/tests/lid_driven_cavity/geo/block.002
diff --git a/tests/lid_driven_cavity/geo/block.003 b/tests/lid_driven_cavity/geo/block.003
diff --git a/tests/lid_driven_cavity/geo/block.004 b/tests/lid_driven_cavity/geo/block.004
