Merge branch 'master' into fp-stability

Author: sbryngelson

src/pre_process/m_perturbation.fpp

@@ -63,7 +63,7 @@ contains
 
         type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf
         integer                                                :: i, j, k
-        real(wp)                                               :: rand_real
+        real(wp)                                               :: rand_real, v_beg
 
         call random_seed()
 
@@ -72,8 +72,9 @@ contains
                 do i = 0, m
                     call random_number(rand_real)
                     rand_real = rand_real*perturb_flow_mag
-                    q_prim_vf(eqn_idx%mom%end)%sf(i, j, k) = rand_real*q_prim_vf(eqn_idx%mom%beg)%sf(i, j, k)
-                    q_prim_vf(eqn_idx%mom%beg)%sf(i, j, k) = (1._wp + rand_real)*q_prim_vf(eqn_idx%mom%beg)%sf(i, j, k)
+                    v_beg = q_prim_vf(eqn_idx%mom%beg)%sf(i, j, k)
+                    q_prim_vf(eqn_idx%mom%beg)%sf(i, j, k) = (1._wp + rand_real)*v_beg
+                    if (num_vels > 1) q_prim_vf(eqn_idx%mom%end)%sf(i, j, k) = rand_real*v_beg
                     if (bubbles_euler) then
                         q_prim_vf(eqn_idx%alf)%sf(i, j, k) = (1._wp + rand_real)*q_prim_vf(eqn_idx%alf)%sf(i, j, k)
                     end if

src/simulation/m_rhs.fpp

@@ -1827,13 +1827,11 @@ contains
                     end if
                 end if
 
-                if (cyl_coord) then
-                    do i = 1, num_dims
-                        @:DEALLOCATE(tau_re_vf(eqn_idx%cont%end + i)%sf)
-                    end do
-                    @:DEALLOCATE(tau_re_vf(eqn_idx%E)%sf)
-                    @:DEALLOCATE(tau_re_vf)
-                end if
+                do i = 1, num_dims
+                    @:DEALLOCATE(tau_Re_vf(eqn_idx%cont%end + i)%sf)
+                end do
+                @:DEALLOCATE(tau_Re_vf(eqn_idx%E)%sf)
+                @:DEALLOCATE(tau_Re_vf)
             end if
             @:DEALLOCATE(dqL_prim_dx_n, dqL_prim_dy_n, dqL_prim_dz_n)
             @:DEALLOCATE(dqR_prim_dx_n, dqR_prim_dy_n, dqR_prim_dz_n)