Skip to content

Commit 0b8e68b

Browse files
committed
remove case-opt for teno_CT
1 parent c7a6a2d commit 0b8e68b

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

src/simulation/m_global_parameters.fpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ module m_global_parameters
136136
logical, parameter :: wenoz = (${wenoz}$ /= 0) !< WENO-Z
137137
logical, parameter :: teno = (${teno}$ /= 0) !< TENO (Targeted ENO)
138138
real(kind(0d0)), parameter :: wenoz_q = ${wenoz_q}$ !< Power constant for WENO-Z
139-
real(kind(0d0)), parameter :: teno_CT = ${teno_CT}$ !< Smoothness threshold for TENO
140139
#:else
141140
integer :: weno_polyn !< Degree of the WENO polynomials (polyn)
142141
integer :: weno_order !< Order of the WENO reconstruction
@@ -147,10 +146,10 @@ module m_global_parameters
147146
logical :: wenoz !< WENO-Z
148147
logical :: teno !< TENO (Targeted ENO)
149148
real(kind(0d0)) :: wenoz_q !< Power constant for WENO-Z
150-
real(kind(0d0)) :: teno_CT !< Smoothness threshold for TENO
151149
#:endif
152150

153151
real(kind(0d0)) :: weno_eps !< Binding for the WENO nonlinear weights
152+
real(kind(0d0)) :: teno_CT !< Smoothness threshold for TENO
154153
logical :: mp_weno !< Monotonicity preserving (MP) WENO
155154
logical :: weno_avg ! Average left/right cell-boundary states
156155
logical :: weno_Re_flux !< WENO reconstruct velocity gradients for viscous stress tensor
@@ -179,10 +178,10 @@ module m_global_parameters
179178
integer :: cpu_start, cpu_end, cpu_rate
180179

181180
#:if not MFC_CASE_OPTIMIZATION
182-
!$acc declare create(num_dims, weno_polyn, weno_order, weno_num_stencils, num_fluids, wenojs, mapped_weno, wenoz, teno, wenoz_q, teno_CT)
181+
!$acc declare create(num_dims, weno_polyn, weno_order, weno_num_stencils, num_fluids, wenojs, mapped_weno, wenoz, teno, wenoz_q)
183182
#:endif
184183

185-
!$acc declare create(mpp_lim, model_eqns, mixture_err, alt_soundspeed, avg_state, mp_weno, weno_eps, hypoelasticity, low_Mach)
184+
!$acc declare create(mpp_lim, model_eqns, mixture_err, alt_soundspeed, avg_state, mp_weno, weno_eps, teno_CT, hypoelasticity, low_Mach)
186185

187186
logical :: relax !< activate phase change
188187
integer :: relax_model !< Relaxation model
@@ -529,6 +528,7 @@ contains
529528
mpp_lim = .false.
530529
time_stepper = dflt_int
531530
weno_eps = dflt_real
531+
teno_CT = dflt_real
532532
mp_weno = .false.
533533
weno_avg = .false.
534534
weno_Re_flux = .false.
@@ -555,7 +555,6 @@ contains
555555
mapped_weno = .false.
556556
wenoz = .false.
557557
teno = .false.
558-
teno_CT = dflt_real
559558
wenoz_q = dflt_real
560559
#:endif
561560

@@ -1111,11 +1110,11 @@ contains
11111110
!$acc update device(cfl_target, m, n, p)
11121111

11131112
!$acc update device(alt_soundspeed, acoustic_source, num_source)
1114-
!$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, low_Mach)
1113+
!$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)
11151114

11161115
#:if not MFC_CASE_OPTIMIZATION
11171116
!$acc update device(wenojs, mapped_weno, wenoz, teno)
1118-
!$acc update device(teno_CT, wenoz_q)
1117+
!$acc update device(wenoz_q)
11191118
#:endif
11201119

11211120
!$acc enter data copyin(nb, R0ref, Ca, Web, Re_inv, weight, R0, V0, bubbles, polytropic, polydisperse, qbmm, R0_type, ptil, bubble_model, thermal, poly_sigma)

src/simulation/m_start_up.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ contains
136136
t_step_start, t_step_stop, t_step_save, t_step_print, &
137137
model_eqns, mpp_lim, time_stepper, weno_eps, weno_flat, &
138138
riemann_flat, rdma_mpi, cu_tensor, &
139-
mp_weno, weno_avg, &
139+
teno_CT, mp_weno, weno_avg, &
140140
riemann_solver, low_Mach, wave_speeds, avg_state, &
141141
bc_x, bc_y, bc_z, &
142142
x_domain, y_domain, z_domain, &
@@ -149,7 +149,7 @@ contains
149149
rhoref, pref, bubbles, bubble_model, &
150150
R0ref, chem_params, &
151151
#:if not MFC_CASE_OPTIMIZATION
152-
nb, mapped_weno, wenoz, teno, teno_CT, wenoz_q, weno_order, num_fluids, &
152+
nb, mapped_weno, wenoz, teno, wenoz_q, weno_order, num_fluids, &
153153
#:endif
154154
Ca, Web, Re_inv, &
155155
acoustic_source, acoustic, num_source, &

toolchain/mfc/case.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ def __get_sim_fpp(self, print: bool) -> str:
214214
#:set wenoz = {wenoz}
215215
#:set teno = {teno}
216216
#:set wenoz_q = {int(self.params.get("wenoz_q", -1))}
217-
#:set teno_CT = {self.params.get("teno_CT", -1.0)}
218217
"""
219218

220219
return """\

toolchain/mfc/run/case_dicts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ def analytic(self):
361361
ALL.update(SIMULATION)
362362
ALL.update(POST_PROCESS)
363363

364-
CASE_OPTIMIZATION = [ "mapped_weno", "wenoz", "teno", "wenoz_q", "teno_CT", "nb", "weno_order", "num_fluids" ]
364+
CASE_OPTIMIZATION = [ "mapped_weno", "wenoz", "teno", "wenoz_q", "nb", "weno_order", "num_fluids" ]
365365

366366
_properties = { k: v.value for k, v in ALL.items() }
367367

0 commit comments

Comments
 (0)