Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
19 changes: 10 additions & 9 deletions parm/config/gfs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,12 @@ elif [[ "${step}" = "aeroanlinit" ]]; then
# below lines are for creating JEDI YAML
case ${CASE} in
C768)
layout_x=6
layout_y=6
layout_x=8
layout_y=8
;;
C384)
layout_x=5
layout_y=5
layout_x=8
layout_y=8
;;
C192 | C96 | C48)
layout_x=8
Expand All @@ -280,12 +280,12 @@ elif [[ "${step}" = "aeroanlrun" ]]; then

case ${CASE} in
C768)
layout_x=6
layout_y=6
layout_x=8
layout_y=8
;;
C384)
layout_x=5
layout_y=5
layout_x=8
layout_y=8
;;
C192 | C96 | C48)
layout_x=8
Expand Down Expand Up @@ -470,6 +470,7 @@ elif [[ ${step} = "analcalc" ]]; then
npe_node_analcalc=$(echo "${npe_node_max} / ${nth_analcalc}" | bc)
export npe_node_analcalc
export is_exclusive=True
export memory_analcalc="48GB"

elif [[ ${step} = "analdiag" ]]; then

Expand Down Expand Up @@ -885,7 +886,7 @@ elif [[ ${step} = "epos" ]]; then
export npe_epos=80
export nth_epos=4
if [[ "${machine}" == "HERA" ]]; then
export nth_epos=6
export nth_epos=1

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be changed to 1 for all machines? We can get rid of this special case for Hera and just make it 1 everywhere.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably but I did not test and am not sure why this was 4 and 6 in the first place... It seems like it is not using any threads at all.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like Kate lowered it to 4 after the WCOSS2 port (PR #1070). And before that it had been lowered to 6 from 8 pre-GitHub. Who knows why it was so high to begin with (I would assume memory). Given Hera is the slowest, lowest-mem system, I suspect lowering it everywhere would work.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With Russ's reply, I'm more confident we can just use 1.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

fi
npe_node_epos=$(echo "${npe_node_max} / ${nth_epos}" | bc)
export npe_node_epos
Expand Down
2 changes: 1 addition & 1 deletion parm/config/gfs/config.ufs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ case "${fv3_res}" in
export layout_y=8
export layout_x_gfs=8
export layout_y_gfs=8
export nthreads_fv3=1
export nthreads_fv3=2

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This resolution should be tested more broadly with a S2SW forecast only application.

export nthreads_fv3_gfs=2
export cdmbgwd="1.1,0.72,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
export WRITE_GROUP=2
Expand Down
8 changes: 4 additions & 4 deletions ush/python/pygfs/task/aero_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def __init__(self, config):
super().__init__(config)

_res = int(self.config['CASE'][1:])
_res_enkf = int(self.config['CASE_ENS'][1:])
_res_anl = int(self.config['CASE_ANL'][1:])
_window_begin = add_to_datetime(self.runtime_config.current_cycle, -to_timedelta(f"{self.config['assim_freq']}H") / 2)
_fv3jedi_yaml = os.path.join(self.runtime_config.DATA, f"{self.runtime_config.CDUMP}.t{self.runtime_config['cyc']:02d}z.aerovar.yaml")

Expand All @@ -41,8 +41,8 @@ def __init__(self, config):
'npy_ges': _res + 1,
'npz_ges': self.config.LEVS - 1,
'npz': self.config.LEVS - 1,
'npx_anl': _res_enkf + 1,
'npy_anl': _res_enkf + 1,
'npx_anl': _res_anl + 1,
'npy_anl': _res_anl + 1,
'npz_anl': self.config['LEVS'] - 1,
'AERO_WINDOW_BEGIN': _window_begin,
'AERO_WINDOW_LENGTH': f"PT{self.config['assim_freq']}H",
Expand Down Expand Up @@ -284,7 +284,7 @@ def get_berror_dict(self, config: Dict[str, Any]) -> Dict[str, List[str]]:
berror_list.append([
os.path.join(b_dir, coupler), os.path.join(config.DATA, 'berror', coupler)
])
template = '{b_datestr}.{ftype}.fv_tracer.res.tile{{tilenum}}.nc'
template = f'{b_datestr}.{ftype}.fv_tracer.res.tile{{tilenum}}.nc'
for itile in range(1, config.ntiles + 1):
tracer = template.format(tilenum=itile)
berror_list.append([
Expand Down