@@ -577,27 +577,20 @@ end
577577 # Unpack left and right state
578578 rho_e_ll = last (u_ll)
579579 rho_e_rr = last (u_rr)
580- rho_ll, rho_v1_ll, rho_v2_ll, rho_v3_ll, rho_e_ll = u_ll
581- rho_rr, rho_v1_rr, rho_v2_rr, rho_v3_rr, rho_e_rr = u_rr
582-
583- v1_ll = rho_v1_ll / rho_ll
584- v2_ll = rho_v2_ll / rho_ll
585- v3_ll = rho_v3_ll / rho_ll
586- v1_rr = rho_v1_rr / rho_rr
587- v2_rr = rho_v2_rr / rho_rr
588- v3_rr = rho_v3_rr / rho_rr
580+ rho_ll, v1_ll, v2_ll, v3_ll, p_ll = cons2prim (u_ll, equations)
581+ rho_rr, v1_rr, v2_rr, v3_rr, p_rr = cons2prim (u_rr, equations)
589582
590583 # Average each factor of products in flux
591584 rho_avg = 0.5f0 * (rho_ll + rho_rr)
592585 v1_avg = 0.5f0 * (v1_ll + v1_rr)
593586 v2_avg = 0.5f0 * (v2_ll + v2_rr)
594587 v3_avg = 0.5f0 * (v3_ll + v3_rr)
588+ p_avg = 0.5f0 * (p_ll + p_rr)
589+ e_avg = 0.5f0 * (rho_e_ll / rho_ll + rho_e_rr / rho_rr)
590+
595591 v_dot_n_avg = v1_avg * normal_direction[1 ] + v2_avg * normal_direction[2 ] +
596592 v3_avg * normal_direction[3 ]
597- p_avg = 0.5f0 * ((equations. gamma - 1 ) *
598- (rho_e_ll - 0.5f0 * rho_ll * (v1_ll^ 2 + v2_ll^ 2 + v3_ll^ 2 )) +
599- (equations. gamma - 1 ) *
600- (rho_e_rr - 0.5f0 * rho_rr * (v1_rr^ 2 + v2_rr^ 2 + v3_rr^ 2 )))
593+ p_avg = 0.5f0 * (p_ll + p_rr)
601594 e_avg = 0.5f0 * (rho_e_ll / rho_ll + rho_e_rr / rho_rr)
602595
603596 # Calculate fluxes depending on normal_direction
0 commit comments