MTHINC interface compression method

Author: sbryngelson

docs/documentation/case.md

@@ -433,8 +433,8 @@ See @ref equations "Equations" for the mathematical models these parameters cont
 | `mp_weno`                  | Logical | Monotonicity preserving WENO |
 | `muscl_order`              | Integer | MUSCL order [1,2] |
 | `muscl_lim`                | Integer | MUSCL Slope Limiter: [1] minmod; [2] monotonized central; [3] Van Albada; [4] Van Leer; [5] SUPERBEE |
+| `int_comp`                 | Integer | Interface Compression [1] THINC [2] MTHINC |
 | `flux_lim`                 | Integer | Flux limiter for post-process: [1] minmod; [2] MUSCL; [3] OSPRE; [4] SUPERBEE |
-| `int_comp`                 | Logical | THINC Interface Compression |
 | `ic_eps`                   | Real    | Interface compression threshold (default: 1e-4) |
 | `ic_beta`                  | Real    | Interface compression sharpness parameter (default: 1.6) |
 | `riemann_solver`           | Integer | Riemann solver algorithm: [1] HLL*; [2] HLLC; [3] Exact*; [4] HLLD	(only for MHD) |
@@ -530,7 +530,7 @@ It is recommended to set `weno_eps` to $10^{-6}$ for WENO-JS, and to $10^{-40}$
 - `muscl_lim` specifies the slope limiter that is used in 2nd order MUSCL Reconstruction by an integer from 1 through 5.
 `muscl_lim = 1`, `2`, `3`, `4`, and `5` correspond to minmod, monotonized central, Van Albada, Van Leer, and SUPERBEE, respectively.
 
-- `int_comp` activates interface compression using THINC used in MUSCL Reconstruction, with control parameters (`ic_eps`, and `ic_beta`).
+- `int_comp` activates interface compression using [1] THINC or [2] MTHINC used in variable reconstruction, with control parameters (`ic_eps`, and `ic_beta`).
 
 - `riemann_solver` specifies the choice of the Riemann solver that is used in simulation by an integer from 1 through 4.
 `riemann_solver = 1`, `2`, and `3` correspond to HLL, HLLC, and Exact Riemann solver, respectively (\cite Toro09).

docs/module_categories.json

@@ -7,7 +7,8 @@
             "m_weno",
             "m_riemann_solvers",
             "m_muscl",
-            "m_variables_conversion"
+            "m_variables_conversion",
+            "m_thinc"
         ]
     },
     {

examples/1D_sodshocktube_muscl/case.py

@@ -36,7 +36,7 @@
             "recon_type": 2,
             "muscl_order": 2,
             "muscl_lim": 2,
-            "int_comp": "T",
+            "int_comp": 1,
             "riemann_solver": 2,
             "wave_speeds": 1,
             "avg_state": 2,

examples/2D_advection_muscl/case.py

@@ -30,7 +30,7 @@
             "recon_type": 2,
             "muscl_order": 2,
             "muscl_lim": 2,
-            "int_comp": "T",
+            "int_comp": 1,
             "null_weights": "F",
             "riemann_solver": 2,
             "wave_speeds": 1,

examples/2D_riemann_test_muscl/case.py

@@ -34,7 +34,7 @@
             # "weno_eps": 1e-16,
             "muscl_order": 2,
             "muscl_lim": 1,
-            "int_comp": "T",
+            "int_comp": 1,
             "riemann_solver": 2,
             "wave_speeds": 1,
             "avg_state": 2,

examples/2D_shockdroplet_muscl/case.py

@@ -59,7 +59,7 @@
             "recon_type": 2,
             "muscl_order": 2,
             "muscl_lim": 4,
-            "int_comp": "T",
+            "int_comp": 1,
             "null_weights": "F",
             "riemann_solver": 2,
             "wave_speeds": 1,

examples/3D_rayleigh_taylor_muscl/case.py

@@ -57,7 +57,7 @@
     "recon_type": 2,
     "muscl_order": 2,
     "muscl_lim": 4,
-    "int_comp": "T",
+    "int_comp": 1,
     "avg_state": 2,
     "riemann_solver": 2,
     "wave_speeds": 1,

examples/3D_shockdroplet_muscl/case.py

@@ -202,7 +202,7 @@
             "recon_type": 2,
             "muscl_order": 2,
             "muscl_lim": 3,
-            "int_comp": "T",
+            "int_comp": 1,
             "riemann_solver": 2,
             "wave_speeds": 1,
             "avg_state": 2,

src/simulation/m_global_parameters.fpp

@@ -162,7 +162,7 @@ module m_global_parameters
     logical            :: mixture_err                  !< Mixture properties correction
     logical            :: hypoelasticity               !< hypoelasticity modeling
     logical            :: hyperelasticity              !< hyperelasticity modeling
-    logical            :: int_comp                     !< THINC interface compression
+    integer            :: int_comp                     !< Interface compression: 0=off, 1=THINC, 2=MTHINC
     real(wp)           :: ic_eps                       !< THINC Epsilon to compress on surface cells
     real(wp)           :: ic_beta                      !< THINC Sharpness Parameter
     integer            :: hyper_model                  !< hyperelasticity solver algorithm
@@ -561,7 +561,7 @@ contains
         ptgalpha_eps = dflt_real
         hypoelasticity = .false.
         hyperelasticity = .false.
-        int_comp = .false.
+        int_comp = 0
         ic_eps = dflt_ic_eps
         ic_beta = dflt_ic_beta
         elasticity = .false.
@@ -845,7 +845,6 @@ contains
 
         #:if not MFC_CASE_OPTIMIZATION
             ! Determining the degree of the WENO polynomials
-
             if (recon_type == WENO_TYPE) then
                 weno_polyn = (weno_order - 1)/2
                 if (teno) then
@@ -894,8 +893,7 @@ contains
                 E_idx = mom_idx%end + 1
 
                 if (igr) then
-                    ! IGR: volume fractions after energy (N-1 for N fluids; skipped when num_fluids=1)
-                    adv_idx%beg = E_idx + 1  ! Alpha for fluid 1
+                    adv_idx%beg = E_idx + 1
                     adv_idx%end = E_idx + num_fluids - 1
                 else
                     ! Volume fractions are stored in the indices immediately following the energy equation. WENO/MUSCL + Riemann
@@ -990,11 +988,11 @@ contains
                 internalEnergies_idx%end = adv_idx%end + num_fluids
                 sys_size = internalEnergies_idx%end
             else if (model_eqns == 4) then
-                cont_idx%beg = 1  ! one continuity equation
+                cont_idx%beg = 1
                 cont_idx%end = 1  ! num_fluids
-                mom_idx%beg = cont_idx%end + 1  ! one momentum equation in each direction
+                mom_idx%beg = cont_idx%end + 1
                 mom_idx%end = cont_idx%end + num_vels
-                E_idx = mom_idx%end + 1  ! one energy equation
+                E_idx = mom_idx%end + 1
                 adv_idx%beg = E_idx + 1
                 adv_idx%end = adv_idx%beg  ! one volume advection equation
                 alf_idx = adv_idx%end
@@ -1173,7 +1171,7 @@ contains
             fd_number = max(1, fd_order/2)
         end if
 
-        if (mhd) then  ! TODO merge with above; waiting for hyperelasticity PR
+        if (mhd) then
             fd_number = max(1, fd_order/2)
         end if
 
@@ -1196,7 +1194,7 @@ contains
             grid_geometry = 1
         else if (cyl_coord .and. p == 0) then  ! Axisymmetric cylindrical grid
             grid_geometry = 2
-        else  ! Fully 3D cylindrical grid
+        else
             grid_geometry = 3
         end if
 

src/simulation/m_mpi_proxy.fpp

@@ -76,7 +76,7 @@ contains
             & 'num_probes', 'num_integrals', 'bubble_model', 'thermal',        &
             & 'num_source', 'relax_model', 'num_ibs', 'n_start',    &
             & 'num_bc_patches', 'num_igr_iters', 'num_igr_warm_start_iters', &
-            & 'adap_dt_max_iters' ]
+            & 'adap_dt_max_iters', 'int_comp' ]
             call MPI_BCAST(${VAR}$, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
         #:endfor
 
@@ -92,7 +92,7 @@ contains
             & 'bc_z%grcbc_in', 'bc_z%grcbc_out', 'bc_z%grcbc_vel_out',          &
             & 'cfl_adap_dt', 'cfl_const_dt', 'cfl_dt', 'surface_tension',       &
             & 'shear_stress', 'bulk_stress', 'bubbles_lagrange',                &
-            & 'hyperelasticity', 'down_sample', 'int_comp','fft_wrt', &
+            & 'hyperelasticity', 'down_sample', 'fft_wrt', &
             & 'hyper_cleaning', 'ib_state_wrt']
             call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
         #:endfor
@@ -245,7 +245,6 @@ contains
 
 #ifdef MFC_MPI
         integer :: ierr  !< Generic flag used to identify and report MPI errors
-
         call MPI_BCAST(phi_rn, num_freq, mpi_p, 0, MPI_COMM_WORLD, ierr)
 #endif