src: retire legacy WENO_TYPE and MUSCL_TYPE constants

Author: sbryngelson

src/common/m_constants.fpp

@@ -50,10 +50,7 @@ module m_constants
     real(wp), parameter :: broadband_spectral_level_constant = 20._wp
     !> The spectral level constant to correct the magnitude at each frequency to ensure the source is overall broadband
     real(wp), parameter :: broadband_spectral_level_growth_rate = 10._wp
-    ! Reconstruction Types
-    integer, parameter :: WENO_TYPE = 1   !< Using WENO for reconstruction type
-    integer, parameter :: MUSCL_TYPE = 2  !< Using MUSCL for reconstruction type
-    ! Interface Compression
+    ! Reconstruction Types Interface Compression
     real(wp), parameter :: dflt_ic_eps = 1e-4_wp        !< Ensure compression is only applied to surface cells in THINC
     real(wp), parameter :: dflt_ic_beta = 1.6_wp        !< Sharpness parameter's default value used in THINC
     real(wp), parameter :: moncon_cutoff = 1e-8_wp      !< Monotonicity constraint's limiter to prevent extremas in THINC

src/post_process/m_global_parameters.fpp

@@ -14,7 +14,8 @@ module m_global_parameters
     use m_derived_types
     use m_helper_basic
     use m_thermochem, only: num_species, species_names
-    use m_constants, only: model_eqns_gamma_law, model_eqns_5eq, model_eqns_6eq, model_eqns_4eq, format_silo, precision_single
+    use m_constants, only: model_eqns_gamma_law, model_eqns_5eq, model_eqns_6eq, model_eqns_4eq, format_silo, precision_single, &
+        & recon_type_weno
 
     implicit none
 
@@ -186,7 +187,7 @@ contains
         ! Simulation algorithm parameters
         model_eqns = dflt_int
         num_fluids = dflt_int
-        recon_type = WENO_TYPE
+        recon_type = recon_type_weno
         weno_order = dflt_int
         muscl_order = dflt_int
         mixture_err = .false.

src/pre_process/m_global_parameters.fpp

@@ -161,7 +161,7 @@ contains
         palpha_eps = dflt_real
         ptgalpha_eps = dflt_real
         num_fluids = dflt_int
-        recon_type = WENO_TYPE
+        recon_type = recon_type_weno
         weno_order = dflt_int
         igr = .false.
         igr_order = dflt_int

src/simulation/m_cbc.fpp

@@ -350,7 +350,7 @@ contains
 
         ! Computing CBC1 Coefficients
         #:for CBC_DIR, XYZ in [(1, 'x'), (2, 'y'), (3, 'z')]
-            if (cbc_dir_in == ${CBC_DIR}$ .and. recon_type == WENO_TYPE) then
+            if (cbc_dir_in == ${CBC_DIR}$ .and. recon_type == recon_type_weno) then
                 if (weno_order == 1) then
                     fd_coef_${XYZ}$ (:,cbc_loc_in) = 0._wp
                     fd_coef_${XYZ}$ (0, cbc_loc_in) = -2._wp/(ds(0) + ds(1))
@@ -524,7 +524,7 @@ contains
         call s_associate_cbc_coefficients_pointers(cbc_dir, cbc_loc)
 
         #:for CBC_DIR, XYZ in [(1, 'x'), (2, 'y'), (3, 'z')]
-            if (cbc_dir == ${CBC_DIR}$ .and. recon_type == WENO_TYPE) then
+            if (cbc_dir == ${CBC_DIR}$ .and. recon_type == recon_type_weno) then
                 ! PI2 of flux_rs_vf and flux_src_rs_vf at j = 1/2
                 if (weno_order == 3) then
                     call s_convert_primitive_to_flux_variables(q_prim_rs${XYZ}$_vf, F_rs${XYZ}$_vf, F_src_rs${XYZ}$_vf, is1, is2, &

src/simulation/m_global_parameters.fpp

@@ -485,7 +485,7 @@ contains
 
         #:if not MFC_CASE_OPTIMIZATION
             nb = 1
-            recon_type = WENO_TYPE
+            recon_type = recon_type_weno
             weno_order = dflt_int
             muscl_order = dflt_int
             muscl_lim = dflt_int

src/simulation/m_rhs.fpp

@@ -14,7 +14,8 @@ module m_rhs
     use m_mpi_proxy
     use m_variables_conversion
     use m_weno
-    use m_constants, only: riemann_solver_hll, riemann_solver_hlld, model_eqns_6eq, int_comp_mthinc
+    use m_constants, only: riemann_solver_hll, riemann_solver_hlld, model_eqns_6eq, int_comp_mthinc, recon_type_weno, &
+        & recon_type_muscl
     use m_muscl
     use m_riemann_solvers
     use m_cbc
@@ -1600,7 +1601,7 @@ contains
         integer :: recon_dir  !< Coordinate direction of the reconstruction
         integer :: i, j, k, l
 
-        #:for SCHEME, TYPE in [('weno','WENO_TYPE'), ('muscl','MUSCL_TYPE')]
+        #:for SCHEME, TYPE in [('weno','recon_type_weno'), ('muscl','recon_type_muscl')]
             if (recon_type == ${TYPE}$) then
                 ! Reconstruction in s1-direction
                 if (norm_dir == 1) then
@@ -1635,7 +1636,7 @@ contains
         integer :: i, j, k, l
         ! Reconstruction in s1-direction
 
-        #:for SCHEME, TYPE in [('weno','WENO_TYPE'), ('muscl', 'MUSCL_TYPE')]
+        #:for SCHEME, TYPE in [('weno','recon_type_weno'), ('muscl', 'recon_type_muscl')]
             if (recon_type == ${TYPE}$) then
                 if (norm_dir == 1) then
                     is1 = idwbuff(1); is2 = idwbuff(2); is3 = idwbuff(3)

src/simulation/m_viscous.fpp

@@ -13,7 +13,7 @@ module m_viscous
     use m_muscl
     use m_helper
     use m_finite_differences
-    use m_constants, only: model_eqns_5eq
+    use m_constants, only: model_eqns_5eq, recon_type_weno, recon_type_muscl
 
     private; public s_get_viscous, s_compute_viscous_stress_cylindrical_boundary, s_initialize_viscous_module, &
         & s_reconstruct_cell_boundary_values_visc_deriv, s_finalize_viscous_module, s_compute_viscous_stress_tensor
@@ -857,7 +857,7 @@ contains
         integer :: recon_dir  !< Coordinate direction of the WENO reconstruction
         integer :: i, j, k, l
 
-        #:for SCHEME, TYPE in [('weno','WENO_TYPE'), ('muscl','MUSCL_TYPE')]
+        #:for SCHEME, TYPE in [('weno','recon_type_weno'), ('muscl','recon_type_muscl')]
             if (recon_type == ${TYPE}$) then
                 ! Reconstruction in s1-direction
 
@@ -941,7 +941,7 @@ contains
         integer :: recon_dir  !< Coordinate direction of the WENO reconstruction
         integer :: i, j, k, l
 
-        #:for SCHEME, TYPE in [('weno','WENO_TYPE'), ('muscl','MUSCL_TYPE')]
+        #:for SCHEME, TYPE in [('weno','recon_type_weno'), ('muscl','recon_type_muscl')]
             if (recon_type == ${TYPE}$) then
                 ! Reconstruction in s1-direction