Fix acoustic source and body force timing

src/simulation/m_acoustic_src.fpp

@@ -124,23 +124,16 @@ contains
     end subroutine s_initialize_acoustic_src
 
     !> This subroutine updates the rhs by computing the mass, mom, energy sources
-    !! @param t_step Current time step
+    !! @param q_cons_vf Conservative variables
+    !! @param q_prim_vf Primitive variables
     !! @param rhs_vf rhs variables
-    impure subroutine s_acoustic_src_calculations(q_cons_vf, q_prim_vf, t_step, rhs_vf)
+    impure subroutine s_acoustic_src_calculations(q_cons_vf, q_prim_vf, rhs_vf)
 
-        type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf !<
-        !! This variable contains the WENO-reconstructed values of the cell-average
-        !! conservative variables, which are located in q_cons_vf, at cell-interior
-        !! Gaussian quadrature points (QP).
-
-        type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf !<
-        !! The primitive variables at cell-interior Gaussian quadrature points. These
-        !! are calculated from the conservative variables and gradient magnitude (GM)
-        !! of the volume fractions, q_cons_qp and gm_alpha_qp, respectively.
+        type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf !< Conservative variables
+        type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf !< Primitive variables
 
         type(scalar_field), dimension(sys_size), intent(inout) :: rhs_vf
 
-        integer, intent(in) :: t_step
         #:if not MFC_CASE_OPTIMIZATION and USING_AMD
             real(wp), dimension(3) :: myalpha, myalpha_rho
         #:else
@@ -165,7 +158,7 @@ contains
 
         integer, parameter :: mass_label = 1, mom_label = 2
 
-        sim_time = t_step*dt
+        sim_time = mytime ! Accumulated time, correct under adaptive dt
 
         $:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
         do l = 0, p
@@ -181,7 +174,7 @@ contains
         end do
         $:END_GPU_PARALLEL_LOOP()
 
-        ! Keep outer loop sequel because different sources can have very different number of points
+        ! Keep outer loop sequential because different sources can have very different number of points
         do ai = 1, num_source
             ! Skip if the pulse has not started yet for sine and square waves
             if (.not. (sim_time < delay(ai) .and. (pulse(ai) == 1 .or. pulse(ai) == 3))) then

src/simulation/m_body_forces.fpp

@@ -72,7 +72,7 @@ contains
 
     !> This subroutine calculates the mixture density at each cell
     !! center
-    !! param q_cons_vf Conservative variable
+    !! @param q_cons_vf Conservative variables
     subroutine s_compute_mixture_density(q_cons_vf)
 
         type(scalar_field), dimension(sys_size), intent(in) :: q_cons_vf

src/simulation/m_rhs.fpp

@@ -1010,13 +1010,12 @@ contains
             $:END_GPU_PARALLEL_LOOP()
         end if
 
-        ! Additional Physics and Source Temrs
+        ! Additional Physics and Source Terms
         ! Additions for acoustic_source
         if (acoustic_source) then
             call nvtxStartRange("RHS-ACOUSTIC-SRC")
             call s_acoustic_src_calculations(q_cons_qp%vf(1:sys_size), &
                                              q_prim_qp%vf(1:sys_size), &
-                                             t_step, &
                                              rhs_vf)
             call nvtxEndRange
         end if
@@ -1058,7 +1057,7 @@ contains
 
         if (cont_damage) call s_compute_damage_state(q_cons_qp%vf, rhs_vf)
 
-        ! END: Additional pphysics and source terms
+        ! END: Additional physics and source terms
 
         if (run_time_info .or. probe_wrt .or. ib .or. bubbles_lagrange) then
             if (.not. igr .or. dummy) then

src/simulation/m_start_up.fpp

@@ -32,7 +32,7 @@ module m_start_up
 
     use m_acoustic_src      !< Acoustic source calculations
 
-    use m_rhs                  !< Right-hane-side (RHS) evaluation procedures
+    use m_rhs                  !< Right-hand-side (RHS) evaluation procedures
 
     use m_chemistry            !< Chemistry module
 
@@ -845,13 +845,14 @@ contains
             end do
         end if
 
-        mytime = mytime + dt
-
         ! Total-variation-diminishing (TVD) Runge-Kutta (RK) time-steppers
         if (any(time_stepper == (/1, 2, 3/))) then
             call s_tvd_rk(t_step, time_avg, time_stepper)
         end if
 
+        ! Advance time after RK so source terms see current-step time
+        mytime = mytime + dt
+
         if (relax) call s_infinite_relaxation_k(q_cons_ts(1)%vf)
 
         ! Time-stepping loop controls