Skip to content
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.

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

Small changes to get (aerosol) cycling going at C384 #1763

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
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
24 changes: 11 additions & 13 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 @@ -869,7 +870,7 @@ elif [[ ${step} = "ecen" ]]; then

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

export wtime_esfc="00:06:00"
export wtime_esfc="00:08:00"
export npe_esfc=80
export nth_esfc=1
npe_node_esfc=$(echo "${npe_node_max} / ${nth_esfc}" | bc)
Expand All @@ -883,10 +884,7 @@ elif [[ ${step} = "epos" ]]; then

export wtime_epos="00:15:00"
export npe_epos=80
export nth_epos=4
if [[ "${machine}" == "HERA" ]]; then
export nth_epos=6
fi
export nth_epos=1
npe_node_epos=$(echo "${npe_node_max} / ${nth_epos}" | bc)
export npe_node_epos
export is_exclusive=True
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
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