Make Dirichlet boundary policy explicit

Author: sbryngelson

src/common/m_boundary_common.fpp

@@ -34,9 +34,14 @@ module m_boundary_common
 contains
 
     !> Allocate and set up boundary condition buffer arrays for all coordinate directions.
-    impure subroutine s_initialize_boundary_common_module()
+    impure subroutine s_initialize_boundary_common_module(use_dirichlet_buffers)
 
-        integer :: i, j, sys_size_alloc
+        integer                       :: i, j, sys_size_alloc
+        logical, intent(in), optional :: use_dirichlet_buffers
+
+        dirichlet_from_buffers = .false.
+        if (present(use_dirichlet_buffers)) dirichlet_from_buffers = use_dirichlet_buffers
+        $:GPU_UPDATE(device='[dirichlet_from_buffers]')
 
         @:ALLOCATE(bc_buffers(1:3, 1:2))
 

src/common/m_boundary_primitives.fpp

@@ -18,6 +18,9 @@ module m_boundary_primitives
     type(scalar_field), dimension(:,:), allocatable :: bc_buffers
     $:GPU_DECLARE(create='[bc_buffers]')
 
+    logical :: dirichlet_from_buffers
+    $:GPU_DECLARE(create='[dirichlet_from_buffers]')
+
 contains
 
     !> Fill ghost cells by copying the nearest boundary cell value along the specified direction.
@@ -904,7 +907,11 @@ contains
         integer                                                :: j, i
         type(scalar_field), optional, intent(inout)            :: q_T_sf
 
-#ifdef MFC_SIMULATION
+        if (.not. dirichlet_from_buffers) then
+            call s_ghost_cell_extrapolation(q_prim_vf, bc_dir, bc_loc, k, l, q_T_sf)
+            return
+        end if
+
         if (bc_dir == 1) then  !< x-direction
             if (bc_loc == -1) then  ! bc_x%beg
                 do i = 1, sys_size
@@ -982,9 +989,6 @@ contains
                 end if
             #:endif
         end if
-#else
-        call s_ghost_cell_extrapolation(q_prim_vf, bc_dir, bc_loc, k, l, q_T_sf)
-#endif
 
     end subroutine s_dirichlet
 

src/simulation/m_start_up.fpp

@@ -845,7 +845,7 @@ contains
         call s_initialize_derived_variables_module()
         call s_initialize_time_steppers_module()
 
-        call s_initialize_boundary_common_module()
+        call s_initialize_boundary_common_module(use_dirichlet_buffers=.true.)
 
         if (down_sample) then
             m_ds = int((m + 1)/3) - 1