Merge branch 'MFlowCode:master' into master

MFlowCode · Sep 30, 2023 · 2663a46 · 2663a46
2 parents bcff0d7 + 38ef7b9
commit 2663a46
Show file tree

Hide file tree

Showing 63 changed files with 3,283 additions and 1,272 deletions.
diff --git a/docs/documentation/case.md b/docs/documentation/case.md
@@ -541,7 +541,12 @@ The table lists velocity field parameters. The parameters are optionally used to
 |  -10 | Characteristic | Constant pressure subsonic outflow |
 |  -11 | Characteristic | Supersonic inflow |
 |  -12 | Characteristic | Supersonic outflow |
-
+|  -14 | Normal         | Axis * |
+|  -15 | Normal         | Slip wall |
+|  -16 | Normal         | No-slip wall |
+
+*: This boundary condition is only used for `bc_y%beg` when using cylindrical coordinates (`cyl_coord = 'T'` and 3d). For axisymmetric problems, use `bc_y%beg = -2` with `cyl_coord = 'T'` in 2D.
+
 The boundary condition supported by the MFC are listed in table [Boundary Conditions](#boundary-conditions). Their number (`#`)
 corresponds to the input value in `input.py` labeled `bc_[x,y,z]%[beg,end]` (see table [Simulation Algorithm Parameters](#5-simulation-algorithm)).
 The entries labeled "Characteristic." are characteristic boundary conditions based on [Thompson (1987)](references.md#Thompson87) and [Thompson (1990)](references.md#Thompson90).
@@ -569,7 +574,7 @@ The entries labeled "Characteristic." are characteristic boundary conditions bas
 | 17   | Spiral             | 2     | N      | Requires `[x,y]_centroid` |
 | 18   | 2D Varcircle       | 2     | Y      | Requires `[x,y]_centroid`, `radius`, and `thickness` |
 | 19   | 3D Varcircle       | 3     | Y      | Requires `[x,y,z]_centroid`, `length_z`, `radius`, and `thickness` |
-| 21   | Model              | 2 & 3 | Y      | Imports a Model (STL/OBJ). Requires `model%filepath`. | |
+| 21   | Model              | 2 & 3 | Y      | Imports a Model (STL/OBJ). Requires `model%filepath`. |
 
 The patch types supported by the MFC are listed in table [Patch Types](#patch-types). This includes
 types exclusive to one-, two-, and three-dimensional problems. The patch type number (`#`)

diff --git a/src/post_process/m_checker.f90 b/src/post_process/m_checker.f90
@@ -106,10 +106,10 @@ subroutine s_check_inputs()
                 'weno_order. Exiting ...')
 
             ! Constraints on the boundary conditions in the x-direction
-        elseif (bc_x%beg < -12 .or. bc_x%beg > -1) then
+        elseif (bc_x%beg < -16 .or. bc_x%beg > -1 .or. bc_x%beg == -14) then
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_x%beg. Exiting ...')
-        elseif (bc_x%end < -12 .or. bc_x%end > -1) then
+        elseif (bc_x%end < -16 .or. bc_x%end > -1 .or. bc_x%beg == -14) then
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_x%end. Exiting ...')
         elseif ((bc_x%beg == -1 .and. bc_x%end /= -1) &
@@ -126,16 +126,16 @@ subroutine s_check_inputs()
                    .or. &
                    (cyl_coord .and. p == 0)) &
                   .and. &
-                  (bc_y%beg < -12 .or. bc_y%beg > -1)) &
+                  (bc_y%beg < -16 .or. bc_y%beg > -1 .or. bc_y%beg == -14)) &
                  .or. &
                  (cyl_coord .and. p > 0 &
                   .and. &
-                  (bc_y%beg < -13 .or. bc_y%beg > -1)))) then
+                  (bc_y%beg < -16 .or. bc_y%beg > -1)))) then
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_y%beg. Exiting ...')
         elseif (bc_y%end /= dflt_int &
                 .and. &
-                (bc_y%end < -12 .or. bc_y%end > -1)) then
+                (bc_y%end < -16 .or. bc_y%end > -1 .or. bc_y%end == -14)) then
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_y%end. Exiting ...')
         elseif ((n == 0 .and. bc_y%beg /= dflt_int) &
@@ -160,14 +160,16 @@ subroutine s_check_inputs()
             ! Constraints on the boundary conditions in the z-direction
         elseif (bc_z%beg /= dflt_int &
                 .and. &
-                (bc_z%beg < -12 .or. bc_z%beg > -1)) then
+                (bc_z%beg < -16 .or. bc_z%beg > -1 .or. bc_z%beg == -14)) then
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_z%beg. Exiting ...')
         elseif (bc_z%end /= dflt_int &
                 .and. &
-                (bc_z%end < -12 .or. bc_z%end > -1)) then 
+                (bc_z%end < -16 .or. bc_z%end > -1 .or. bc_z%end == -14)) then 
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_z%end. Exiting ...')
+        elseif (any((/bc_x%beg, bc_x%end, bc_y%beg, bc_y%end, bc_z%beg, bc_z%end/) == -13)) then
+            call s_mpi_abort('Unsupported coice of boundary condition -13')
         elseif ((p == 0 .and. bc_z%beg /= dflt_int) &
                 .or. &
                 (p > 0 .and. bc_z%beg == dflt_int)) then 

diff --git a/src/post_process/m_data_input.f90 b/src/post_process/m_data_input.f90
@@ -458,14 +458,14 @@ subroutine s_populate_grid_variables_buffer_regions() ! ----------------
         if (n > 0) then
 
             ! Ghost-cell extrapolation BC at the beginning
-            if (bc_y%beg <= -3 .and. bc_y%beg /= -13) then
+            if (bc_y%beg <= -3 .and. bc_y%beg /= -14) then
 
                 do i = 1, buff_size
                     dy(-i) = dy(0)
                 end do
 
                 ! Symmetry BC at the beginning
-            elseif (bc_y%beg == -2 .or. bc_y%beg == -13) then
+            elseif (bc_y%beg == -2 .or. bc_y%beg == -14) then
 
                 do i = 1, buff_size
                     dy(-i) = dy(i - 1)
@@ -734,7 +734,7 @@ subroutine s_populate_conservative_variables_buffer_regions() ! --------
         if (n > 0) then
 
             ! Ghost-cell extrapolation BC at the beginning
-            if (bc_y%beg <= -3 .and. bc_y%beg /= -13) then
+            if (bc_y%beg <= -3 .and. bc_y%beg /= -14) then
 
                 do j = 1, buff_size
                     do i = 1, sys_size
@@ -743,7 +743,7 @@ subroutine s_populate_conservative_variables_buffer_regions() ! --------
                 end do
 
                 ! Axis BC at the beginning
-            elseif (bc_y%beg == -13) then
+            elseif (bc_y%beg == -14) then
 
                 do j = 1, buff_size
                     do k = 0, p

diff --git a/src/post_process/m_global_parameters.f90 → src/post_process/m_global_parameters.fpp b/src/post_process/m_global_parameters.f90 → src/post_process/m_global_parameters.fpp
@@ -271,12 +271,9 @@ subroutine s_assign_default_values_to_user_inputs() ! ------------------
         alt_soundspeed = .false.
         hypoelasticity = .false.
 
-        bc_x%beg = dflt_int
-        bc_x%end = dflt_int
-        bc_y%beg = dflt_int
-        bc_y%end = dflt_int
-        bc_z%beg = dflt_int
-        bc_z%end = dflt_int
+        bc_x%beg = dflt_int; bc_x%end = dflt_int
+        bc_y%beg = dflt_int; bc_y%end = dflt_int
+        bc_z%beg = dflt_int; bc_z%end = dflt_int
 
         ! Fluids physical parameters
         do i = 1, num_fluids_max

diff --git a/src/pre_process/m_checker.f90 b/src/pre_process/m_checker.f90
@@ -402,11 +402,11 @@ subroutine s_check_inputs()
                 'values for num_procs, m, n, p and '// &
                 'weno_order. Exiting ...')
 
-            ! Constraints on the boundary conditions in the x-direction
-        elseif (bc_x%beg < -12 .or. bc_x%beg > -1) then
+        ! Constraints on the boundary conditions in the x-direction
+        elseif (bc_x%beg < -16 .or. bc_x%beg > -1 .or. bc_x%beg == -14) then
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_x%beg. Exiting ...')
-        elseif (bc_x%end < -12 .or. bc_x%end > -1) then
+        elseif (bc_x%end < -16 .or. bc_x%end > -1 .or. bc_x%beg == -14) then
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_x%end. Exiting ...')
         elseif ((bc_x%beg == -1 .and. bc_x%end /= -1) &
@@ -422,14 +422,14 @@ subroutine s_check_inputs()
             ! Constraints on the boundary conditions in the r-direction
             if (bc_y%beg /= dflt_int &
                 .and. &
-                ((p > 0 .and. bc_y%beg /= -13) &
+                ((p > 0 .and. bc_y%beg /= -14) &
                  .or. &
                  (p == 0 .and. bc_y%beg /= -2))) then
                 call s_mpi_abort('Unsupported choice for the value of '// &
                     'bc_y%beg. Exiting ...')
             elseif (bc_y%end /= dflt_int &
                     .and. &
-                    (bc_y%end < -12 .or. bc_y%end > -1)) then
+                    (bc_y%end < -16 .or. bc_y%end > -1 .or. bc_y%end == -14)) then
                 call s_mpi_abort('Unsupported choice for the value of '// &
                     'bc_y%end. Exiting ...')
             elseif ((n > 0 .and. bc_y%beg == dflt_int)) then
@@ -475,12 +475,12 @@ subroutine s_check_inputs()
             ! Constraints on the boundary conditions in the y-direction
             if (bc_y%beg /= dflt_int &
                 .and. &
-                (bc_y%beg < -12 .or. bc_y%beg > -1)) then
+                (bc_y%beg < -16 .or. bc_y%beg > -1 .or. bc_y%beg == -14)) then
                 call s_mpi_abort('Unsupported choice for the value of '// &
                     'bc_y%beg. Exiting ...')
             elseif (bc_y%end /= dflt_int &
                     .and. &
-                    (bc_y%end < -12 .or. bc_y%end > -1)) then
+                    (bc_y%end < -16 .or. bc_y%end > -1 .or. bc_y%end == -14)) then
                 call s_mpi_abort('Unsupported choice for the value of '// &
                     'bc_y%end. Exiting ...')
             elseif ((n == 0 .and. bc_y%beg /= dflt_int) &
@@ -505,14 +505,16 @@ subroutine s_check_inputs()
             ! Constraints on the boundary conditions in the z-direction
             elseif (bc_z%beg /= dflt_int &
                     .and. &
-                    (bc_z%beg < -12 .or. bc_z%beg > -1)) then
+                    (bc_z%beg < -16 .or. bc_z%beg > -1 .or. bc_z%beg == -14)) then
                 call s_mpi_abort('Unsupported choice for the value of '// &
                     'bc_z%beg. Exiting ...')
             elseif (bc_z%end /= dflt_int &
                     .and. &
-                    (bc_z%end < -12 .or. bc_z%end > -1)) then
+                    (bc_z%end < -16 .or. bc_z%end > -1 .or. bc_z%end == -14)) then
                 call s_mpi_abort('Unsupported choice for the value of '// &
                 'bc_z%end. Exiting ...')
+            elseif (any((/bc_x%beg, bc_x%end, bc_y%beg, bc_y%end, bc_z%beg, bc_z%end/) == -13)) then
+                call s_mpi_abort('Unsupported coice of boundary condition -13')
             elseif ((p == 0 .and. bc_z%beg /= dflt_int) &
                     .or. &
                     (p > 0 .and. bc_z%beg == dflt_int)) then

diff --git a/src/pre_process/m_global_parameters.fpp b/src/pre_process/m_global_parameters.fpp
@@ -244,12 +244,9 @@ contains
 
         hypoelasticity = .false.
 
-        bc_x%beg = dflt_int
-        bc_x%end = dflt_int
-        bc_y%beg = dflt_int
-        bc_y%end = dflt_int
-        bc_z%beg = dflt_int
-        bc_z%end = dflt_int
+        bc_x%beg = dflt_int; bc_x%end = dflt_int
+        bc_y%beg = dflt_int; bc_y%end = dflt_int
+        bc_z%beg = dflt_int; bc_z%end = dflt_int
 
         parallel_io = .false.
         precision = 2

diff --git a/src/pre_process/m_patches.fpp b/src/pre_process/m_patches.fpp
@@ -19,6 +19,8 @@ module m_patches
 
     use m_helper
 
+    use m_mpi_common
+
     use m_assign_variables
 
     use m_mpi_common
@@ -871,6 +873,7 @@ contains
         ! permission to write to that cell. If both queries check out,
         ! the primitive variables of the current patch are assigned
         ! to this cell.
+
         do j = 0, n
             do i = 0, m
                 if (x_boundary%beg <= x_cc(i) .and. &