s_compute_wave_speed passed Hypoelasticity tests

Author: Malmahrouqi3

src/common/m_variables_conversion.fpp

@@ -44,6 +44,7 @@ module m_variables_conversion
 #ifndef MFC_PRE_PROCESS
               s_compute_speed_of_sound, &
               s_compute_fast_magnetosonic_speed, &
+              s_compute_wave_speed, &
 #endif
               s_finalize_variables_conversion_module
 
@@ -1761,31 +1762,38 @@ contains
                         tau_e_L(idx_tau) + rho_L*vel_L(idx)*(s_L - vel_L(idx)) - &
                         rho_R*vel_R(idx)*(s_R - vel_R(idx)))/(rho_L*(s_L - vel_L(idx)) - &
                         rho_R*(s_R - vel_R(idx)))
+            else if (mhd) then
+                s_L = min(vel_L(idx) - c_fast_L, vel_R(idx) - c_fast_R)
+                s_R = max(vel_R(idx) + c_fast_R, vel_L(idx) + c_fast_L)
+                s_S = (pres_R - pres_L + rho_L*vel_L(idx)* &
+                (s_L - vel_L(idx)) - rho_R*vel_R(idx)*(s_R - vel_R(idx))) &
+                /(rho_L*(s_L - vel_L(idx)) - rho_R*(s_R - vel_R(idx)))
+            else if (hypoelasticity) then
+                s_L = min(vel_L(idx) - sqrt(c_L*c_L + (((4._wp*G_L)/3._wp) + &
+                                                    tau_e_L(idx_tau))/rho_L) &
+                        , vel_R(idx) - sqrt(c_R*c_R + (((4._wp*G_R)/3._wp) + &
+                                                        tau_e_R(idx_tau))/rho_R))
+                s_R = max(vel_R(idx) + sqrt(c_R*c_R + (((4._wp*G_R)/3._wp) + &
+                                                    tau_e_R(idx_tau))/rho_R) &
+                        , vel_L(idx) + sqrt(c_L*c_L + (((4._wp*G_L)/3._wp) + &
+                                                        tau_e_L(idx_tau))/rho_L))
+                s_S = (pres_R - pres_L + rho_L*vel_L(idx)* &
+                (s_L - vel_L(idx)) - rho_R*vel_R(idx)*(s_R - vel_R(idx))) &
+                /(rho_L*(s_L - vel_L(idx)) - rho_R*(s_R - vel_R(idx)))
+            else if (hyperelasticity) then
+                s_L = min(vel_L(idx) - sqrt(c_L*c_L + (4._wp*G_L/3._wp)/rho_L) &
+                        , vel_R(idx) - sqrt(c_R*c_R + (4._wp*G_R/3._wp)/rho_R))
+                s_R = max(vel_R(idx) + sqrt(c_R*c_R + (4._wp*G_R/3._wp)/rho_R) &
+                        , vel_L(idx) + sqrt(c_L*c_L + (4._wp*G_L/3._wp)/rho_L))
+                s_S = (pres_R - pres_L + rho_L*vel_L(idx)* &
+                (s_L - vel_L(idx)) - rho_R*vel_R(idx)*(s_R - vel_R(idx))) &
+                /(rho_L*(s_L - vel_L(idx)) - rho_R*(s_R - vel_R(idx)))
             else
-                else if (mhd) then
-                    s_L = min(vel_L(idx) - c_fast_L, vel_R(idx) - c_fast_R)
-                    s_R = max(vel_R(idx) + c_fast_R, vel_L(idx) + c_fast_L)
-                else if (hypoelasticity) then
-                    s_L = min(vel_L(idx) - sqrt(c_L*c_L + (((4._wp*G_L)/3._wp) + &
-                                                        tau_e_L(idx_tau))/rho_L) &
-                            , vel_R(idx) - sqrt(c_R*c_R + (((4._wp*G_R)/3._wp) + &
-                                                            tau_e_R(idx_tau))/rho_R))
-                    s_R = max(vel_R(idx) + sqrt(c_R*c_R + (((4._wp*G_R)/3._wp) + &
-                                                        tau_e_R(idx_tau))/rho_R) &
-                            , vel_L(idx) + sqrt(c_L*c_L + (((4._wp*G_L)/3._wp) + &
-                                                            tau_e_L(idx_tau))/rho_L))
-                else if (hyperelasticity) then
-                    s_L = min(vel_L(idx) - sqrt(c_L*c_L + (4._wp*G_L/3._wp)/rho_L) &
-                            , vel_R(idx) - sqrt(c_R*c_R + (4._wp*G_R/3._wp)/rho_R))
-                    s_R = max(vel_R(idx) + sqrt(c_R*c_R + (4._wp*G_R/3._wp)/rho_R) &
-                            , vel_L(idx) + sqrt(c_L*c_L + (4._wp*G_L/3._wp)/rho_L))
-                else
-                    s_L = min(vel_L(idx) - c_L, vel_R(idx) - c_R)
-                    s_R = max(vel_R(idx) + c_R, vel_L(idx) + c_L)
-                end if
+                s_L = min(vel_L(idx) - c_L, vel_R(idx) - c_R)
+                s_R = max(vel_R(idx) + c_R, vel_L(idx) + c_L)
                 s_S = (pres_R - pres_L + rho_L*vel_L(idx)* &
-                    (s_L - vel_L(idx)) - rho_R*vel_R(idx)*(s_R - vel_R(idx))) &
-                    /(rho_L*(s_L - vel_L(idx)) - rho_R*(s_R - vel_R(idx)))
+                (s_L - vel_L(idx)) - rho_R*vel_R(idx)*(s_R - vel_R(idx))) &
+                /(rho_L*(s_L - vel_L(idx)) - rho_R*(s_R - vel_R(idx)))
             end if
         else if (wave_speeds == 2) then
             pres_SL = 5e-1_wp*(pres_L + pres_R + rho_avg*c_avg*(vel_L(idx) - vel_R(idx)))
@@ -1822,7 +1830,6 @@ contains
             call s_mpi_abort('Error: Invalid wave speeds in s_compute_wave_speed')
         end if
 #endif
-
     end subroutine s_compute_wave_speed
 #endif