finish merge and test

Author: Benjamin Wilfong

src/common/m_mpi_common.fpp

@@ -413,6 +413,7 @@ contains
         integer, intent(inout) :: var_loc
 
 #ifdef MFC_MPI
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! Temporary storage variable that holds the reduced sum value
         integer :: var_glb
@@ -423,7 +424,6 @@ contains
                         MPI_SUM, 0, MPI_COMM_WORLD, ierr)
 
         var_loc = var_glb
-
 #endif
 
     end subroutine s_mpi_reduce_int_sum
@@ -1102,7 +1102,7 @@ contains
 
         integer :: recon_order !< reconstruction order
 
-        integer :: i, j !< Generic loop iterators
+        integer :: i, j, k !< Generic loop iterators
         integer :: ierr !< Generic flag used to identify and report MPI errors
 
         ! temp array to store neighbor rank coordinates

src/post_process/m_data_output.fpp

@@ -1614,6 +1614,8 @@ contains
         character(len=64), dimension(num_procs) :: var_names
         integer, dimension(num_procs) :: var_types
         real(wp) :: dummy_data
+
+        integer :: ierr !< Generic flag used to identify and report database errors
         integer :: i
 
         dummy_data = 0._wp

src/post_process/m_mpi_proxy.fpp

@@ -104,17 +104,12 @@ contains
             & 'file_per_process', 'relax', 'cf_wrt', 'igr',                    &
             & 'adv_n', 'ib', 'cfl_adap_dt', 'cfl_const_dt', 'cfl_dt',          &
             & 'surface_tension', 'hyperelasticity', 'bubbles_lagrange',        &
-<<<<<<< HEAD
             & 'output_partial_domain', 'relativity', 'cont_damage',            &
             & 'lag_header', 'lag_txt_wrt', 'lag_db_wrt', 'lag_id_wrt',         &
             & 'lag_pos_wrt', 'lag_pos_prev_wrt', 'lag_vel_wrt', 'lag_rad_wrt', &
             & 'lag_rvel_wrt', 'lag_r0_wrt', 'lag_rmax_wrt', 'lag_rmin_wrt',    &
             & 'lag_dphidt_wrt', 'lag_pres_wrt', 'lag_mv_wrt', 'lag_mg_wrt',    &
             & 'lag_betaT_wrt', 'lag_betaC_wrt', 'bc_io' ]
-=======
-            & 'output_partial_domain', 'relativity', 'cont_damage', 'bc_io' ]
-
->>>>>>> upstream/master
             call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
         #:endfor
 

src/pre_process/m_start_up.fpp

@@ -149,12 +149,8 @@ contains
             n_start_old, surface_tension, hyperelasticity, pre_stress, &
             elliptic_smoothing, elliptic_smoothing_iters, &
             viscous, bubbles_lagrange, bc_x, bc_y, bc_z, num_bc_patches, &
-<<<<<<< HEAD
             patch_bc, Bx0, relativity, cont_damage, fd_order, lag_params, &
-            interface_file, normFac, normMag, g0, p0
-=======
-            patch_bc, Bx0, relativity, cont_damage, igr, igr_order
->>>>>>> upstream/master
+            interface_file, normFac, normMag, g0, p0, igr, igr_order
 
         ! Inquiring the status of the pre_process.inp file
         file_loc = 'pre_process.inp'

src/simulation/m_mpi_proxy.fpp

@@ -90,6 +90,7 @@ contains
 
         integer :: i, j, k
         integer :: real_size, int_size, nReal, lag_num_ts
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         call MPI_Pack_size(1, mpi_p, MPI_COMM_WORLD, real_size, ierr)
         call MPI_Pack_size(1, MPI_INTEGER, MPI_COMM_WORLD, int_size, ierr)
@@ -140,13 +141,9 @@ contains
             & 'wave_speeds', 'avg_state', 'precision', 'bc_x%beg', 'bc_x%end', &
             & 'bc_y%beg', 'bc_y%end', 'bc_z%beg', 'bc_z%end',  'fd_order',     &
             & 'num_probes', 'num_integrals', 'bubble_model', 'thermal',        &
-<<<<<<< HEAD
-            & 'R0_type', 'num_source', 'relax_model', 'num_ibs', 'n_start',    &
-            & 'num_bc_patches', 'lag_params%vel_model']
-=======
             & 'num_source','relax_model','num_ibs','n_start','num_igr_iters',  &
-            & 'num_bc_patches','num_igr_warm_start_iters','adap_dt_max_iters'  ]
->>>>>>> upstream/master
+            & 'num_bc_patches','num_igr_warm_start_iters','adap_dt_max_iters', &
+            & 'lag_params%vel_model']
             call MPI_BCAST(${VAR}$, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
         #:endfor
 
@@ -667,6 +664,7 @@ contains
         integer :: position, bub_id, lag_num_ts, tag, partner, send_tag, recv_tag, nbubs, p_recv_size
 
         integer :: i, j, k, l, q
+        integer :: ierr !< Generic flag used to identify and report MPI errors
 
         do k = nidx(3)%beg, nidx(3)%end
             do j = nidx(2)%beg, nidx(2)%end