Skip to content

update phoenix template #826

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

update phoenix template #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae690f5
update phoenix template
wilfonba Apr 23, 2025
ba0c4ec
update
Apr 23, 2025
8d1f6a1
Merge remote-tracking branch 'upstream/master' into phoenix
wilfonba Apr 25, 2025
2207581
edit src
wilfonba Apr 25, 2025
ac3c4e5
Update submit.sh
sbryngelson Apr 25, 2025
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 .github/workflows/phoenix/submit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sbatch <<EOT
#SBATCH --account=gts-sbryngelson3 # charge account
#SBATCH -N1 # Number of nodes required
$sbatch_device_opts
#SBATCH -t 02:00:00 # Duration of the job (Ex: 15 mins)
#SBATCH -t 03:00:00 # Duration of the job (Ex: 15 mins)
#SBATCH -q embers # QOS Name
#SBATCH -o$job_slug.out # Combined output and error messages file
#SBATCH -W # Do not exit until the submitted job terminates.
Expand Down
4 changes: 2 additions & 2 deletions src/simulation/m_time_steppers.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@
if (proc_rank == 0) print *, 'RKCK 5th time-stage at', rkck_time_tmp
#endif
call s_compute_rhs(q_cons_ts(2)%vf, q_T_sf, q_prim_vf, rhs_ts_rkck(5)%vf, pb_ts(1)%sf, rhs_pb, mv_ts(1)%sf, rhs_mv, t_step, time_avg)
call s_compute_EL_coupled_solver(q_cons_ts(2)%vf, q_prim_vf, rhs_ts_rkck(5)%vf, 5)
call s_compute_EL_coupled_solver(q_cons_ts(2)%vf, q_prim_vf, rhs_ts_rkck(5)%vf, RKstep)

Check warning on line 1151 in src/simulation/m_time_steppers.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_time_steppers.fpp#L1151 

Added line #L1151 was not covered by tests
call s_update_tmp_rkck(5, q_cons_ts, rhs_ts_rkck, lag_largestep)
if (lag_largestep > 0._wp) call s_compute_rkck_dt(lag_largestep, restart_rkck_step)
if (restart_rkck_step) cycle
Expand All @@ -1162,7 +1162,7 @@
if (proc_rank == 0) print *, 'RKCK 6th time-stage at', rkck_time_tmp
#endif
call s_compute_rhs(q_cons_ts(2)%vf, q_T_sf, q_prim_vf, rhs_ts_rkck(6)%vf, pb_ts(1)%sf, rhs_pb, mv_ts(1)%sf, rhs_mv, t_step, time_avg)
call s_compute_EL_coupled_solver(q_cons_ts(2)%vf, q_prim_vf, rhs_ts_rkck(6)%vf, 6)
call s_compute_EL_coupled_solver(q_cons_ts(2)%vf, q_prim_vf, rhs_ts_rkck(6)%vf, RKstep)

Check warning on line 1165 in src/simulation/m_time_steppers.fpp

View check run for this annotation

Codecov / codecov/patch

src/simulation/m_time_steppers.fpp#L1165 

Added line #L1165 was not covered by tests
call s_update_tmp_rkck(6, q_cons_ts, rhs_ts_rkck, lag_largestep)
if (lag_largestep > 0._wp) call s_compute_rkck_dt(lag_largestep, restart_rkck_step)
if (restart_rkck_step) cycle
Expand Down
16 changes: 10 additions & 6 deletions toolchain/templates/phoenix.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
#SBATCH --qos=${quality_of_service}
% endif
% if gpu:
#SBATCH --gres=gpu:V100:${tasks_per_node}
#SBATCH --mem-per-gpu=16G\
#SBATCH -G${tasks_per_node}
% endif
% if email:
#SBATCH --mail-user=${email}
Expand All @@ -41,10 +40,15 @@ echo
% if not mpi:
(set -x; ${profiler} "${target.get_install_binpath(case)}")
% else:
(set -x; ${profiler} \
mpirun -np ${nodes*tasks_per_node} \
--bind-to none \
"${target.get_install_binpath(case)}")
(set -x; srun \
% if engine == 'interactive':
--nodes ${nodes} --ntasks-per-node ${tasks_per_node} \
--cpus-per-task 1 \
% if gpu:
--gpus-per-task 1 --gpu-bind closest \
% endif
% endif
${profiler} "${target.get_install_binpath(case)}")
% endif

${helpers.run_epilogue(target)}
Expand Down
Loading