Skip to content

Commit 79b85c9

Browse files
committed
merge upstream/master
2 parents 0f10a16 + 42f003e commit 79b85c9

46 files changed

Lines changed: 1659 additions & 1221 deletions

File tree

Some content is hidden

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

.github/workflows/common/build.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,9 @@ fi
2525
# source code is built here on the compute node.
2626
# Phoenix: always start fresh to avoid SIGILL from stale binaries compiled
2727
# on a different microarchitecture.
28-
# Frontier: wipe only compiled Fortran staging/install slugs; preserve dep
29-
# dirs (silo, hdf5, lapack, fftw, hipfort) which were built on the login node
30-
# and cannot be re-fetched from a compute node (no internet).
3128
if [ "$job_cluster" = "phoenix" ]; then
3229
source .github/scripts/clean-build.sh
3330
clean_build
34-
elif [ "$job_cluster" = "frontier" ] || [ "$job_cluster" = "frontier_amd" ]; then
35-
for _dir in build/staging/ build/install/; do
36-
if [ -d "$_dir" ]; then
37-
for _sub in "$_dir"*/; do
38-
_name=$(basename "$_sub")
39-
case "$_name" in silo|hdf5|lapack|fftw|hipfort) continue ;; esac
40-
rm -rf "$_sub"
41-
done
42-
fi
43-
done
44-
unset _dir _sub _name
4531
fi
4632

4733
source .github/scripts/retry-build.sh

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172

173173
include:
174174
- os: ubuntu
175-
mpi: no-mpi
175+
mpi: mpi
176176
precision: single
177177
debug: no-debug
178178
intel: false
@@ -386,11 +386,12 @@ jobs:
386386
- name: Test
387387
if: '!matrix.nvhpc'
388388
run: |
389-
/bin/bash mfc.sh test -v --max-attempts 3 -j $(nproc) $ONLY_CHANGES $TEST_ALL $TEST_PCT
389+
/bin/bash mfc.sh test -v --max-attempts 3 -j $(nproc) $ONLY_CHANGES $TEST_ALL $TEST_PCT $PRECISION
390390
env:
391391
TEST_ALL: ${{ matrix.mpi == 'mpi' && '--test-all' || '' }}
392392
TEST_PCT: ${{ matrix.debug == 'reldebug' && '-% 20' || '' }}
393393
ONLY_CHANGES: ${{ github.event_name == 'pull_request' && '--only-changes' || '' }}
394+
PRECISION: ${{ matrix.precision != '' && format('--{0}', matrix.precision) || '' }}
394395

395396
# ── NVHPC build + test (via docker exec into long-lived container) ──
396397
- name: Build (NVHPC)

benchmarks/igr/case.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"num_patches": 1,
7070
"model_eqns": 2,
7171
"num_fluids": 1,
72+
"riemann_solver": 5,
7273
"time_stepper": 3,
7374
"bc_x%beg": -1,
7475
"bc_x%end": -1,

examples/2D_IGR_2fluid/case.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"mixture_err": "T",
4646
"mpp_lim": "F",
4747
"time_stepper": 3,
48+
"riemann_solver": 5,
4849
"bc_x%beg": -1,
4950
"bc_x%end": -1,
5051
"bc_y%beg": -1,

examples/2D_IGR_triple_point/case.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"alt_soundspeed": "F",
3131
"num_fluids": 2,
3232
"time_stepper": 3,
33+
"riemann_solver": 5,
3334
"elliptic_smoothing": "T",
3435
"elliptic_smoothing_iters": 50,
3536
"igr": "T",

examples/2D_advection_muscl/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"t_step_save": 100,
2222
# Simulation Algorithm Parameters
2323
"num_patches": 2,
24-
"model_eqns": 3,
24+
"model_eqns": 2,
2525
"alt_soundspeed": "F",
2626
"num_fluids": 2,
2727
"mpp_lim": "T",

examples/3D_IGR_33jet/case.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"num_fluids": 1,
5353
"mpp_lim": "F",
5454
"time_stepper": 3,
55+
"riemann_solver": 5,
5556
"igr": "T",
5657
"igr_order": 3,
5758
"igr_pres_lim": "T",

examples/3D_IGR_TaylorGreenVortex/case.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"model_eqns": 2,
5050
"num_fluids": 1,
5151
"time_stepper": 3,
52+
"riemann_solver": 5,
5253
"bc_x%beg": -1,
5354
"bc_x%end": -1,
5455
"bc_y%beg": -1,

examples/3D_IGR_TaylorGreenVortex_nvidia/case.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"model_eqns": 2,
5555
"num_fluids": 1,
5656
"time_stepper": 3,
57+
"riemann_solver": 5,
5758
"bc_x%beg": -1,
5859
"bc_x%end": -1,
5960
"bc_y%beg": -1,

examples/3D_IGR_jet/case.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"num_fluids": 2,
7979
"mpp_lim": "T",
8080
"time_stepper": 3,
81+
"riemann_solver": 5,
8182
"igr": "T",
8283
"igr_order": 3,
8384
"igr_pres_lim": "T",

0 commit comments

Comments
 (0)