better

Author: sbryngelson

.github/workflows/lint-source.yml

@@ -36,4 +36,5 @@ jobs:
 
     - name: No double precision intrinsics
       run: |
-        ! grep -iR 'dexp\|dlog\|dble\|dabs\|double\ precision\|real(8)\|real(4)\|dprod\|dmin\|dmax\|dfloat\|dreal\|dcos\|dsin\|dtan\|dsign\|dtanh\|dsinh\|dcosh\|\.d0\|\dd0' --exclude-dir=syscheck ./src/*
+        ! grep -iR 'dexp\|dlog\|dble\|dabs\|double\ precision\|real(8)\|real(4)\|dprod\|dmin\|dmax\|dfloat\|dreal\|dcos\|dsin\|dtan\|dsign\|dtanh\|dsinh\|dcosh\|d0' --exclude-dir=syscheck --exclude="*nvtx*" ./src/*
+

src/simulation/m_bubbles.fpp

@@ -430,7 +430,7 @@ contains
         real(wp), intent(out) :: h
 
         real(wp) :: h0, h1 !< Time step size
-        real(wp) :: d0, d1, d2 !< norms
+        real(wp) :: d_0, d_1, d_2 !< norms
         real(wp), dimension(2) :: myR_tmp, myV_tmp, myA_tmp !< Bubble radius, radial velocity, and radial acceleration
 
         ! Determine the starting time step
@@ -441,13 +441,13 @@ contains
                              fpb, fpbdot, alf, fntait, fBtait, &
                              f_bub_adv_src, f_divu)
 
-        ! Compute d0 = ||y0|| and d1 = ||f(x0,y0)||
-        d0 = sqrt((myR_tmp(1)**2._wp + myV_tmp(1)**2._wp)/2._wp)
-        d1 = sqrt((myV_tmp(1)**2._wp + myA_tmp(1)**2._wp)/2._wp)
-        if (d0 < 1e-5_wp .or. d1 < 1e-5_wp) then
+        ! Compute d_0 = ||y0|| and d_1 = ||f(x0,y0)||
+        d_0 = sqrt((myR_tmp(1)**2._wp + myV_tmp(1)**2._wp)/2._wp)
+        d_1 = sqrt((myV_tmp(1)**2._wp + myA_tmp(1)**2._wp)/2._wp)
+        if (d_0 < 1e-5_wp .or. d_1 < 1e-5_wp) then
             h0 = 1e-6_wp
         else
-            h0 = 1e-2_wp*(d0/d1)
+            h0 = 1e-2_wp*(d_0/d_1)
         end if
 
         ! Evaluate f(x0+h0,y0+h0*f(x0,y0))
@@ -457,15 +457,13 @@ contains
                              fpb, fpbdot, alf, fntait, fBtait, &
                              f_bub_adv_src, f_divu)
 
-        ! Compute d2 = ||f(x0+h0,y0+h0*f(x0,y0))-f(x0,y0)||/h0
-        d2 = sqrt(((myV_tmp(2) - myV_tmp(1))**2._wp + (myA_tmp(2) - myA_tmp(1))**2._wp)/2._wp)/h0
+        ! Compute d_2 = ||f(x0+h0,y0+h0*f(x0,y0))-f(x0,y0)||/h0
+        d_2 = sqrt(((myV_tmp(2) - myV_tmp(1))**2._wp + (myA_tmp(2) - myA_tmp(1))**2._wp)/2._wp)/h0
 
-        ! Set h1 = (0.01/max(d1,d2))^{1/(p+1)}
-        !      if max(d1,d2) < 1e-15_wp, h1 = max(1e-6_wp, h0*1e-3_wp)
-        if (max(d1, d2) < 1e-15_wp) then
+        if (max(d_1, d_2) < 1e-15_wp) then
             h1 = max(1e-6_wp, h0*1e-3_wp)
         else
-            h1 = (1e-2_wp/max(d1, d2))**(1._wp/3._wp)
+            h1 = (1e-2_wp/max(d_1, d_2))**(1._wp/3._wp)
         end if
 
         ! Set h = min(100*h0,h1)

src/simulation/m_qbmm.fpp

@@ -1046,7 +1046,7 @@ contains
         real(wp), dimension(0:2, 0:2) :: moms
         real(wp), dimension(3) :: M1, M3
         real(wp), dimension(2) :: myrho, myrho3, up, up3, Vf
-        real(wp) :: bu, bv, d20, d11, d02, c20, c11, c02
+        real(wp) :: bu, bv, d20, d11, d_02, c20, c11, c02
         real(wp) :: mu2avg, mu2, vp21, vp22, rho21, rho22
 
         moms(0, 0) = momin(1)
@@ -1060,11 +1060,11 @@ contains
         bv = moms(0, 1)/moms(0, 0)
         d20 = moms(2, 0)/moms(0, 0)
         d11 = moms(1, 1)/moms(0, 0)
-        d02 = moms(0, 2)/moms(0, 0)
+        d_02 = moms(0, 2)/moms(0, 0)
 
         c20 = d20 - bu**2._wp; 
         c11 = d11 - bu*bv; 
-        c02 = d02 - bv**2._wp; 
+        c02 = d_02 - bv**2._wp; 
         M1 = (/1._wp, 0._wp, c20/)
         call s_hyqmom(myrho, up, M1)
         Vf = c11*up/c20

src/simulation/m_riemann_solvers.fpp

@@ -563,8 +563,8 @@ contains
 
                             ! elastic energy update
                             !if ( hyperelasticity ) then
-                            !    G_L = 0d0
-                            !    G_R = 0d0
+                            !    G_L = 0._wp
+                            !    G_R = 0._wp
                             !
                             !    !$acc loop seq
                             !    do i = 1, num_fluids
@@ -1012,7 +1012,7 @@ contains
 
         real(wp) :: vel_L_rms, vel_R_rms, vel_avg_rms
         real(wp) :: vel_L_tmp, vel_R_tmp
-        real(wp) :: rho_Star, E_Star, p_Star, p_K_Star
+        real(wp) :: rho_Star, E_Star, p_Star, p_K_Star, vel_K_star
         real(wp) :: pres_SL, pres_SR, Ms_L, Ms_R
         real(wp) :: flux_ene_e
         real(wp) :: zcoef, pcorr !< low Mach number correction