Skip to content

Commit

Permalink
set default rearranger to box
Browse files Browse the repository at this point in the history
* to resolve failures on gaea, the default ww3 rearranger is set
as box on all platforms. All tests run with current resources w/
slight bump for the debug_pdlib case. A followup issue will be
created for the rearranger failure on Gaea and Gaea SAs will be
contacted.
  • Loading branch information
DeniseWorthen committed Oct 30, 2024
1 parent f9089f9 commit c0dd7ea
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
4 changes: 2 additions & 2 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ export_ww3() {
export WW3_PIO_FORMAT='pnetcdf'
export WW3_PIO_STRIDE=4
export WW3_PIO_IOTASKS=-99
export WW3_PIO_REARR='subset'
export WW3_PIO_REARR='box'
export WW3_PIO_ROOT=-99
}

Expand Down Expand Up @@ -1614,7 +1614,7 @@ export_hafs_regional ()
export WW3_PIO_FORMAT='pnetcdf'
export WW3_PIO_STRIDE=4
export WW3_PIO_IOTASKS=-99
export WW3_PIO_REARR='subset'
export WW3_PIO_REARR='box'
export WW3_PIO_ROOT=-99

# Set CMEPS component defaults
Expand Down
6 changes: 1 addition & 5 deletions tests/tests/atmwav_control_noaero_p8
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export WW3_restart_from_binary='false'
export WW3_PIO_FORMAT='pnetcdf'
export WW3_PIO_STRIDE=4
export WW3_PIO_IOTASKS=-99
export WW3_PIO_REARR='subset'
export WW3_PIO_REARR='box'
export WW3_PIO_ROOT=-99

# ufs.configure
Expand Down Expand Up @@ -207,7 +207,3 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.
export SATMEDMF=.true.

if [[ $MACHINE_ID = gaea ]]; then
WAV_tasks="$(($WAV_tasks_cpl_atmw + 30))"
fi
9 changes: 1 addition & 8 deletions tests/tests/cpld_debug_pdlib_p8
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ OCN_tasks=$OCN_tasks_cpl_unstr
ICE_tasks=$ICE_tasks_cpl_unstr
WAV_tasks=$WAV_tasks_cpl_unstr
# bump resources for debug test
WAV_tasks="$(($WAV_tasks_cpl_unstr + 18))"
WAV_tasks="$(($WAV_tasks_cpl_unstr + 30))"
OCN_tasks="$((OCN_tasks_cpl_unstr + 16))"

export atm_omp_num_threads=$THRD_cpl_unstr
Expand Down Expand Up @@ -111,13 +111,6 @@ fi
if [[ $MACHINE_ID = gaea ]] && [[ $RT_COMPILER = intelllvm ]]; then
WLCLK=50
fi
if [[ $MACHINE_ID = hercules && $RT_COMPILER = gnu ]]; then
export WW3_PIO_REARR='box'
fi
if [[ $MACHINE_ID = gaea ]]; then
WAV_tasks="$(($WAV_tasks_cpl_unstr + 120))"
export WW3_PIO_REARR='box'
fi

export K_SPLIT=2
export N_SPLIT=5
Expand Down

0 comments on commit c0dd7ea

Please sign in to comment.