fixed version

Author: ChrisZYJ

src/simulation/m_checker.fpp

@@ -164,12 +164,10 @@ contains
                 "Only acoustic("//trim(jStr)//")%support = 1 is allowed for 1D simulations")
             @:PROHIBIT(dim == 1 .and. acoustic(j)%support == 1 .and. f_is_default(acoustic(j)%loc(1)), &
                 "acoustic("//trim(jStr)//")%loc(1) must be specified for acoustic("//trim(jStr)//")%support = 1")
-            @:PROHIBIT(dim == 2 .and. (.not. any(acoustic(j)%support == (/2, 5, 6, 9, 10/))), &
+            @:PROHIBIT((dim == 2  .and. .not. cyl_coord) .and. (.not. any(acoustic(j)%support == (/2, 5, 9/))), &
                 "Only acoustic("//trim(jStr)//")%support = 2, 5, 6, 9, or 10 is allowed for 2D simulations")
-            @:PROHIBIT(dim == 2 .and. (.not. any(acoustic(j)%support == (/6, 10/))) .and. cyl_coord, &
+            @:PROHIBIT((dim == 2  .and. cyl_coord) .and. (.not. any(acoustic(j)%support == (/2, 6, 10/))), &
                 "Only acoustic("//trim(jStr)//")%support = 6 or 10 is allowed for 2D axisymmetric simulations")
-            @:PROHIBIT(.not. (dim == 2 .and. cyl_coord) .and. any(acoustic(j)%support == (/6, 10/)), &
-                "acoustic("//trim(jStr)//")%support = 6 or 10 only works for 2D axisymmetric simulations")
             @:PROHIBIT(dim == 2 .and. any(acoustic(j)%support == (/2, 5, 6, 9, 10/)) .and. &
                 (f_is_default(acoustic(j)%loc(1)) .or. f_is_default(acoustic(j)%loc(2))), &
                 "acoustic("//trim(jStr)//")%loc(1:2) must be specified for acoustic("//trim(jStr)//")%support = 2")

src/simulation/m_hypoelastic.fpp

@@ -331,7 +331,7 @@ contains
             end do
         end if
 
-        if (cyl_coord) then
+        if (cyl_coord .and. idir == 2) then
 
             !$acc parallel loop collapse(3) gang vector default(present)
             do q = 0, p

src/simulation/m_riemann_solvers.fpp

@@ -636,7 +636,7 @@ contains
                                     if ((G_L > 1000) .and. (G_R > 1000)) then
                                         E_L = E_L + (tau_e_L(i)*tau_e_L(i))/(4._wp*G_L)
                                         E_R = E_R + (tau_e_R(i)*tau_e_R(i))/(4._wp*G_R)
-                                        ! Additional terms in 2D and 3D
+                                        ! Double for shear stresses
                                         if (any(strxb - 1 + i == shear_indices)) then
                                             E_L = E_L + (tau_e_L(i)*tau_e_L(i))/(4._wp*G_L)
                                             E_R = E_R + (tau_e_R(i)*tau_e_R(i))/(4._wp*G_R)