Merge branch 'mpi_time' of https://github.com/max-Hawkins/MFC into mpi_time

Conflicts:
	src/simulation/m_data_output.fpp
	src/simulation/m_rhs.fpp

Author: max-Hawkins

src/simulation/m_data_output.fpp

@@ -236,6 +236,19 @@ contains
         real(kind(0d0)), dimension(2) :: Re         !< Cell-avg. Reynolds numbers
         integer :: j, k, l
 
+        ! ICFL, VCFL, CCFL and Rc stability criteria extrema for the current
+        ! time-step and located on both the local (loc) and the global (glb)
+        ! computational domains
+
+        real(kind(0d0)) :: blkmod1, blkmod2 !<
+            !! Fluid bulk modulus for Woods mixture sound speed
+
+        integer :: i, j, k, l, q !< Generic loop iterators
+
+        integer :: Nfq
+        real(kind(0d0)) :: fltr_dtheta   !<
+            !! Modified dtheta accounting for Fourier filtering in azimuthal direction.
+
         call nvtxStartRange("TSTEP-RUNTIME-INFO")
         ! Computing Stability Criteria at Current Time-step ================
         call nvtxStartRange("TSTEP-RUNTIME-INFO-COMPUTE-LOCAL")

src/simulation/m_rhs.fpp

@@ -700,8 +700,21 @@ contains
         real(kind(0d0)), intent(inout) :: time_avg
 
         real(kind(0d0)), dimension(0:m, 0:n, 0:p) :: nbub
-        real(kind(0d0)) :: t_start, t_finish
-        integer :: i, j, k, l, id !< Generic loop iterators
+        integer :: ndirs
+
+        real(kind(0d0)) :: sound
+        real(kind(0d0)) :: start, finish
+        real(kind(0d0)) :: s2, const_sos, s1
+
+        integer :: i, c, j, k, l, q, ii, id !< Generic loop iterators
+        integer :: term_index
+
+        call nvtxStartRange("RHS")
+
+        ! Configuring Coordinate Direction Indexes =========================
+        ix%beg = -buff_size; iy%beg = 0; iz%beg = 0
+
+        if (n > 0) iy%beg = -buff_size; if (p > 0) iz%beg = -buff_size
 
         call nvtxStartRange("COMPUTE-RHS")
 
@@ -750,7 +763,7 @@ contains
             gm_alpha_qp%vf)
         call nvtxEndRange
 
-        call nvtxStartRange("RHS-MPI+BUFPACK")
+        call nvtxStartRange("RHS-COMM")
         call s_populate_variables_buffers(q_prim_qp%vf, pb, mv)
         call nvtxEndRange
 
@@ -776,9 +789,11 @@ contains
                                         idwbuff(1), idwbuff(2), idwbuff(3))
         call nvtxEndRange
 
-        call nvtxStartRange("RHS-SURFACE-TENSION")
-        if (surface_tension) call s_get_capilary(q_prim_qp%vf)
-        call nvtxEndRange
+        if (surface_tension)
+            call nvtxStartRange("RHS-SURFACE-TENSION")
+            call s_get_capilary(q_prim_qp%vf)
+            call nvtxEndRange
+        end if
         ! Dimensional Splitting Loop =======================================
 
         do id = 1, num_dims
@@ -857,7 +872,6 @@ contains
             end if
             irx%end = m; iry%end = n; irz%end = p
             ! ===============================================================
-
             call nvtxStartRange("RHS-RIEMANN-SOLVER")
 
             ! Computing Riemann Solver Flux and Source Flux =================