From f64e405cc30884b6e7bee51faaf14af8942f85ae Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Thu, 7 May 2026 16:57:42 -0400 Subject: [PATCH 1/6] Default frontier templates to hackathon QOS/partition --- toolchain/templates/frontier.mako | 8 ++------ toolchain/templates/frontier_amd.mako | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/toolchain/templates/frontier.mako b/toolchain/templates/frontier.mako index 474baf0586..fd408275d2 100644 --- a/toolchain/templates/frontier.mako +++ b/toolchain/templates/frontier.mako @@ -17,12 +17,8 @@ % if account: #SBATCH --account=${account} % endif -% if partition: -#SBATCH --partition=${partition} -% endif -% if quality_of_service: -#SBATCH --qos=${quality_of_service} -% endif +#SBATCH --partition=${partition or 'batch'} +#SBATCH --qos=${quality_of_service or 'hackathon'} % if email: #SBATCH --mail-user=${email} #SBATCH --mail-type="BEGIN, END, FAIL" diff --git a/toolchain/templates/frontier_amd.mako b/toolchain/templates/frontier_amd.mako index 39064b8c64..50c297f8b7 100644 --- a/toolchain/templates/frontier_amd.mako +++ b/toolchain/templates/frontier_amd.mako @@ -17,12 +17,8 @@ % if account: #SBATCH --account=${account} % endif -% if partition: -#SBATCH --partition=${partition} -% endif -% if quality_of_service: -#SBATCH --qos=${quality_of_service} -% endif +#SBATCH --partition=${partition or 'batch'} +#SBATCH --qos=${quality_of_service or 'hackathon'} % if email: #SBATCH --mail-user=${email} #SBATCH --mail-type="BEGIN, END, FAIL" From 4600b40cec01231b5a78d6305007c85b2fa880f2 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Thu, 7 May 2026 17:06:00 -0400 Subject: [PATCH 2/6] Hardcode hackathon partition/QOS in frontier templates --- toolchain/templates/frontier.mako | 4 ++-- toolchain/templates/frontier_amd.mako | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolchain/templates/frontier.mako b/toolchain/templates/frontier.mako index fd408275d2..3215952028 100644 --- a/toolchain/templates/frontier.mako +++ b/toolchain/templates/frontier.mako @@ -17,8 +17,8 @@ % if account: #SBATCH --account=${account} % endif -#SBATCH --partition=${partition or 'batch'} -#SBATCH --qos=${quality_of_service or 'hackathon'} +#SBATCH --partition=batch +#SBATCH --qos=hackathon % if email: #SBATCH --mail-user=${email} #SBATCH --mail-type="BEGIN, END, FAIL" diff --git a/toolchain/templates/frontier_amd.mako b/toolchain/templates/frontier_amd.mako index 50c297f8b7..df93802698 100644 --- a/toolchain/templates/frontier_amd.mako +++ b/toolchain/templates/frontier_amd.mako @@ -17,8 +17,8 @@ % if account: #SBATCH --account=${account} % endif -#SBATCH --partition=${partition or 'batch'} -#SBATCH --qos=${quality_of_service or 'hackathon'} +#SBATCH --partition=batch +#SBATCH --qos=hackathon % if email: #SBATCH --mail-user=${email} #SBATCH --mail-type="BEGIN, END, FAIL" From e61ff915be0cf81dee84e34e0ad72ae869faf42c Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Thu, 7 May 2026 17:32:52 -0400 Subject: [PATCH 3/6] Remove comments from p_main.fpp Removed detailed comments regarding the finite-volume scheme and surface tension effects. --- src/simulation/p_main.fpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/simulation/p_main.fpp b/src/simulation/p_main.fpp index 1d0ad72035..d08a295b1c 100644 --- a/src/simulation/p_main.fpp +++ b/src/simulation/p_main.fpp @@ -3,11 +3,6 @@ !! @brief Contains program p_main !> @brief Quasi-conservative, shock- and interface- capturing finite-volume scheme for the multicomponent Navier-Stokes equations. -!! The system is augmented with the relevant advection equations to capture the material interfaces and closed by the stiffened -!! equation of state as well as any required mixture relations. The effects of surface tension are included and modeled through a -!! volume force that acts across the diffuse material interface regions. The implementation specifics of surface tension may be -!! found in the work by Perigaud and Saurel (2005). Note that both viscous and capillarity effects are only available in the volume -!! fraction model. program p_main use m_global_parameters From 1d57af850babdbd158c0bfc47a7f78e830bafa39 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Thu, 7 May 2026 17:50:06 -0400 Subject: [PATCH 4/6] Use hackathon QOS for Frontier CI jobs --- .github/scripts/submit-slurm-job.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/submit-slurm-job.sh b/.github/scripts/submit-slurm-job.sh index 60842ace34..e2700593c9 100755 --- a/.github/scripts/submit-slurm-job.sh +++ b/.github/scripts/submit-slurm-job.sh @@ -51,7 +51,7 @@ case "$cluster" in compiler_flag="f" account="CFD154" job_prefix="MFC" - qos="develop" + qos="hackathon" extra_sbatch="" test_time="01:59:00" bench_time="01:59:00" @@ -61,7 +61,7 @@ case "$cluster" in compiler_flag="famd" account="CFD154" job_prefix="MFC" - qos="develop" + qos="hackathon" extra_sbatch="" test_time="01:59:00" bench_time="01:59:00" From 0a5b99ac86abd4b033732fd0338d46ce015d0065 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Thu, 7 May 2026 17:53:12 -0400 Subject: [PATCH 5/6] Revert frontier template changes --- toolchain/templates/frontier.mako | 8 ++++++-- toolchain/templates/frontier_amd.mako | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/toolchain/templates/frontier.mako b/toolchain/templates/frontier.mako index 3215952028..474baf0586 100644 --- a/toolchain/templates/frontier.mako +++ b/toolchain/templates/frontier.mako @@ -17,8 +17,12 @@ % if account: #SBATCH --account=${account} % endif -#SBATCH --partition=batch -#SBATCH --qos=hackathon +% if partition: +#SBATCH --partition=${partition} +% endif +% if quality_of_service: +#SBATCH --qos=${quality_of_service} +% endif % if email: #SBATCH --mail-user=${email} #SBATCH --mail-type="BEGIN, END, FAIL" diff --git a/toolchain/templates/frontier_amd.mako b/toolchain/templates/frontier_amd.mako index df93802698..39064b8c64 100644 --- a/toolchain/templates/frontier_amd.mako +++ b/toolchain/templates/frontier_amd.mako @@ -17,8 +17,12 @@ % if account: #SBATCH --account=${account} % endif -#SBATCH --partition=batch -#SBATCH --qos=hackathon +% if partition: +#SBATCH --partition=${partition} +% endif +% if quality_of_service: +#SBATCH --qos=${quality_of_service} +% endif % if email: #SBATCH --mail-user=${email} #SBATCH --mail-type="BEGIN, END, FAIL" From c92e18fedf37fc2d4ae31a1cfedd5e5518adca1a Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Thu, 7 May 2026 18:39:22 -0400 Subject: [PATCH 6/6] Use batch partition for Frontier CI jobs (hackathon QOS requires batch) --- .github/scripts/submit-slurm-job.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/submit-slurm-job.sh b/.github/scripts/submit-slurm-job.sh index e2700593c9..3d6bac6293 100755 --- a/.github/scripts/submit-slurm-job.sh +++ b/.github/scripts/submit-slurm-job.sh @@ -92,7 +92,7 @@ if [ "$device" = "cpu" ]; then frontier|frontier_amd) sbatch_device_opts="\ #SBATCH -n 32 -#SBATCH -p service" +#SBATCH -p batch" ;; esac elif [ "$device" = "gpu" ]; then @@ -120,7 +120,7 @@ elif [ "$device" = "gpu" ]; then frontier|frontier_amd) sbatch_device_opts="\ #SBATCH -n 8 -#SBATCH -p service" +#SBATCH -p batch" ;; esac else