Skip to content

use esmf-managed threading for cpld_bmark control and restart #1483

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

Closed
DeniseWorthen wants to merge 5 commits into from
Closed

use esmf-managed threading for cpld_bmark control and restart #1483

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
a8c089e
convert bmark control+restart
DeniseWorthen Nov 8, 2022
2d3719c
remove emsf-threading bmark test
DeniseWorthen Nov 8, 2022
807c628
cpld_bmark test passes
DeniseWorthen Nov 8, 2022
6dca870
Merge branch 'ufs-community:develop' into feature/default_emt
DeniseWorthen Nov 8, 2022
5ab19e7
Merge branch 'ufs-community:develop' into feature/default_emt
DeniseWorthen Nov 14, 2022
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
1 change: 0 additions & 1 deletion tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ RUN | cpld_restart_c192_p8

RUN | cpld_bmark_p8 | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | fv3 |
RUN | cpld_restart_bmark_p8 | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | | cpld_bmark_p8
RUN | cpld_bmark_esmfthreads_p8 | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | fv3 |

COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
RUN | cpld_control_noaero_p8 | | fv3 |
Expand Down
158 changes: 0 additions & 158 deletions tests/tests/cpld_bmark_esmfthreads_p8
View file
Open in desktop

This file was deleted.

24 changes: 15 additions & 9 deletions tests/tests/cpld_bmark_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ export LIST_FILES="sfcf006.nc \
export_fv3
export_cpl

export NEMS_CONFIGURE=nems.configure.cpld_esmfthreads.IN

export SYEAR=2013
export SMONTH=04
export SDAY=01
Expand All @@ -75,14 +77,22 @@ export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000"
export TASKS=$TASKS_cpl_bmrk
export INPES=$INPES_cpl_bmrk
export JNPES=$JNPES_cpl_bmrk
export THRD=$THRD_cpl_bmrk
export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
export THRD=1
export ATM_compute_tasks=$(( INPES * JNPES * NTILES * THRD_cpl_bmrk ))
export WRTTASK_PER_GROUP=$(( WPG_cpl_bmrk * THRD_cpl_bmrk ))
export WRITE_DOPOST=.true.
export WLCLK=${WLCLK_cpl_bmrk:-$WLCLK}

OCN_tasks=$OCN_tasks_cpl_bmrk
ICE_tasks=$ICE_tasks_cpl_bmrk
WAV_tasks=$WAV_tasks_cpl_bmrk
export OCN_tasks=$(( OCN_tasks_cpl_bmrk * OCN_thrds_cpl_bmrk ))
export ICE_tasks=$(( ICE_tasks_cpl_bmrk * ICE_thrds_cpl_bmrk ))
export WAV_tasks=$(( WAV_tasks_cpl_bmrk * WAV_thrds_cpl_bmrk ))

export atm_omp_num_threads=$THRD_cpl_bmrk
export chm_omp_num_threads=$atm_omp_num_threads
export med_omp_num_threads=$atm_omp_num_threads
export ocn_omp_num_threads=$OCN_thrds_cpl_bmrk
export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
export wav_omp_num_threads=$WAV_thrds_cpl_bmrk

# atm/ocn/ice resolution
export ATMRES=C384
Expand Down Expand Up @@ -146,7 +156,3 @@ export RST_BEG=$RUN_BEG
export RST_2_BEG=$RUN_BEG

export FV3_RUN=cpld_control_run.IN

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=15
fi
23 changes: 17 additions & 6 deletions tests/tests/cpld_restart_bmark_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ export LIST_FILES="sfcf006.nc \
export_fv3
export_cpl

export NEMS_CONFIGURE=nems.configure.cpld_esmfthreads.IN

export SYEAR=2013
export SMONTH=04
export SDAY=01
Expand All @@ -78,13 +80,22 @@ export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}
export TASKS=$TASKS_cpl_bmrk
export INPES=$INPES_cpl_bmrk
export JNPES=$JNPES_cpl_bmrk
export THRD=$THRD_cpl_bmrk
export THRD=1
export ATM_compute_tasks=$(( INPES * JNPES * NTILES * THRD_cpl_bmrk ))
export WRTTASK_PER_GROUP=$(( WPG_cpl_bmrk * THRD_cpl_bmrk ))
export WRITE_DOPOST=.true.
export WRTTASK_PER_GROUP=$WPG_cpl_bmrk

OCN_tasks=$OCN_tasks_cpl_bmrk
ICE_tasks=$ICE_tasks_cpl_bmrk
WAV_tasks=$WAV_tasks_cpl_bmrk
export WLCLK=${WLCLK_cpl_bmrk:-$WLCLK}

export OCN_tasks=$(( OCN_tasks_cpl_bmrk * OCN_thrds_cpl_bmrk ))
export ICE_tasks=$(( ICE_tasks_cpl_bmrk * ICE_thrds_cpl_bmrk ))
export WAV_tasks=$(( WAV_tasks_cpl_bmrk * WAV_thrds_cpl_bmrk ))

export atm_omp_num_threads=$THRD_cpl_bmrk
export chm_omp_num_threads=$atm_omp_num_threads
export med_omp_num_threads=$atm_omp_num_threads
export ocn_omp_num_threads=$OCN_thrds_cpl_bmrk
export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
export wav_omp_num_threads=$WAV_thrds_cpl_bmrk

# atm/ocn/ice resolution
export ATMRES=C384
Expand Down