Skip to content

refactor: consolidate grid, stretch, and body force params into derived types #1432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbryngelson wants to merge 23 commits into
base: master
Choose a base branch
from
Open

refactor: consolidate grid, stretch, and body force params into derived types #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1c3e52f
refactor: consolidate grid arrays into type(grid_axis) :: x, y, z
sbryngelson May 12, 2026
9b968a5
refactor: consolidate stretch and body force params into derived types
sbryngelson May 12, 2026
13d1297
fix: update analytical IC codegen to use x%cc(i) after grid_axis refa…
sbryngelson May 12, 2026
cddf79a
style: apply ffmt v0.4.0 formatting to refactored files
sbryngelson May 12, 2026
3b65a51
refactor: consolidate IB dynamics arrays into ib_dynamics_t struct
sbryngelson May 12, 2026
3f9f382
refactor: introduce bc_dir_t type, strip BC payload from int_bounds_info
sbryngelson May 12, 2026
eb90ba8
fix: update boundary_conditions local var to bc_dir_t in m_mpi_common
sbryngelson May 12, 2026
15f3a64
ci: remove AMD GPU container from Docker workflow
sbryngelson May 12, 2026
7f2cd02
refactor: move dx/dy/dz min spacing into grid_axis%min_spacing
sbryngelson May 13, 2026
3c387d1
refactor: populate grid_axis%min_spacing in simulation and post_process
sbryngelson May 13, 2026
f448f33
refactor: rename bc_x/bc_y/bc_z to bc%x/bc%y/bc%z via bc_xyz_info struct
sbryngelson May 13, 2026
81fcf1d
fix: update benchmarks and test golden case.py files to bc%x/y/z naming
sbryngelson May 13, 2026
506c745
fix: handle bc%dir% key format in remove_higher_dimensional_keys
sbryngelson May 13, 2026
3074ca9
merge: resolve conflicts with master (PR #1433 workaround removal)
sbryngelson May 13, 2026
e9fed56
refactor: introduce bc_side_t type with beg_side/end_side, replace fl…
sbryngelson May 13, 2026
1280b70
refactor: introduce body_force_t; rename bf_x/y/z to bf%x/y/z
sbryngelson May 13, 2026
31f8421
fix: update remaining bf_x/y/z references missed in rename
sbryngelson May 13, 2026
aca89c0
refactor: extend riemann_states to HLL, LF, HLLC solvers
sbryngelson May 13, 2026
04a2270
fix: add GPU_DECLARE for bc struct in OpenACC builds to fix CCE error
sbryngelson May 13, 2026
6d7f21d
refactor: convert remaining _L/_R scalar/fixed-array vars to riemann_…
sbryngelson May 13, 2026
e09f8a3
merge: resolve conflict with master (fypp linemarker patch)
sbryngelson May 14, 2026
43699c1
merge: pull latest master (Verrou dd_line attribution, fp-stability u…
sbryngelson May 14, 2026
3d7b107
style: use Fypp loop for fixed-size riemann_states_arr types
sbryngelson May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .typos.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ tru = "tru" # typo for "true" in "when_tru" - tests dependency keys
PNGs = "PNGs"

[files]
extend-exclude = ["docs/documentation/references*", "docs/references.bib", "tests/", "toolchain/cce_simulation_workgroup_256.sh", "build-docs/", "build/", "build_test/", "fp-stability-logs/"]
extend-exclude = ["docs/documentation/references*", "docs/references.bib", "tests/", "toolchain/cce_simulation_workgroup_256.sh", "build-docs/", "build/", "build_test/", "fp-stability-logs/", "scripts/"]
12 changes: 6 additions & 6 deletions benchmarks/5eq_rk3_weno3_hllc/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,12 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -6,
"bc_x%end": -6,
"bc_y%beg": -2,
"bc_y%end": -3,
"bc_z%beg": -2,
"bc_z%end": -3,
"bc%x%beg": -6,
"bc%x%end": -6,
"bc%y%beg": -2,
"bc%y%end": -3,
"bc%z%beg": -2,
"bc%z%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
12 changes: 6 additions & 6 deletions benchmarks/hypo_hll/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@
"riemann_solver": 1,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc_y%beg": -3,
"bc_y%end": -3,
"bc_z%beg": -3,
"bc_z%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
"bc%y%beg": -3,
"bc%y%end": -3,
"bc%z%beg": -3,
"bc%z%end": -3,
# Turning on Hypoelasticity
"hypoelasticity": "T",
"fd_order": 4,
Expand Down
12 changes: 6 additions & 6 deletions benchmarks/ibm/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc_y%beg": -3,
"bc_y%end": -3,
"bc_z%beg": -3,
"bc_z%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
"bc%y%beg": -3,
"bc%y%end": -3,
"bc%z%beg": -3,
"bc%z%end": -3,
# Turn on IBM
"ib": "T",
"num_ibs": 1,
Expand Down
12 changes: 6 additions & 6 deletions benchmarks/igr/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
"num_fluids": 1,
"riemann_solver": 5,
"time_stepper": 3,
"bc_x%beg": -1,
"bc_x%end": -1,
"bc_y%beg": -1,
"bc_y%end": -1,
"bc_z%beg": -1,
"bc_z%end": -1,
"bc%x%beg": -1,
"bc%x%end": -1,
"bc%y%beg": -1,
"bc%y%end": -1,
"bc%z%beg": -1,
"bc%z%end": -1,
"igr": "T",
"igr_order": 5,
"igr_iter_solver": 1,
Expand Down
12 changes: 6 additions & 6 deletions benchmarks/viscous_weno5_sgb_acoustic/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc_y%beg": -3,
"bc_y%end": -3,
"bc_z%beg": -3,
"bc_z%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
"bc%y%beg": -3,
"bc%y%end": -3,
"bc%z%beg": -3,
"bc%z%end": -3,
"viscous": "T",
# Formatted Database Files Structure Parameters
"format": 1,
Expand Down
82 changes: 41 additions & 41 deletions docs/documentation/case.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/documentation/equations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ Uses Lax-Friedrichs flux (replaces WENO + Riemann solver).

---

## 13. Body Forces (`bf_x`, `bf_y`, `bf_z`)
## 13. Body Forces (`bf%%x`, `bf%%y`, `bf%%z`)

**Source:** `src/simulation/m_body_forces.fpp`

Expand Down Expand Up @@ -979,7 +979,7 @@ Used for viscous fluxes and velocity gradients.
| `-15` | Slip wall |
| `-16` | No-slip wall |

### 16.2 Characteristic BCs (\cite Thompson87, \cite Thompson90; `bc_x%%beg = -5` to `-12`)
### 16.2 Characteristic BCs (\cite Thompson87, \cite Thompson90; `bc%%x%%beg = -5` to `-12`)

**Characteristic decomposition:**

Expand Down
4 changes: 2 additions & 2 deletions examples/0D_bubblecollapse_adap/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -1,
"bc_x%end": -1,
"bc%x%beg": -1,
"bc%x%end": -1,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_acoustic_dipole/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -6,
"bc_x%end": -6,
"bc%x%beg": -6,
"bc%x%end": -6,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_acoustic_gauss_sigmadist/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -6,
"bc_x%end": -6,
"bc%x%beg": -6,
"bc%x%end": -6,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_acoustic_gauss_sigmatime/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -6,
"bc_x%end": -6,
"bc%x%beg": -6,
"bc%x%end": -6,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_acoustic_sine_frequency/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -6,
"bc_x%end": -6,
"bc%x%beg": -6,
"bc%x%end": -6,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_acoustic_sine_wavelength/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -6,
"bc_x%end": -6,
"bc%x%beg": -6,
"bc%x%end": -6,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_advection_convergence/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -1,
"bc_x%end": -1,
"bc%x%beg": -1,
"bc%x%end": -1,
"format": 1,
"precision": 2,
"prim_vars_wrt": "T",
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_brio_wu/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"riemann_solver": 1,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_brio_wu_hlld/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"riemann_solver": 4,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_brio_wu_rmhd/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"riemann_solver": 1,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_bubblescreen/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_cont_damage/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"riemann_solver": 1,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Turning on Hypoelasticity
"hypoelasticity": "T",
"fd_order": 4,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_convergence/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"riemann_solver": args.rs,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -1,
"bc_x%end": -1,
"bc%x%beg": -1,
"bc%x%end": -1,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_dai_woodward/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"riemann_solver": 1,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_dai_woodward_hlld/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"riemann_solver": 4,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_euler_convergence/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -1,
"bc_x%end": -1,
"bc%x%beg": -1,
"bc%x%end": -1,
"format": 1,
"precision": 2,
"prim_vars_wrt": "T",
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_exp_bubscreen/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -8,
"bc_x%end": -8,
"bc%x%beg": -8,
"bc%x%end": -8,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_exp_tube_phasechange/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_hypo_2materials/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"riemann_solver": 1,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Turning on Hypoelasticity
"hypoelasticity": "T",
"fd_order": 4,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_impact/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"riemann_solver": 1,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Turning on Hypoelasticity
"hypoelasticity": "T",
"fd_order": 4,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_inert_shocktube/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -2,
"bc_x%end": -3,
"bc%x%beg": -2,
"bc%x%end": -3,
# Chemistry
"chemistry": "F" if not args.chemistry else "T",
"chem_params%diffusion": "F",
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_kapilashocktube/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_laxshocktube/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"riemann_solver": 2,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -3,
"bc_x%end": -3,
"bc%x%beg": -3,
"bc%x%end": -3,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_mhd_smooth_alfven_wave/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"riemann_solver": 4,
"wave_speeds": 1,
"avg_state": 2,
"bc_x%beg": -1,
"bc_x%end": -1,
"bc%x%beg": -1,
"bc%x%end": -1,
# Formatted Database Files Structure Parameters
"format": 1,
"precision": 2,
Expand Down
4 changes: 2 additions & 2 deletions examples/1D_multispecies_diffusion/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"riemann_solver": 2,
"wave_speeds": 2,
"avg_state": 1,
"bc_x%beg": -1,
"bc_x%end": -1,
"bc%x%beg": -1,
"bc%x%end": -1,
"viscous": "F",
"chemistry": "T",
"chem_params%diffusion": "T",
Expand Down
Loading
Loading