more clean

Author: sbryngelson

src/simulation/m_rhs.fpp

@@ -706,30 +706,9 @@ contains
         integer, intent(in) :: t_step
         real(kind(0d0)), intent(inout) :: time_avg
 
-        real(kind(0d0)) :: t_start, t_finish
-        real(kind(0d0)) :: gp_sum
-
-        real(kind(0d0)) :: top, bottom  !< Numerator and denominator when evaluating flux limiter function
-        real(kind(0d0)), dimension(num_fluids) :: myalpha_rho, myalpha
-
-        real(kind(0d0)) :: tmp1, tmp2, tmp3, tmp4, &
-                           c_gas, c_liquid, &
-                           Cpbw, Cpinf, Cpinf_dot, &
-                           myH, myHdot, rddot, alf_gas
-
-        real(kind(0d0)) :: n_tait, B_tait, angle, angle_z
-
-        real(kind(0d0)), dimension(nb) :: Rtmp, Vtmp
-        real(kind(0d0)) :: myR, myV, alf, myP, myRho, R2Vav
         real(kind(0d0)), dimension(0:m, 0:n, 0:p) :: nbub
-        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
+        real(kind(0d0)) :: t_start, t_finish
+        integer :: i, j, k, l, id !< Generic loop iterators
 
         call nvtxStartRange("Compute_RHS")
 
@@ -1600,7 +1579,7 @@ contains
         type(scalar_field), dimension(sys_size), intent(in) :: flux_src_n
         type(scalar_field), dimension(sys_size), intent(in) :: dq_prim_dx_vf, dq_prim_dy_vf, dq_prim_dz_vf
 
-        integer :: i, j, k, l, q
+        integer :: i, j, k, l
 
         if (idir == 1) then ! x-direction
 
@@ -2096,7 +2075,6 @@ contains
 
         integer :: weno_dir !< Coordinate direction of the WENO reconstruction
 
-        integer :: i, j, k, l
         ! Reconstruction in s1-direction ===================================
 
         if (norm_dir == 1) then
@@ -2220,7 +2198,7 @@ contains
     !> Module deallocation and/or disassociation procedures
     subroutine s_finalize_rhs_module
 
-        integer :: i, j, k, l !< Generic loop iterators
+        integer :: i, j, l
 
         do j = cont_idx%beg, cont_idx%end
             !$acc exit data detach(q_prim_qp%vf(j)%sf)

src/simulation/m_riemann_solvers.fpp

@@ -314,7 +314,7 @@ contains
         real(kind(0d0)), dimension(num_species) :: Ys_L, Ys_R
         real(kind(0d0)), dimension(num_species) :: Cp_iL, Cp_iR, Xs_L, Xs_R, Gamma_iL, Gamma_iR
         real(kind(0d0)), dimension(num_species) :: Yi_avg, Phi_avg, h_iL, h_iR, h_avg_2
-        real(kind(0d0)) :: Cp_avg, Cv_avg, gamma_avggg, T_avg, eps, c_sum_Yi_Phi
+        real(kind(0d0)) :: Cp_avg, Cv_avg, T_avg, eps, c_sum_Yi_Phi
         real(kind(0d0)) :: T_L, T_R
         real(kind(0d0)) :: Y_L, Y_R
         real(kind(0d0)) :: MW_L, MW_R
@@ -331,20 +331,15 @@ contains
         real(kind(0d0)), dimension(2) :: Re_L, Re_R
 
         real(kind(0d0)) :: rho_avg
-        real(kind(0d0)), dimension(num_dims) :: vel_avg
         real(kind(0d0)) :: H_avg
         real(kind(0d0)) :: gamma_avg
         real(kind(0d0)) :: c_avg
 
         real(kind(0d0)) :: s_L, s_R, s_M, s_P, s_S
-        real(kind(0d0)) :: xi_L, xi_R !< Left and right wave speeds functions
         real(kind(0d0)) :: xi_M, xi_P
 
-        real(kind(0d0)) :: nbub_L, nbub_R
         real(kind(0d0)) :: ptilde_L, ptilde_R
         real(kind(0d0)) :: vel_L_rms, vel_R_rms, vel_avg_rms
-        real(kind(0d0)) :: blkmod1, blkmod2
-        real(kind(0d0)) :: rho_Star, E_Star, p_Star, p_K_Star
         real(kind(0d0)) :: Ms_L, Ms_R, pres_SL, pres_SR
         real(kind(0d0)) :: alpha_L_sum, alpha_R_sum
 
@@ -374,7 +369,7 @@ contains
             if (norm_dir == ${NORM_DIR}$) then
                 !$acc parallel loop collapse(3) gang vector default(present)    &
                 !$acc private(alpha_rho_L, alpha_rho_R, vel_L, vel_R, alpha_L,  &
-                !$acc alpha_R, vel_avg, tau_e_L, tau_e_R, G_L, G_R, Re_L, Re_R, &
+                !$acc alpha_R, tau_e_L, tau_e_R, G_L, G_R, Re_L, Re_R, &
                 !$acc rho_avg, h_avg, gamma_avg, s_L, s_R, s_S, Ys_L, Ys_R,     &
                 !$acc Cp_iL, Cp_iR, Xs_L, Xs_R, Gamma_iL, Gamma_iR,             &
                 !$acc Yi_avg, Phi_avg, h_iL, h_iR, h_avg_2)
@@ -947,7 +942,6 @@ contains
         real(kind(0d0)), dimension(2) :: Re_L, Re_R
 
         real(kind(0d0)) :: rho_avg
-        real(kind(0d0)), dimension(num_dims) :: vel_avg
         real(kind(0d0)) :: H_avg
         real(kind(0d0)) :: gamma_avg
         real(kind(0d0)) :: c_avg
@@ -961,7 +955,6 @@ contains
         real(kind(0d0)), dimension(nb) :: V0_L, V0_R
         real(kind(0d0)), dimension(nb) :: P0_L, P0_R
         real(kind(0d0)), dimension(nb) :: pbw_L, pbw_R
-        real(kind(0d0)), dimension(nb, nmom) :: moms_L, moms_R
         real(kind(0d0)) :: ptilde_L, ptilde_R
 
         real(kind(0d0)) :: alpha_L_sum, alpha_R_sum, nbub_L_denom, nbub_R_denom
@@ -972,10 +965,8 @@ contains
 
         real(kind(0d0)) :: vel_L_rms, vel_R_rms, vel_avg_rms
         real(kind(0d0)) :: vel_L_tmp, vel_R_tmp
-        real(kind(0d0)) :: blkmod1, blkmod2
         real(kind(0d0)) :: rho_Star, E_Star, p_Star, p_K_Star
         real(kind(0d0)) :: pres_SL, pres_SR, Ms_L, Ms_R
-        real(kind(0d0)) :: start, finish
         real(kind(0d0)) :: zcoef, pcorr !< low Mach number correction
         integer :: i, j, k, l, q !< Generic loop iterators
         integer :: idx1, idxi
@@ -1360,7 +1351,7 @@ contains
                     end do
                 elseif (model_eqns == 4) then
                     !ME4
-                    !$acc parallel loop collapse(3) gang vector default(present) private(alpha_rho_L, alpha_rho_R, vel_L, vel_R, alpha_L, alpha_R, vel_avg, &
+                    !$acc parallel loop collapse(3) gang vector default(present) private(alpha_rho_L, alpha_rho_R, vel_L, vel_R, alpha_L, alpha_R, &
                     !$acc rho_avg, h_avg, gamma_avg, s_L, s_R, s_S, vel_avg_rms, nbub_L, nbub_R, ptilde_L, ptilde_R)
                     do l = is3%beg, is3%end
                         do k = is2%beg, is2%end