clean up

Author: sbryngelson

src/simulation/m_bubbles.fpp

@@ -57,7 +57,7 @@ contains
 
     subroutine s_initialize_bubbles_module
 
-        integer :: i, j, k, l, q
+        integer :: l
 
         @:ALLOCATE_GLOBAL(rs(1:nb))
         @:ALLOCATE_GLOBAL(vs(1:nb))
@@ -119,7 +119,7 @@ contains
         integer, intent(in) :: idir
         type(scalar_field), dimension(sys_size), intent(in) :: q_prim_vf
 
-        integer :: i, j, k, l, q
+        integer :: i, j, k, l
 
         if (idir == 1) then
 
@@ -183,18 +183,11 @@ contains
         real(kind(0d0)) :: rddot
         real(kind(0d0)) :: pb, mv, vflux, pbdot
         real(kind(0d0)) :: n_tait, B_tait
-
         real(kind(0d0)), dimension(nb) :: Rtmp, Vtmp
         real(kind(0d0)) :: myR, myV, alf, myP, myRho, R2Vav, R3
         real(kind(0d0)), dimension(num_fluids) :: myalpha, myalpha_rho
-        real(kind(0d0)) :: start, finish
-
         real(kind(0d0)) :: nbub !< Bubble number density
-
-        real(kind(0d0)), dimension(2) :: Re !< Reynolds number
-
         integer :: i, j, k, l, q, ii !< Loop variables
-        integer :: ndirs  !< Number of coordinate directions
 
         real(kind(0d0)) :: err1, err2, err3, err4, err5 !< Error estimates for adaptive time stepping
         real(kind(0d0)) :: t_new !< Updated time step size
@@ -452,7 +445,7 @@ contains
         real(kind(0d0)), intent(IN) :: fntait, fBtait, f_bub_adv_src, f_divu
         real(kind(0d0)), intent(out) :: h
 
-        real(kind(0d0)) :: h0, h1, h_min !< Time step size
+        real(kind(0d0)) :: h0, h1 !< Time step size
         real(kind(0d0)) :: d0, d1, d2 !< norms
         real(kind(0d0)), dimension(2) :: myR_tmp, myV_tmp, myA_tmp !< Bubble radius, radial velocity, and radial acceleration
 
@@ -912,7 +905,6 @@ contains
 
         real(kind(0.d0)) :: T_bar
         real(kind(0.d0)) :: grad_T
-        real(kind(0.d0)) :: tmp1, tmp2
         real(kind(0.d0)) :: f_bpres_dot
 
         if (thermal == 3) then

src/simulation/m_qbmm.fpp

@@ -776,7 +776,7 @@ contains
         real(kind(0.d0)), intent(inout) :: pres, rho, c
         real(kind(0.d0)), dimension(nterms, 0:2, 0:2), intent(out) :: coeffs
 
-        integer :: i1, i2, q
+        integer :: i1, i2
 
         coeffs = 0d0
 
@@ -841,20 +841,19 @@ contains
 
         real(kind(0d0)), dimension(nmom) :: moms, msum
         real(kind(0d0)), dimension(nnode, nb) :: wght, abscX, abscY, wght_pb, wght_mv, wght_ht, ht
-        real(kind(0d0)), dimension(nterms, 0:2, 0:2) :: mom3d_terms, coeff
-        real(kind(0d0)) :: pres, rho, nbub, c, alf, R3, momsum, drdt, drdt2, chi_vw, x_vw, rho_mw, k_mw, T_bar, grad_T
-        real(kind(0d0)) :: start, finish
+        real(kind(0d0)), dimension(nterms, 0:2, 0:2) :: coeff
+        real(kind(0d0)) :: pres, rho, nbub, c, alf, momsum, drdt, drdt2, chi_vw, x_vw, rho_mw, k_mw, T_bar, grad_T
         real(kind(0d0)) :: n_tait, B_tait
 
-        integer :: j, k, l, q, r, s !< Loop variables
         integer :: id1, id2, id3
         integer :: i1, i2
+        integer :: j, k, q, r
 
         is1_qbmm = ix; is2_qbmm = iy; is3_qbmm = iz
 
         !$acc update device(is1_qbmm, is2_qbmm, is3_qbmm)
 
-        !$acc parallel loop collapse(3) gang vector default(present) private(moms, msum, wght, abscX, abscY, wght_pb, wght_mv, wght_ht, coeff, ht, r, q, n_tait, B_tait, pres, rho, nbub, c, alf, R3, momsum, drdt, drdt2, chi_vw, x_vw, rho_mw, k_mw, T_bar, grad_T)
+        !$acc parallel loop collapse(3) gang vector default(present) private(moms, msum, wght, abscX, abscY, wght_pb, wght_mv, wght_ht, coeff, ht, r, q, n_tait, B_tait, pres, rho, nbub, c, alf, momsum, drdt, drdt2, chi_vw, x_vw, rho_mw, k_mw, T_bar, grad_T)
         do id3 = is3_qbmm%beg, is3_qbmm%end
             do id2 = is2_qbmm%beg, is2_qbmm%end
                 do id1 = is1_qbmm%beg, is1_qbmm%end