Skip to content

Commit

Permalink
Use correct number of tasks in CICE when using threads (#1558)
Browse files Browse the repository at this point in the history
When the workflow was updated to use ESMF threading, the CICE namelist
was not updated to use the new ntasks_cic6 variable instead of ICEPETS.
This caused the incorrect number to be used when using multiple threads.

Fixes #1549
  • Loading branch information
WalterKolczynski-NOAA committed May 2, 2023
1 parent 608ff65 commit 2e2357b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ush/parsing_namelists_CICE.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ fi
# Get correct MPI options for NPROC and grid
local processor_shape=${cice6_processor_shape:-'slenderX2'}
local shape=${processor_shape#${processor_shape%?}}
local NPX=$(( ICEPETS / shape )) #number of processors in x direction
local NPY=$(( ICEPETS / NPX )) #number of processors in y direction
local NPX=$(( ntasks_cice6 / shape )) #number of processors in x direction
local NPY=$(( ntasks_cice6 / NPX )) #number of processors in y direction
if (( $(( NX_GLB % NPX )) == 0 )); then
local block_size_x=$(( NX_GLB / NPX ))
else
Expand Down Expand Up @@ -201,7 +201,7 @@ cat > ice_in <<eof
/
&domain_nml
nprocs = ${ICEPETS}
nprocs = ${ntasks_cice6}
nx_global = ${NX_GLB}
ny_global = ${NY_GLB}
block_size_x = ${block_size_x}
Expand Down

0 comments on commit 2e2357b

Please sign in to comment.