correct merge errors

Author: wilfonba

src/common/m_mpi_common.fpp

@@ -404,21 +404,17 @@ contains
     impure subroutine s_mpi_reduce_stability_criteria_extrema(icfl_max_loc, &
                                                               vcfl_max_loc, &
                                                               Rc_min_loc, &
-                                                              ccfl_max_loc, &
                                                               icfl_max_glb, &
                                                               vcfl_max_glb, &
-                                                              Rc_min_glb, &
-                                                              ccfl_max_glb)
+                                                              Rc_min_glb)
 
         real(wp), intent(in) :: icfl_max_loc
         real(wp), intent(in) :: vcfl_max_loc
         real(wp), intent(in) :: Rc_min_loc
-        real(wp), intent(in) :: ccfl_max_loc
 
         real(wp), intent(out) :: icfl_max_glb
         real(wp), intent(out) :: vcfl_max_glb
         real(wp), intent(out) :: Rc_min_glb
-        real(wp), intent(out) :: ccfl_max_glb
 
 #ifdef MFC_SIMULATION
 #ifdef MFC_MPI
@@ -438,24 +434,13 @@ contains
                             mpi_p, MPI_MIN, 0, &
                             MPI_COMM_WORLD, ierr)
         end if
-
-        if (surface_tension) then
-            call MPI_REDUCE(ccfl_max_loc, ccfl_max_glb, 1, &
-                            mpi_p, MPI_MAX, 0, &
-                            MPI_COMM_WORLD, ierr)
-        end if
-
 #else
-
         icfl_max_glb = icfl_max_loc
 
         if (viscous) then
             vcfl_max_glb = vcfl_max_loc
             Rc_min_glb = Rc_min_loc
         end if
-
-        if (surface_tension) ccfl_max_glb = ccfl_max_loc
-
 #endif
 #endif
 

src/post_process/m_mpi_proxy.fpp

@@ -104,17 +104,8 @@ contains
             & 'file_per_process', 'relax', 'cf_wrt', 'igr', 'liutex_wrt',      &
             & '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', 'down_sample' ]
-=======
             & 'output_partial_domain', 'relativity', 'cont_damage', 'bc_io',   &
             & 'down_sample' ]
->>>>>>> ImprovedELBubblesIO
             call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
         #:endfor