Addressing more PR comments

Author: wilfonba

src/simulation/m_bubbles_EE.fpp

@@ -170,6 +170,7 @@ contains
         real(wp) :: myR, myV, alf, myP, myRho, R2Vav, R3
         real(wp), dimension(num_fluids) :: myalpha, myalpha_rho
         real(wp) :: nbub !< Bubble number density
+        real(wp) :: my_divu
 
         integer :: i, j, k, l, q, ii !< Loop variables
 
@@ -196,7 +197,7 @@ contains
         #:endcall GPU_PARALLEL_LOOP
 
         adap_dt_stop_max = 0
-        #:call GPU_PARALLEL_LOOP(collapse=3, private='[Rtmp, Vtmp, myalpha_rho, myalpha, myR, myV, alf, myP, myRho, R2Vav, R3, nbub, pb_local, mv_local, vflux, pbdot, rddot, n_tait, B_tait]', &
+        #:call GPU_PARALLEL_LOOP(collapse=3, private='[Rtmp, Vtmp, myalpha_rho, myalpha, myR, myV, alf, myP, myRho, R2Vav, R3, nbub, pb_local, mv_local, vflux, pbdot, rddot, n_tait, B_tait, my_divu]', &
             & reduction='[[adap_dt_stop_max]]', reductionOp='[MAX]', &
             & copy='[adap_dt_stop_max]')
             do l = 0, p
@@ -293,19 +294,21 @@ contains
 
                             if (adap_dt) then
 
+                                my_divu = real(divu_in%sf(j, k, l), kind=wp)
                                 call s_advance_step(myRho, myP, myR, myV, R0(q), &
                                                     pb_local, pbdot, alf, n_tait, B_tait, &
-                                                    bub_adv_src(j, k, l), real(divu_in%sf(j, k, l), kind=wp), &
+                                                    bub_adv_src(j, k, l), my_divu, &
                                                     dmBub_id, dmMass_v, dmMass_n, dmBeta_c, &
                                                     dmBeta_t, dmCson, adap_dt_stop)
 
                                 q_cons_vf(rs(q))%sf(j, k, l) = nbub*myR
                                 q_cons_vf(vs(q))%sf(j, k, l) = nbub*myV
 
                             else
+                                my_divu = real(divu_in%sf(j, k, l), kind=wp)
                                 rddot = f_rddot(myRho, myP, myR, myV, R0(q), &
                                                 pb_local, pbdot, alf, n_tait, B_tait, &
-                                                bub_adv_src(j, k, l), real(divu_in%sf(j, k, l), kind=wp), &
+                                                bub_adv_src(j, k, l), my_divu, &
                                                 dmCson)
                                 bub_v_src(j, k, l, q) = nbub*rddot
                                 bub_r_src(j, k, l, q) = q_cons_vf(vs(q))%sf(j, k, l)

src/simulation/m_ibm.fpp

@@ -226,7 +226,7 @@ contains
                     else if (qbmm .and. .not. polytropic) then
                         call s_interpolate_image_point(q_prim_vf, gp, &
                                                        alpha_rho_IP, alpha_IP, pres_IP, vel_IP, c_IP, &
-                                                       r_IP, v_IP, pb_IP, mv_IP, nmom_IP, real(pb_in, kind=wp), real(mv_in, kind=wp), presb_IP, massv_IP)
+                                                       r_IP, v_IP, pb_IP, mv_IP, nmom_IP, pb_in, mv_in, presb_IP, massv_IP)
                     else
                         call s_interpolate_image_point(q_prim_vf, gp, &
                                                        alpha_rho_IP, alpha_IP, pres_IP, vel_IP, c_IP)
@@ -803,13 +803,15 @@ contains
 
     !> Function that uses the interpolation coefficients and the current state
     !! at the cell centers in order to estimate the state at the image point
-    subroutine s_interpolate_image_point(q_prim_vf, gp, alpha_rho_IP, alpha_IP, pres_IP, vel_IP, c_IP, r_IP, v_IP, pb_IP, mv_IP, nmom_IP, pb_in, mv_in, presb_IP, massv_IP)
+    subroutine s_interpolate_image_point(q_prim_vf, gp, alpha_rho_IP, alpha_IP, &
+                                         pres_IP, vel_IP, c_IP, r_IP, v_IP, pb_IP, &
+                                         mv_IP, nmom_IP, pb_in, mv_in, presb_IP, massv_IP)
         $:GPU_ROUTINE(parallelism='[seq]')
         type(scalar_field), &
             dimension(sys_size), &
             intent(IN) :: q_prim_vf !< Primitive Variables
 
-        real(wp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(IN) :: pb_in, mv_in
+        real(stp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(IN) :: pb_in, mv_in
 
         type(ghost_point), intent(IN) :: gp
         real(wp), intent(INOUT) :: pres_IP
@@ -909,8 +911,10 @@ contains
                         if (.not. polytropic) then
                             do q = 1, nb
                                 do l = 1, nnode
-                                    presb_IP((q - 1)*nnode + l) = presb_IP((q - 1)*nnode + l) + coeff*pb_in(i, j, k, l, q)
-                                    massv_IP((q - 1)*nnode + l) = massv_IP((q - 1)*nnode + l) + coeff*mv_in(i, j, k, l, q)
+                                    presb_IP((q - 1)*nnode + l) = presb_IP((q - 1)*nnode + l) + &
+                                                                    coeff*real(pb_in(i, j, k, l, q), kind=wp)
+                                    massv_IP((q - 1)*nnode + l) = massv_IP((q - 1)*nnode + l) + &
+                                                                    coeff*real(mv_in(i, j, k, l, q), kind=wp)
                                 end do
                             end do
                         end if

src/simulation/m_rhs.fpp

@@ -2010,13 +2010,11 @@ contains
                     @:DEALLOCATE(q_cons_qp%vf(j)%sf)
                     @:DEALLOCATE(q_prim_qp%vf(j)%sf)
                 else
-                    !$:GPU_EXIT_DATA(detach='[q_prim_qp%vf(j)%sf]')
                     nullify (q_prim_qp%vf(j)%sf)
                 end if
             end do
 
             do j = adv_idx%beg, adv_idx%end
-                !$:GPU_EXIT_DATA(detach='[q_prim_qp%vf(j)%sf]')
                 nullify (q_prim_qp%vf(j)%sf)
             end do
 

src/simulation/p_main.fpp

@@ -33,8 +33,6 @@ program p_main
     real(wp) :: start, finish
     integer :: nt
 
-    logical :: status
-
     call system_clock(COUNT=cpu_start, COUNT_RATE=cpu_rate)
 
     call nvtxStartRange("INIT")