Merge branch 'MFlowCode:master' into master

Author: mrodrig6

src/simulation/m_riemann_solvers.fpp

@@ -853,6 +853,31 @@ contains
                                     flux_src_rs${XYZ}$_vf(j, k, l, i) = 0._wp
                                 end do
                             end if
+
+                            #:if (NORM_DIR == 2)
+                                if (cyl_coord) then
+                                    !Substituting the advective flux into the inviscid geometrical source flux
+                                    !$acc loop seq
+                                    do i = 1, E_idx
+                                        flux_gsrc_rs${XYZ}$_vf(j, k, l, i) = flux_rs${XYZ}$_vf(j, k, l, i)
+                                    end do
+                                    ! Recalculating the radial momentum geometric source flux
+                                    flux_gsrc_rs${XYZ}$_vf(j, k, l, contxe + dir_idx(1)) = &
+                                        (s_M*(rho_R*vel_R(dir_idx(1)) &
+                                              *vel_R(dir_idx(1))) &
+                                         - s_P*(rho_L*vel_L(dir_idx(1)) &
+                                                *vel_L(dir_idx(1))) &
+                                         + s_M*s_P*(rho_L*vel_L(dir_idx(1)) &
+                                                    - rho_R*vel_R(dir_idx(1)))) &
+                                        /(s_M - s_P)
+                                    ! Geometrical source of the void fraction(s) is zero
+                                    !$acc loop seq
+                                    do i = advxb, advxe
+                                        flux_gsrc_rs${XYZ}$_vf(j, k, l, i) = 0._wp
+                                    end do
+                                end if
+                            #:endif
+
                         end do
                     end do
                 end do

tests/6FE484B5/golden-metadata.txt

@@ -251,6 +251,7 @@ def alter_2d():
 
         cases.append(define_case_d(stack, "model_eqns=2", {'model_eqns': 2}))
         cases.append(define_case_d(stack, "model_eqns=3", {'model_eqns': 3}))
+        cases.append(define_case_d(stack, "HLL", {'riemann_solver': 1}))
 
         stack.push("Viscous", {
             'fluid_pp(1)%Re(1)' : 0.0001, 'fluid_pp(1)%Re(2)' : 0.0001,