Skip to content

Commit 90e1968

Browse files
sbryngelsonsbryngelson
authored
Merge pull request #172 from haochey/master
2 parents 363d584 + ee05cb5 commit 90e1968

File tree

84 files changed

+1687
-199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1687
-199
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_
140140
endif()
141141

142142
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
143-
add_compile_options(-C -g -Og -traceback -Mchkptr -Mchkstk -Minform=inform -Mbounds)
143+
add_compile_options(-C -g -traceback -Mchkptr -Mchkstk -Minform=inform -Mbounds)
144144
endif()
145145
endif()
146146

‎docs/documentation/case.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ Details of implementation of viscosity in MFC can be found in [Coralic (2015)](r
282282
| `riemann_solver` | Integer | Riemann solver algorithm: [1] HLL*; [2] HLLC; [3] Exact* |
283283
| `avg_state` | Integer | Averaged state evaluation method: [1] Roe averagen*; [2] Arithmetic mean |
284284
| `wave_speeds` | Integer | Wave-speed estimation: [1] Direct (Batten et al. 1997); [2] Pressure-velocity* (Toro 1999) |
285+
| `weno_Re_flux` | Logical | Compute velocity gradient using scaler divergence theorem |
286+
| `weno_avg` | Logical | Arithmetic mean of left and right, WENO-reconstructed, cell-boundary values |
285287

286288
- \* Options that work only with `model_eqns` $=2$.
287289
- † Options that work only with `cyl_coord` $=$ `False`.
@@ -330,6 +332,10 @@ Note that `time_stepper` $=$ 3 specifies the total variation diminishing (TVD),
330332
- `wave_speeds` specifies the choice of the method to compute the left, right, and middle wave speeds in the Riemann solver by an integer of 1 and 2.
331333
`wave_speeds` $=$ 1 and 2 correspond to the direct method ([Batten et al., 1997](references.md#Batten97)), and indirect method that approximates the pressures and velocity ([Toro, 2013](references.md#Toro13)), respectively.
332334

335+
- `weno_Re_flux` activates the scaler divergence theorem in computing the velocity gradients using WENO-reconstructed cell boundary values. If this option is false, velocity gradient is computed using finite difference scheme of order 2 which is independent of the WENO order.
336+
337+
- `weno_avg` it activates the arithmetic average of the left and right, WENO-reconstructed, cell-boundary values. This option requires `weno_Re_flux` to be true because cell boundary values are only utilized when employing the scalar divergence method in the computation of velocity gradients.
338+
333339

334340
### 6. Formatted Output
335341

‎examples/0D_qbmm/case.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
'time_stepper' : 1,
8686
'weno_order' : 3,
8787
'weno_eps' : 1.E-16,
88+
'weno_Re_flux' : 'F',
89+
'weno_avg' : 'F',
8890
'mapped_weno' : 'T',
8991
'null_weights' : 'F',
9092
'mp_weno' : 'F',

‎examples/1D_bubblescreen/case.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@
101101
'time_stepper' : 3,
102102
'weno_order' : 5,
103103
'weno_eps' : 1.E-16,
104+
'weno_Re_flux' : 'F',
105+
'weno_avg' : 'F',
104106
'mapped_weno' : 'T',
105107
'null_weights' : 'F',
106108
'mp_weno' : 'T',

‎examples/1D_exp_bubscreen/case.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@
114114
'time_stepper' : 3,
115115
'weno_order' : 5,
116116
'weno_eps' : 1.E-16,
117+
'weno_Re_flux' : 'F',
118+
'weno_avg' : 'F',
117119
'mapped_weno' : 'T',
118120
'null_weights' : 'F',
119121
'mp_weno' : 'T',

‎examples/1D_hypo_2materials/case.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
'mixture_err' : 'F',
3939
'time_stepper' : 3,
4040
'weno_order' : 3,
41-
'weno_eps' : 1.E-16,
41+
'weno_eps' : 1.E-16,
42+
'weno_Re_flux' : 'F',
43+
'weno_avg' : 'F',
4244
'mapped_weno' : 'F',
4345
'null_weights' : 'F',
4446
'mp_weno' : 'F',

‎examples/1D_impact/case.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
'mixture_err' : 'F',
4040
'time_stepper' : 3,
4141
'weno_order' : 3,
42-
'weno_eps' : 1.E-16,
42+
'weno_eps' : 1.E-16,
43+
'weno_Re_flux' : 'F',
44+
'weno_avg' : 'F',
4345
'mapped_weno' : 'F',
4446
'null_weights' : 'F',
4547
'mp_weno' : 'F',

‎examples/1D_kapilashocktube/case.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
'time_stepper' : 3,
3030
'weno_order' : 5,
3131
'weno_eps' : 1.E-16,
32+
'weno_Re_flux' : 'F',
33+
'weno_avg' : 'F',
3234
'mapped_weno' : 'T',
3335
'null_weights' : 'F',
3436
'mp_weno' : 'F',

‎examples/1D_poly_bubscreen/case.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@
106106
'time_stepper' : 1,
107107
'weno_order' : 1,
108108
'weno_eps' : 1.E-16,
109+
'weno_Re_flux' : 'F',
110+
'weno_avg' : 'F',
109111
'mapped_weno' : 'F',
110112
'null_weights' : 'F',
111113
'mp_weno' : 'F',

‎examples/1D_qbmm/case.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@
106106
'time_stepper' : 3,
107107
'weno_order' : 5,
108108
'weno_eps' : 1.E-16,
109+
'weno_Re_flux' : 'F',
110+
'weno_avg' : 'F',
109111
'mapped_weno' : 'T',
110112
'null_weights' : 'F',
111113
'mp_weno' : 'T',

0 commit comments

Comments
 (0)