MFlowCode
diff --git a/‎src/common/m_variables_conversion.fpp
Copy file name to clipboardExpand all lines: src/common/m_variables_conversion.fpp
+4-35Lines changed: 4 additions & 35 deletions b/‎src/common/m_variables_conversion.fpp
Copy file name to clipboardExpand all lines: src/common/m_variables_conversion.fpp
+4-35Lines changed: 4 additions & 35 deletions
@@ -1751,39 +1751,12 @@ contains
         real(wp), intent(out) :: s_L, s_R, s_S, s_M, s_P
 
         if (wave_speeds == 1) then
-<<<<<<< HEAD
-            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)
-            elseif (hypoelasticity .or. elasticity) 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_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)))
-        elseif (wave_speeds == 2) then
-=======
             if (elasticity) then
-                s_L = min(vel_L(dir_idx(1)) - sqrt(c_L*c_L + &
-                        (((4_wp*G_L)/3_wp) + tau_e_L(idx_tau))/rho_L), vel_R(dir_idx(1)) - sqrt(c_R*c_R + &
+                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(dir_idx(1)) + sqrt(c_R*c_R + &
-                        (((4_wp*G_R)/3_wp) + tau_e_R(idx_tau))/rho_R), vel_L(dir_idx(1)) + sqrt(c_L*c_L + &
+                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 - tau_e_R(idx_tau) - pres_L + &
                         tau_e_L(idx_tau) + rho_L*vel_L(idx)*(s_L - vel_L(idx)) - &
@@ -1823,7 +1796,6 @@ contains
                 /(rho_L*(s_L - vel_L(idx)) - rho_R*(s_R - vel_R(idx)))
             end if
         else if (wave_speeds == 2) then
->>>>>>> refactor-dev
             pres_SL = 5e-1_wp*(pres_L + pres_R + rho_avg*c_avg*(vel_L(idx) - vel_R(idx)))
             pres_SR = pres_SL
             Ms_L = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_L)/(1._wp + gamma_L))* &
@@ -1858,10 +1830,7 @@ contains
             call s_mpi_abort('Error: Invalid wave speeds in s_compute_wave_speed')
         end if
 #endif
-<<<<<<< HEAD
 
-=======
->>>>>>> refactor-dev
     end subroutine s_compute_wave_speed
 #endif