Skip to content

Commit 6db992d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into tuoSetup
2 parents d5134fa + 6c380cd commit 6db992d

File tree

84 files changed

+5977
-1785
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

+5977
-1785
lines changed

.github/workflows/docs.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ jobs:
3434
cmake -S . -B build -G Ninja --install-prefix=$(pwd)/build/install -D MFC_DOCUMENTATION=ON
3535
ninja -C build install
3636
37+
- name: Upload Built Documentation Artifact
38+
uses: actions/upload-artifact@v4
39+
with:
40+
name: mfc-docs
41+
path: build/install/docs/mfc
42+
if-no-files-found: error
43+
retention-days: 7
44+
3745
# From here https://github.com/cicirello/generate-sitemap
3846
- name: Generate the sitemap
3947
id: sitemap

.github/workflows/frontier/submit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ job_slug="$job_slug"
4848
job_device="$2"
4949
job_interface="$3"
5050
51-
. ./mfc.sh load -c f -m g
51+
. ./mfc.sh load -c f -m $([ "$2" = "gpu" ] && echo "g" || echo "c")
5252
5353
$sbatch_script_contents
5454

.github/workflows/frontier/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ fi
1616
if [ "$job_device" = "gpu" ]; then
1717
./mfc.sh test -a --rdma-mpi --max-attempts 3 -j $ngpus $device_opts -- -c frontier
1818
else
19-
./mfc.sh test -a --max-attempts 3 -j 32 -- -c frontier
19+
./mfc.sh test -a --max-attempts 3 -j 32 --no-gpu -- -c frontier
2020
fi

.github/workflows/lint-toolchain.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ jobs:
1111
- uses: actions/checkout@v4
1212

1313
- name: MFC Python setup
14+
uses: actions/setup-python@v5
15+
with:
16+
python-version: '3.14'
17+
18+
- name: Initialize MFC
1419
run: ./mfc.sh init
1520

1621
- name: Lint the toolchain

.github/workflows/phoenix/submit-bench.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ sbatch <<EOT
4242
#SBATCH --account=gts-sbryngelson3 # charge account
4343
#SBATCH -N1 # Number of nodes required
4444
$sbatch_device_opts
45-
#SBATCH -t 02:00:00 # Duration of the job (Ex: 15 mins)
45+
#SBATCH -t 03:00:00 # Duration of the job (Ex: 15 mins)
4646
#SBATCH -q embers # QOS Name
4747
#SBATCH -o$job_slug.out # Combined output and error messages file
4848
#SBATCH -W # Do not exit until the submitted job terminates.

.github/workflows/test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ jobs:
4848
- name: Clone
4949
uses: actions/checkout@v4
5050

51-
- name: Set up Python 3.13
52-
uses: actions/setup-python@v5
53-
with:
54-
python-version: '3.13'
55-
5651
- name: Setup MacOS
5752
if: matrix.os == 'macos'
5853
run: |
@@ -81,6 +76,10 @@ jobs:
8176
source /opt/intel/oneapi/setvars.sh
8277
printenv >> $GITHUB_ENV
8378
79+
- name: Set up Python 3.14
80+
uses: actions/setup-python@v5
81+
with:
82+
python-version: '3.14'
8483

8584
- name: Build
8685
run: |

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ __pycache__
1919

2020
*.egg-info
2121

22+
# Auto-generated version file
23+
toolchain/mfc/_version.py
24+
2225
.DS_Store
2326

2427
/tests/*/**
@@ -33,6 +36,7 @@ docs/*/initial*
3336
docs/*/result*
3437
docs/documentation/*-example.png
3538
docs/documentation/examples.md
39+
docs/documentation/case_constraints.md
3640

3741
examples/*batch/*/
3842
examples/**/D/*

.lychee.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ retry_wait_time = 4
1515
accept = ["200", "429"]
1616

1717
verbose = "error"
18+
19+
# Exclude sitemap from link checking (it contains pre-publish production URLs)
20+
exclude_path = ["**/sitemap.txt"]

CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,18 @@ if (MFC_DOCUMENTATION)
652652
VERBATIM
653653
)
654654

655+
# Generate case_constraints.md from case_validator.py and examples/
656+
add_custom_command(
657+
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/docs/documentation/case_constraints.md"
658+
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/mfc/gen_case_constraints_docs.py"
659+
"${CMAKE_CURRENT_SOURCE_DIR}/toolchain/mfc/case_validator.py"
660+
"${examples_DOCs}"
661+
COMMAND "bash" "${CMAKE_CURRENT_SOURCE_DIR}/docs/gen_constraints.sh"
662+
"${CMAKE_CURRENT_SOURCE_DIR}"
663+
COMMENT "Generating case_constraints.md"
664+
VERBATIM
665+
)
666+
655667
file(GLOB common_DOCs CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/docs/*")
656668

657669
# GEN_DOCS: Given a target name (herein <target>), this macro sets up a
@@ -685,8 +697,10 @@ if (MFC_DOCUMENTATION)
685697
"${CMAKE_CURRENT_BINARY_DIR}/${target}-Doxyfile" @ONLY)
686698

687699
set(opt_example_dependency "")
700+
set(opt_constraints_dependency "")
688701
if (${target} STREQUAL documentation)
689702
set(opt_example_dependency "${CMAKE_CURRENT_SOURCE_DIR}/docs/documentation/examples.md")
703+
set(opt_constraints_dependency "${CMAKE_CURRENT_SOURCE_DIR}/docs/documentation/case_constraints.md")
690704
endif()
691705

692706
file(GLOB_RECURSE ${target}_DOCs CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/docs/${target}/*")
@@ -696,6 +710,7 @@ if (MFC_DOCUMENTATION)
696710
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${target}/html/index.html"
697711
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${target}-Doxyfile"
698712
"${opt_example_dependency}"
713+
"${opt_constraints_dependency}"
699714
"${${target}_SRCs}" "${${target}_DOCs}"
700715
COMMAND "${DOXYGEN_EXECUTABLE}" "${target}-Doxyfile"
701716
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"

docs/documentation/case.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,15 @@ For example, to run the `scaling` case in "weak-scaling" mode:
6868

6969
## Parameters
7070

71+
## Feature Compatibility
72+
73+
Before diving into parameter details, check the **[Feature Compatibility Guide](case_constraints.md)** to understand:
74+
- Which features work together (MHD, bubbles, phase change, etc.)
75+
- Common configuration patterns with copy-paste examples
76+
- Requirements for each model equation and Riemann solver
77+
78+
💡 **Tip:** If you get a validation error, the compatibility guide explains what each parameter requires.
79+
7180
There are multiple sets of parameters that must be specified in the python input file:
7281
1. [Runtime Parameters](#1-runtime)
7382
2. [Computational Domain Parameters](#2-computational-domain)
@@ -745,6 +754,7 @@ Details of the transducer acoustic source model can be found in [Maeda and Colon
745754
| `mu_v`| Real | Viscosity |
746755
| `k_v`| Real | Thermal conductivity |
747756
| `cp_v`| Real | Specific heat capacity |
757+
| `D_v`| Real | Vapor diffusivity in the gas |
748758

749759
These options work only for gas-liquid two-component flows.
750760
Component indexes are required to be 1 for liquid and 2 for gas.
@@ -836,7 +846,6 @@ When ``polytropic = 'F'``, the gas compression is modeled as non-polytropic due
836846
| `T0` | Real | Reference temperature |
837847
| `x0` | Real | Reference length |
838848
| `Thost` | Real | Temperature of the surrounding liquid (host) |
839-
| `diffcoefvap` | Real | Vapor diffusivity in the gas |
840849

841850
- `nBubs_glb` Total number of bubbles. Their initial conditions need to be specified in the ./input/lag_bubbles.dat file. See the example cases for additional information.
842851

0 commit comments

Comments
 (0)