fixes for CCE

Author: wilfonba

src/simulation/m_thinc.fpp

@@ -26,22 +26,13 @@ module m_thinc
     private; public :: s_initialize_thinc_module, s_thinc_compression, s_compute_mthinc_normals, s_finalize_thinc_module
 
     !> 3-point Gauss-Legendre quadrature on [-1/2, 1/2]
-#if defined(MFC_OpenMP)
     !> Node locations: +-sqrt(3/5)/2, 0
     real(wp) :: gq3_pts(3) = [-5e-1_wp*0.7745966692414834_wp, 0._wp, 5e-1_wp*0.7745966692414834_wp]
     !> Weights: 5/18, 8/18, 5/18
     real(wp) :: gq3_wts(3) = [5._wp/18._wp, 8._wp/18._wp, 5._wp/18._wp]
     !> ln(2)
     real(wp) :: ln2 = 0.6931471805599453_wp
     $:GPU_DECLARE(create='[gq3_pts, gq3_wts, ln2]')
-#else
-    !> Node locations: +-sqrt(3/5)/2, 0
-    real(wp), parameter :: gq3_pts(3) = [-5e-1_wp*0.7745966692414834_wp, 0._wp, 5e-1_wp*0.7745966692414834_wp]
-    !> Weights: 5/18, 8/18, 5/18
-    real(wp), parameter :: gq3_wts(3) = [5._wp/18._wp, 8._wp/18._wp, 5._wp/18._wp]
-    !> ln(2)
-    real(wp), parameter :: ln2 = 0.6931471805599453_wp
-#endif
 
     !> MTHINC precomputed data: unit normal components and interface position parameter d, computed before the dimensional splitting
     !! loop so multi-dimensional information is available per-direction.

src/simulation/m_weno.fpp

@@ -1071,22 +1071,20 @@ contains
                                                   & - 2._wp*d_cbL_${XYZ}$ (0:weno_num_stencils,j))))
                                         else if (wenoz) then
                                             ! Borges, et al. (2008)
-
                                             tau = abs(beta(2) - beta(0))  ! Equation 25
                                             $:GPU_LOOP(parallelism='[seq]')
-                                            do q = 0, weno_num_stencils
-                                                alpha(q) = d_cbL_${XYZ}$ (q, &
-                                                      & j)*(1._wp + (tau/beta(q))) &
-                                                      &  ! Equation 28 (note: weno_eps was already added to beta)
+                                            do q = 0, weno_num_stencils  ! Equation 28 (note: weno_eps was already added to beta)
+                                                alpha(q) = d_cbL_${XYZ}$ (q, j)*(1._wp + (tau/beta(q)))
                                             end do
                                         else if (teno) then
                                             ! Fu, et al. (2016) Fu''s code: https://dx.doi.org/10.13140/RG.2.2.36250.34247
                                             tau = abs(beta(2) - beta(0))  ! Equation 25
                                             $:GPU_LOOP(parallelism='[seq]')
                                             do q = 0, weno_num_stencils
-                                                alpha(q) = 1._wp + tau/beta(q)  ! Equation 22 (reuse alpha as gamma; pick C=1 & q=6)
-                                                alpha(q) = (alpha(q)**3._wp) &
-                                                      & **2._wp  ! Equation 22 cont. (some CPU compilers cannot optimize x**6.0)
+                                                ! Equation 22 (reuse alpha as gamma; pick C=1 & q=6)
+                                                alpha(q) = 1._wp + tau/beta(q)
+                                                ! Equation 22 cont. (some CPU compilers cannot optimize x**6.0)
+                                                alpha(q) = (alpha(q)**3._wp)**2._wp
                                             end do
                                             omega = alpha/sum(alpha)