removing duplicated codes in mixture rules for EE bubbles (#1071)

Co-authored-by: Hyeoksu Lee <[email protected]>

Author: hyeoksu-lee

src/common/m_variables_conversion.fpp

@@ -242,34 +242,26 @@ contains
                             myalpha(ii) = q_cons_vf(advxb + ii - 1)%sf(j, k, l)
                         end do
 
-                        myRho = 0._wp
-                        n_tait = 0._wp
-                        B_tait = 0._wp
+                        if (num_fluids == 1) then
+                            myRho = myalpha_rho(1)
+                            n_tait = gammas(1)
+                            B_tait = pi_infs(1)/pi_fac
+                        else
+                            myRho = 0._wp
+                            n_tait = 0._wp
+                            B_tait = 0._wp
 
-                        if (mpp_lim .and. (num_fluids > 2)) then
                             $:GPU_LOOP(parallelism='[seq]')
                             do ii = 1, num_fluids
                                 myRho = myRho + myalpha_rho(ii)
                                 n_tait = n_tait + myalpha(ii)*gammas(ii)
-                                B_tait = B_tait + myalpha(ii)*pi_infs(ii)
-                            end do
-                        else if (num_fluids > 2) then
-                            $:GPU_LOOP(parallelism='[seq]')
-                            do ii = 1, num_fluids - 1
-                                myRho = myRho + myalpha_rho(ii)
-                                n_tait = n_tait + myalpha(ii)*gammas(ii)
-                                B_tait = B_tait + myalpha(ii)*pi_infs(ii)
+                                B_tait = B_tait + myalpha(ii)*pi_infs(ii)/pi_fac
                             end do
-                        else
-                            myRho = myalpha_rho(1)
-                            n_tait = gammas(1)
-                            B_tait = pi_infs(1)/pi_fac
                         end if
 
                         n_tait = 1._wp/n_tait + 1._wp !make this the usual little 'gamma'
                         B_tait = B_tait*(n_tait - 1)/n_tait ! make this the usual pi_inf
 
-                        myRho = q_prim_vf(1)%sf(j, k, l)
                         myP = q_prim_vf(E_idx)%sf(j, k, l)
                         alf = q_prim_vf(alf_idx)%sf(j, k, l)
                         myR = q_prim_vf(rs(q))%sf(j, k, l)

src/simulation/m_bubbles_EE.fpp

@@ -642,11 +642,7 @@ contains
             call s_get_pinf(k, q_prim_vf, 1, myPinf, cell, aux1, aux2)
 
             ! Obtain liquid density and computing speed of sound from pinf
-            $:GPU_LOOP(parallelism='[seq]')
-            do i = 1, num_fluids
-                myalpha_rho(i) = q_prim_vf(i)%sf(cell(1), cell(2), cell(3))
-                myalpha(i) = q_prim_vf(E_idx + i)%sf(cell(1), cell(2), cell(3))
-            end do
+            call s_compute_species_fraction(q_prim_vf, cell(1), cell(2), cell(3), myalpha_rho, myalpha)
             call s_convert_species_to_mixture_variables_acc(myRho, gamma, pi_inf, qv, myalpha, &
                                                             myalpha_rho, Re)
             call s_compute_cson_from_pinf(q_prim_vf, myPinf, cell, myRho, gamma, pi_inf, myCson)

src/simulation/m_bubbles_EL.fpp

@@ -813,11 +813,7 @@ contains
                             adv_local(i) = q_prim_rs${XYZ}$_vf(0, k, r, E_idx + i)
                         end do
 
-                        if (bubbles_euler) then
-                            call s_convert_species_to_mixture_variables_bubbles_acc(rho, gamma, pi_inf, qv, adv_local, alpha_rho, Re_cbc)
-                        else
-                            call s_convert_species_to_mixture_variables_acc(rho, gamma, pi_inf, qv, adv_local, alpha_rho, Re_cbc)
-                        end if
+                        call s_convert_species_to_mixture_variables_acc(rho, gamma, pi_inf, qv, adv_local, alpha_rho, Re_cbc)
 
                         $:GPU_LOOP(parallelism='[seq]')
                         do i = 1, contxe

src/simulation/m_cbc.fpp

@@ -110,11 +110,9 @@ contains
         do l = 0, p
             do k = 0, n
                 do j = 0, m
-                    $:GPU_LOOP(parallelism='[seq]')
-                    do i = 1, num_fluids
-                        alpha_rho_k(i) = q_cons_vf(i)%sf(j, k, l)
-                        alpha_k(i) = q_cons_vf(advxb + i - 1)%sf(j, k, l)
-                    end do
+
+                    call s_compute_species_fraction(q_cons_vf, j, k, l, alpha_rho_k, alpha_k)
+
                     ! If in simulation, use acc mixture subroutines
                     call s_convert_species_to_mixture_variables_acc(rho, gamma, pi_inf, qv, alpha_k, &
                                                                     alpha_rho_k, Re, G_local, Gs_hyper)

src/simulation/m_hyperelastic.fpp

@@ -249,9 +249,6 @@ contains
                     if (elasticity) then
                         call s_convert_species_to_mixture_variables_acc(rho, gamma, pi_inf, qv_K, alpha_IP, &
                                                                         alpha_rho_IP, Re_K, G_K, Gs)
-                    else if (bubbles_euler) then
-                        call s_convert_species_to_mixture_variables_bubbles_acc(rho, gamma, pi_inf, qv_K, alpha_IP, &
-                                                                                alpha_rho_IP, Re_K)
                     else
                         call s_convert_species_to_mixture_variables_acc(rho, gamma, pi_inf, qv_K, alpha_IP, &
                                                                         alpha_rho_IP, Re_K)

src/simulation/m_ibm.fpp

@@ -109,33 +109,11 @@ contains
 
         integer :: i
 
-        if (igr) then
-            if (num_fluids == 1) then
-                alpha_rho(1) = q_prim_vf(contxb)%sf(j, k, l)
-                alpha(1) = 1._wp
-            else
-                $:GPU_LOOP(parallelism='[seq]')
-                do i = 1, num_fluids - 1
-                    alpha_rho(i) = q_prim_vf(i)%sf(j, k, l)
-                    alpha(i) = q_prim_vf(advxb + i - 1)%sf(j, k, l)
-                end do
-
-                alpha_rho(num_fluids) = q_prim_vf(num_fluids)%sf(j, k, l)
-                alpha(num_fluids) = 1._wp - sum(alpha(1:num_fluids - 1))
-            end if
-        else
-            $:GPU_LOOP(parallelism='[seq]')
-            do i = 1, num_fluids
-                alpha_rho(i) = q_prim_vf(i)%sf(j, k, l)
-                alpha(i) = q_prim_vf(advxb + i - 1)%sf(j, k, l)
-            end do
-        end if
+        call s_compute_species_fraction(q_prim_vf, j, k, l, alpha_rho, alpha)
 
         if (elasticity) then
             call s_convert_species_to_mixture_variables_acc(rho, gamma, pi_inf, qv, alpha, &
                                                             alpha_rho, Re, G_local, Gs)
-        elseif (bubbles_euler) then
-            call s_convert_species_to_mixture_variables_bubbles_acc(rho, gamma, pi_inf, qv, alpha, alpha_rho, Re)
         else
             call s_convert_species_to_mixture_variables_acc(rho, gamma, pi_inf, qv, alpha, alpha_rho, Re)
         end if

src/simulation/m_sim_helpers.fpp

@@ -369,8 +369,8 @@ def check_stiffened_eos(self):
         if num_fluids is None:
             return
 
-        # Allow one extra fluid property slot when using bubbles_euler with single-component flows
-        bub_fac = 1 if (bubbles_euler and num_fluids == 1) else 0
+        # Allow one extra fluid property slot when using bubbles_euler
+        bub_fac = 1 if (bubbles_euler) else 0
 
         for i in range(1, num_fluids + 1 + bub_fac):
             gamma = self.get(f'fluid_pp({i})%gamma')