asdf

Author: wilfonba

src/pre_process/m_data_output.fpp

@@ -157,15 +157,10 @@ contains
             status = 'new'
         end if
 
-        checkboundary1: do i = 1, num_bc_patches
-            if (bc_x%beg == -17 .or. bc_x%beg == -17 &
-                .or. bc_y%beg == -17 .or. bc_y%end == -17 &
-                .or. bc_z%beg == -17 .or. bc_z%end == -17 &
-                .or. patch_bc(i)%type == -17) then
-                    call s_write_serial_boundary_condition_files(q_prim_vf, bc_type, t_step_dir)
-                    exit checkboundary1
-            end if
-        end do checkboundary1
+        if (save_bc) then
+            call s_write_serial_boundary_condition_files(q_prim_vf, bc_type, t_step_dir)
+        end if
+
         ! x-coordinate direction
         file_loc = trim(t_step_dir)//'/x_cb.dat'
         open (1, FILE=trim(file_loc), FORM='unformatted', STATUS=status)
@@ -849,15 +844,9 @@ contains
         end if
 #endif
 
-    checkboundary2: do i = 1, num_bc_patches
-        if (bc_x%beg == -17 .or. bc_x%beg == -17 &
-            .or. bc_y%beg == -17 .or. bc_y%end == -17 &
-            .or. bc_z%beg == -17 .or. bc_z%end == -17 &
-            .or. patch_bc(i)%type == -17) then
-                call s_write_parallel_boundary_condition_files(q_prim_vf, bc_type)
-                exit checkboundary2
+        if (save_bc) then
+            call s_write_parallel_boundary_condition_files(q_prim_vf, bc_type)
         end if
-    end do checkboundary2
 
     end subroutine s_write_parallel_data_files
 

src/pre_process/m_global_parameters.fpp

@@ -177,6 +177,7 @@ module m_global_parameters
     !! in the module m_derived_types.f90.
 
     integer :: num_bc_patches  !< Number of boundary condition patches
+    logical :: save_bc !< whether or not to save BC data
     type(bc_patch_parameters), dimension(num_bc_patches_max) :: patch_bc
     !! Database of the boundary condition patch parameters for each of the patches
     !! employed in the configuration of the boundary conditions
@@ -422,6 +423,7 @@ contains
         end do
 
         num_bc_patches = 0
+        save_bc = .false.
 
         do i = 1, num_bc_patches_max
             patch_bc(i)%geometry = dflt_int

src/pre_process/m_mpi_proxy.fpp

@@ -70,7 +70,7 @@ contains
             & 'qbmm', 'file_per_process', 'adv_n', 'ib' , 'cfl_adap_dt',       &
             & 'cfl_const_dt', 'cfl_dt', 'surface_tension',                     &
             & 'hyperelasticity', 'pre_stress', 'elliptic_smoothing', 'viscous',&
-            & 'bubbles_lagrange' ]
+            & 'bubbles_lagrange', 'save_bc' ]
             call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
         #:endfor
         call MPI_BCAST(fluid_rho(1), num_fluids_max, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)

src/pre_process/m_start_up.fpp

@@ -178,6 +178,12 @@ contains
 
             if (cfl_adap_dt .or. cfl_const_dt .or. rkck_adap_dt) cfl_dt = .true.
 
+
+            if (any((/bc_x%beg, bc_x%end, bc_y%beg, bc_y%end, bc_z%beg, bc_z%end/) == -17) .or. &
+                num_bc_patches > 0) then
+                save_bc = .true.
+            end if
+
         else
             call s_mpi_abort('File pre_process.inp is missing. Exiting.')
         end if

src/simulation/m_global_parameters.fpp

@@ -180,8 +180,9 @@ module m_global_parameters
 !#ifndef _CRAYFTN
 !$acc declare create(relax, relax_model, palpha_eps,ptgalpha_eps)
 !#endif
-    
+
     integer :: num_bc_patches
+    logical :: read_bc
     !> @name Boundary conditions (BC) in the x-, y- and z-directions, respectively
     !> @{
     type(int_bounds_info) :: bc_x, bc_y, bc_z
@@ -549,6 +550,7 @@ contains
         chem_params%gamma_method = 1
 
         num_bc_patches = 0
+        read_bc = .false.
 
         bc_x%beg = dflt_int; bc_x%end = dflt_int
         bc_y%beg = dflt_int; bc_y%end = dflt_int
@@ -1171,12 +1173,12 @@ contains
         @:ALLOCATE(x_cc(-buff_size:m + buff_size))
         @:ALLOCATE(dx(-buff_size:m + buff_size))
 
-        if (n == 0) return; 
+        if (n == 0) return;
         @:ALLOCATE(y_cb(-1 - buff_size:n + buff_size))
         @:ALLOCATE(y_cc(-buff_size:n + buff_size))
         @:ALLOCATE(dy(-buff_size:n + buff_size))
 
-        if (p == 0) return; 
+        if (p == 0) return;
         @:ALLOCATE(z_cb(-1 - buff_size:p + buff_size))
         @:ALLOCATE(z_cc(-buff_size:p + buff_size))
         @:ALLOCATE(dz(-buff_size:p + buff_size))
@@ -1249,10 +1251,10 @@ contains
         ! Deallocating grid variables for the x-, y- and z-directions
         @:DEALLOCATE(x_cb, x_cc, dx)
 
-        if (n == 0) return; 
+        if (n == 0) return;
         @:DEALLOCATE(y_cb, y_cc, dy)
 
-        if (p == 0) return; 
+        if (p == 0) return;
         @:DEALLOCATE(z_cb, z_cc, dz)
 
     end subroutine s_finalize_global_parameters_module

src/simulation/m_mpi_proxy.fpp

@@ -137,7 +137,7 @@ contains
             & 'bc_z%grcbc_in', 'bc_z%grcbc_out', 'bc_z%grcbc_vel_out',          &
             & 'cfl_adap_dt', 'cfl_const_dt', 'cfl_dt', 'surface_tension',        &
             & 'viscous', 'shear_stress', 'bulk_stress', 'bubbles_lagrange',     &
-            & 'hyperelasticity', 'rkck_adap_dt' ]
+            & 'hyperelasticity', 'rkck_adap_dt', 'read_bc' ]
             call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
         #:endfor
 

src/simulation/m_start_up.fpp

@@ -211,6 +211,11 @@ contains
 
             if (cfl_adap_dt .or. cfl_const_dt .or. rkck_adap_dt) cfl_dt = .true.
 
+            if (any((/bc_x%beg, bc_x%end, bc_y%beg, bc_y%end, bc_z%beg, bc_z%end/) == -17) .or. &
+                num_bc_patches /= dflt_int) then
+                read_bc = .true.
+            endif
+
         else
             call s_mpi_abort(trim(file_path)//' is missing. Exiting.')
         end if
@@ -281,7 +286,7 @@ contains
             call s_mpi_abort(trim(file_path)//' is missing. Exiting.')
         end if
 
-        if (num_bc_patches > 0) then
+        if (read_bc) then
             call s_read_serial_boundary_condition_files(t_step_dir, bc_type)
         else
             call s_assign_default_bc_type(bc_type)
@@ -941,7 +946,7 @@ contains
 
         deallocate (x_cb_glb, y_cb_glb, z_cb_glb)
 
-        if (num_bc_patches > 0) then
+        if (read_bc) then
             call s_read_parallel_boundary_condition_files(bc_type)
         else
             call s_assign_default_bc_type(bc_type)