Internal energy calculation bugfix

Author: JRChreim

src/common/m_variables_conversion.fpp

@@ -982,6 +982,11 @@ contains
                         q_cons_vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
                     end do
 
+                    ! Transferring the advection equation(s) variable(s)
+                    do i = adv_idx%beg, adv_idx%end
+                        q_cons_vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
+                    end do
+
                     ! Zeroing out the dynamic pressure since it is computed
                     ! iteratively by cycling through the velocity equations
                     dyn_pres = 0d0
@@ -1010,19 +1015,15 @@ contains
 
                     ! Computing the internal energies from the pressure and continuities
                     if (model_eqns == 3) then
-                        do i = internalEnergies_idx%beg, internalEnergies_idx%end
-                            q_cons_vf(i)%sf(j, k, l) = q_cons_vf(i - adv_idx%end)%sf(j, k, l)* &
-                                                       fluid_pp(i - adv_idx%end)%gamma* &
-                                                       q_prim_vf(E_idx)%sf(j, k, l) + &
-                                                       fluid_pp(i - adv_idx%end)%pi_inf
+                        do i = 1, num_fluids
+                            ! internal energy calculation for each of the fluids
+                            q_cons_vf(i + internalEnergies_idx%beg - 1)%sf(j, k, l) = &
+                                q_cons_vf(i + adv_idx%beg - 1)%sf(j, k, l)* &
+                                (fluid_pp(i)%gamma*q_prim_vf(E_idx)%sf(j, k, l) + &
+                                 fluid_pp(i)%pi_inf)
                         end do
                     end if
 
-                    ! Transferring the advection equation(s) variable(s)
-                    do i = adv_idx%beg, adv_idx%end
-                        q_cons_vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
-                    end do
-
                     if (bubbles) then
                         ! From prim: Compute nbub = (3/4pi) * \alpha / \bar{R^3}
                         do i = 1, nb
@@ -1041,8 +1042,7 @@ contains
                             !Initialize nb 
                             nbub = 3d0 * q_prim_vf(alf_idx)%sf(j, k, l) / (4d0 * pi * R3tmp)
                         end if
-                   
-                        
+
                         if (j == 0 .and. k == 0 .and. l == 0) print *, 'In convert, nbub:', nbub
                         do i = bub_idx%beg, bub_idx%end
                             q_cons_vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)*nbub