teno7 works

Author: ChrisZYJ

case/weno7_test/case.py

@@ -66,12 +66,14 @@ contains
         @:PROHIBIT(weno_order /= 1 .and. f_is_default(weno_eps), &
             "weno_order != 1, but weno_eps is not set. A typical value of weno_eps is 1e-6")
         @:PROHIBIT(weno_eps <= 0d0, "weno_eps must be positive. A typical value of weno_eps is 1e-6")
+        @:PROHIBIT(wenoz .and. weno_order == 7 .and. f_is_default(wenoz_q), &
+            "wenoz is used at 7th order, but wenoz_q is not set. It should be either 2 or 4")
         @:PROHIBIT(teno .and. f_is_default(teno_CT), "teno is used, but teno_CT is not set. A typical value of teno_CT is 1e-6")
         @:PROHIBIT(teno .and. teno_CT <= 0d0, "teno_CT must be positive. A typical value of teno_CT is 1e-6")
         @:PROHIBIT(count([mapped_weno, wenoz, teno]) >= 2, "Only one of mapped_weno, wenoz, or teno can be set to true")
         @:PROHIBIT(weno_order == 1 .and. mapped_weno)
         @:PROHIBIT(weno_order == 1 .and. wenoz)
-        @:PROHIBIT(weno_order /= 5 .and. teno)
+        @:PROHIBIT((weno_order == 1 .or. weno_order == 3) .and. teno)
         @:PROHIBIT(weno_order /= 5 .and. mp_weno)
         @:PROHIBIT(model_eqns == 1 .and. weno_avg)
     end subroutine s_check_inputs_weno

src/simulation/m_checker.fpp

@@ -149,6 +149,7 @@ module m_global_parameters
 
     real(kind(0d0)) :: weno_eps       !< Binding for the WENO nonlinear weights
     real(kind(0d0)) :: teno_CT        !< Smoothness threshold for TENO
+    real(kind(0d0)) :: wenoz_q        !< Power constant for WENO-Z
     logical :: mp_weno        !< Monotonicity preserving (MP) WENO
     logical :: weno_avg       ! Average left/right cell-boundary states
     logical :: weno_Re_flux   !< WENO reconstruct velocity gradients for viscous stress tensor
@@ -180,7 +181,7 @@ module m_global_parameters
         !$acc declare create(num_dims, weno_polyn, weno_order, num_fluids, wenojs, mapped_weno, wenoz, teno)
     #:endif
 
-    !$acc declare create(mpp_lim, model_eqns, mixture_err, alt_soundspeed, avg_state, mp_weno, weno_eps, teno_CT, hypoelasticity, low_Mach)
+    !$acc declare create(mpp_lim, model_eqns, mixture_err, alt_soundspeed, avg_state, mp_weno, weno_eps, teno_CT, wenoz_q, hypoelasticity, low_Mach)
 
     logical :: relax          !< activate phase change
     integer :: relax_model    !< Relaxation model
@@ -528,6 +529,7 @@ contains
         time_stepper = dflt_int
         weno_eps = dflt_real
         teno_CT = dflt_real
+        wenoz_q = dflt_real
         mp_weno = .false.
         weno_avg = .false.
         weno_Re_flux = .false.
@@ -1109,7 +1111,7 @@ contains
         !$acc update device(cfl_target, m, n, p)
 
         !$acc update device(alt_soundspeed, acoustic_source, num_source)
-        !$acc update device(dt, sys_size, buff_size, pref, rhoref, gamma_idx, pi_inf_idx, E_idx, alf_idx, stress_idx, mpp_lim, bubbles, hypoelasticity, alt_soundspeed, avg_state, num_fluids, model_eqns, num_dims, mixture_err, grid_geometry, cyl_coord, mp_weno, weno_eps, teno_CT, low_Mach)
+        !$acc update device(dt, sys_size, buff_size, pref, rhoref, gamma_idx, pi_inf_idx, E_idx, alf_idx, stress_idx, mpp_lim, bubbles, hypoelasticity, alt_soundspeed, avg_state, num_fluids, model_eqns, num_dims, mixture_err, grid_geometry, cyl_coord, mp_weno, weno_eps, teno_CT, wenoz_q, low_Mach)
 
         #:if not MFC_CASE_OPTIMIZATION
             !$acc update device(wenojs, mapped_weno, wenoz, teno)

src/simulation/m_global_parameters.fpp

@@ -213,7 +213,7 @@ contains
             #:endfor
         end if
 
-        #:for VAR in [ 'dt','weno_eps','teno_CT','pref','rhoref','R0ref','Web','Ca', 'sigma', &
+        #:for VAR in [ 'dt','weno_eps','wenoz_q','teno_CT','pref','rhoref','R0ref','Web','Ca', 'sigma', &
             & 'Re_inv', 'poly_sigma', 'palpha_eps', 'ptgalpha_eps', 'pi_fac',    &
             & 'bc_x%vb1','bc_x%vb2','bc_x%vb3','bc_x%ve1','bc_x%ve2','bc_x%ve2', &
             & 'bc_y%vb1','bc_y%vb2','bc_y%vb3','bc_y%ve1','bc_y%ve2','bc_y%ve3', &

src/simulation/m_mpi_proxy.fpp

@@ -942,7 +942,7 @@ contains
                                   flux_src_n(id)%vf, &
                                   flux_gsrc_n(id)%vf, &
                                   id, ix, iy, iz)
-            print *, 'DEBUG riemann_solver completed'
+            ! print *, 'DEBUG riemann_solver completed'
             call nvtxEndRange
 
             ! Additional physics and source terms ==============================
@@ -2159,7 +2159,7 @@ contains
         integer :: ii
         ! Reconstruction in s1-direction ===================================
 
-        print *, 'DEBUG m_rhs s_reconstruct_cell_boundary_values started'
+        ! print *, 'DEBUG m_rhs s_reconstruct_cell_boundary_values started'
 
         if (norm_dir == 1) then
             is1 = ix; is2 = iy; is3 = iz
@@ -2199,7 +2199,7 @@ contains
                         is1, is2, is3)
         end if
 
-        print *, 'DEBUG m_rhs s_reconstruct_cell_boundary_values ended'
+        ! print *, 'DEBUG m_rhs s_reconstruct_cell_boundary_values ended'
 
         ! ==================================================================
     end subroutine s_reconstruct_cell_boundary_values

src/simulation/m_rhs.fpp

@@ -136,7 +136,7 @@ contains
             t_step_start, t_step_stop, t_step_save, t_step_print, &
             model_eqns, mpp_lim, time_stepper, weno_eps, weno_flat, &
             riemann_flat, rdma_mpi, cu_tensor, &
-            teno_CT, mp_weno, weno_avg, &
+            teno_CT, wenoz_q, mp_weno, weno_avg, &
             riemann_solver, low_Mach, wave_speeds, avg_state, &
             bc_x, bc_y, bc_z, &
             x_domain, y_domain, z_domain, &

src/simulation/m_start_up.fpp

@@ -630,13 +630,13 @@ contains
         end if
 
         call s_compute_rhs(q_cons_ts(1)%vf, q_prim_vf, rhs_vf, pb_ts(1)%sf, rhs_pb, mv_ts(1)%sf, rhs_mv, t_step, time_avg)
-        print *, 'DEBUG RK3 step 1 compute_rhs completed'
+        ! print *, 'DEBUG RK3 step 1 compute_rhs completed'
 
         ! if (run_time_info) then
         if (.true.) then ! DEBUG ALWAYS WRITE RUN_TIME INFO
             call s_write_run_time_information(q_prim_vf, t_step)
         end if
-        print *, 'DEBUG RK3 step 1 write run_time_information completed'
+        ! print *, 'DEBUG RK3 step 1 write run_time_information completed'
         ! call exit(66)
 
         if (probe_wrt) then

src/simulation/m_time_steppers.fpp

@@ -997,7 +997,7 @@ contains
 
         ! Reconstruction in s1-direction ===================================
 
-        print *, 'DEBUG m_rhs s_reconstruct_cell_boundary_values_visc started'
+        ! print *, 'DEBUG m_rhs s_reconstruct_cell_boundary_values_visc started'
 
         if (norm_dir == 1) then
             is1_viscous = ix; is2_viscous = iy; is3_viscous = iz