clean up

Author: ChrisZYJ

src/pre_process/m_checker.fpp

@@ -116,6 +116,7 @@ contains
 
         ! Common checks for all directions (stretch_x, stretch_y, and stretch_z)
         #:for X in ['x', 'y', 'z']
+            @:PROHIBIT(stretch_${X}$ .and. weno_order == 7, "weno_order = 7 does not support stretched grids")
             @:PROHIBIT(stretch_${X}$ .and. old_grid, "old_grid and stretch_${X}$ are incompatible")
             @:PROHIBIT(stretch_${X}$ .and. f_is_default(a_${X}$), "a_${X}$ must be set with stretch_${X}$ enabled")
             @:PROHIBIT(stretch_${X}$ .and. f_is_default(${X}$_a), "${X}$_a must be set with stretch_${X}$ enabled")

src/simulation/m_cbc.fpp

@@ -713,7 +713,6 @@ contains
                     ! ==================================================================
 
                     ! PI4 of flux_rs_vf and flux_src_rs_vf at j = 1/2, 3/2 =============
-                ! elseif (weno_order == 5) then
                 else
                     call s_convert_primitive_to_flux_variables(q_prim_rs${XYZ}$_vf, &
                                                                F_rs${XYZ}$_vf, &

src/simulation/m_checker.fpp

@@ -67,7 +67,9 @@ contains
             "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")
+            "wenoz is used at 7th order, but wenoz_q is not set. It should be either 2, 3, or 4")
+        @:PROHIBIT(wenoz .and. weno_order == 7 .and. .not. (f_approx_equal(wenoz_q, 2d0) .or. f_approx_equal(wenoz_q, 3d0) .or. f_approx_equal(wenoz_q, 4d0)), &
+            "wenoz_q must be either 2, 3, 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")

src/simulation/m_global_parameters.fpp

@@ -138,8 +138,6 @@ module m_global_parameters
         integer :: weno_polyn     !< Degree of the WENO polynomials (polyn)
         integer :: weno_order     !< Order of the WENO reconstruction
         integer :: weno_num_stencils    !< Number of stencils for WENO reconstruction (only different weno_polyn for TENO(>5))
-        integer :: weno_dvd_ubound !< Upper limit for dvd used in s_compute_weno_coefficients
-
         integer :: num_fluids     !< number of fluids in the simulation
         logical :: wenojs         !< WENO-JS (default)
         logical :: mapped_weno    !< WENO-M (WENO with mapping of nonlinear weights)
@@ -715,10 +713,8 @@ contains
             weno_polyn = (weno_order - 1)/2
             if (teno) then
                 weno_num_stencils = weno_order - 3
-                weno_dvd_ubound = weno_order
             else
                 weno_num_stencils = weno_polyn
-                weno_dvd_ubound = weno_polyn - 1
             end if
             !$acc update device(weno_polyn)
             !$acc update device(nb)

src/simulation/m_rhs.fpp

@@ -942,7 +942,6 @@ contains
                                   flux_src_n(id)%vf, &
                                   flux_gsrc_n(id)%vf, &
                                   id, ix, iy, iz)
-            ! print *, 'DEBUG riemann_solver completed'
             call nvtxEndRange
 
             ! Additional physics and source terms ==============================
@@ -2155,12 +2154,8 @@ contains
         integer :: weno_dir !< Coordinate direction of the WENO reconstruction
 
         integer :: i, j, k, l
-
-        integer :: ii
         ! Reconstruction in s1-direction ===================================
 
-        ! print *, 'DEBUG m_rhs s_reconstruct_cell_boundary_values started'
-
         if (norm_dir == 1) then
             is1 = ix; is2 = iy; is3 = iz
             weno_dir = 1; is1%beg = is1%beg + weno_polyn
@@ -2199,8 +2194,6 @@ contains
                         is1, is2, is3)
         end if
 
-        ! print *, 'DEBUG m_rhs s_reconstruct_cell_boundary_values ended'
-
         ! ==================================================================
     end subroutine s_reconstruct_cell_boundary_values
 

src/simulation/m_riemann_solvers.fpp

@@ -266,7 +266,6 @@ module m_riemann_solvers
 
 contains
 
-    ! DEBUG: 1D_test_WENO7 is using this
     subroutine s_hll_riemann_solver(qL_prim_rsx_vf, qL_prim_rsy_vf, qL_prim_rsz_vf, dqL_prim_dx_vf, & ! -------
                                     dqL_prim_dy_vf, &
                                     dqL_prim_dz_vf, &

src/simulation/m_start_up.fpp

@@ -1156,8 +1156,6 @@ contains
             call s_2nd_order_tvd_rk(t_step, time_avg)
         elseif (time_stepper == 3 .and. (.not. adap_dt)) then
             call s_3rd_order_tvd_rk(t_step, time_avg)
-            ! print *, 'DEBUG RK3 completed'
-            ! call exit(33)
         elseif (time_stepper == 3 .and. adap_dt) then
             call s_strang_splitting(t_step, time_avg)
         end if

src/simulation/m_time_steppers.fpp

@@ -630,14 +630,10 @@ 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'
 
-        ! if (run_time_info) then
-        if (.true.) then ! DEBUG ALWAYS WRITE RUN_TIME INFO
+        if (run_time_info) then
             call s_write_run_time_information(q_prim_vf, t_step)
         end if
-        ! print *, 'DEBUG RK3 step 1 write run_time_information completed'
-        ! call exit(66)
 
         if (probe_wrt) then
             call s_time_step_cycling(t_step)

src/simulation/m_viscous.fpp

@@ -997,8 +997,6 @@ contains
 
         ! Reconstruction in s1-direction ===================================
 
-        ! 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
             weno_dir = 1; is1_viscous%beg = is1_viscous%beg + weno_polyn