Skip to content
Draft
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
10 changes: 5 additions & 5 deletions dev/parm/config/gcafs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ case ${step} in
walltime="00:30:00"
;;
"C384")
layout_x=6
layout_y=6
layout_x=9
layout_y=8
walltime="00:20:00"
;;
"C192" | "C96")
Expand Down Expand Up @@ -408,10 +408,10 @@ case ${step} in
tasks_per_node=24
;;
"C384")
layout_x=6
layout_y=6
layout_x=9
layout_y=8
walltime="00:30:00"
tasks_per_node=24
tasks_per_node=48
;;
"C192" | "C96")
layout_x=4
Expand Down
4 changes: 2 additions & 2 deletions dev/parm/config/gfs/config.ufs
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ case "${fv3_res}" in
export psl_gwd_dx_factor=2.0
else
export DELTIM=300
export layout_x=6
export layout_y=8
export layout_x=12
export layout_y=12
export nthreads_fv3=2
export nthreads_ufs=2
export WRITE_GROUP=2
Expand Down
8 changes: 4 additions & 4 deletions parm/ufs/gocart/ExtData.other
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ DU_SAND '1' Y E - none none sandfrac ExtData/F
DU_SILT '1' Y E - none none siltfrac /dev/null
DU_SSM '1' Y E - none none sep ExtData/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc
DU_UTHRES '1' Y E - none none uthres ExtData/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc
DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none albedo_drag ExtData/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v4.nc
DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none albedo_drag ExtData/FENGSHA/FENGSHA_2026_0p1.nc
DU_GVF '1' Y E %y4-%m2-%d2T12:00:00 none none GVF /dev/null:0.0
DU_LAI '1' Y E %y4-%m2-%d2T12:00:00 none none LAI /dev/null/:0.0

Expand Down Expand Up @@ -41,9 +41,9 @@ SU_AVIATION_CRS NA Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation ExtData/PIES
# --------------------------------------------------------------
# If using 64 levels please replace this section with the correct values (ie replace 127 with 64)

SU_H2O2 NA N Y %y4-%m2-%d2t12:00:00 none none h2o2 ExtData/PIESA/L127/A2_ACCMIP_gmic_MERRA_oh_h2o2_no3.x144_y91_z127_t14.%y4.nc
SU_OH NA N Y %y4-%m2-%d2t12:00:00 none none oh ExtData/PIESA/L127/A2_ACCMIP_gmic_MERRA_oh_h2o2_no3.x144_y91_z127_t14.%y4.nc
SU_NO3 NA N Y %y4-%m2-%d2t12:00:00 none none no3 ExtData/PIESA/L127/A2_ACCMIP_gmic_MERRA_oh_h2o2_no3.x144_y91_z127_t14.%y4.nc
SU_H2O2 NA Y Y %y4-%m2-%d2t12:00:00 none none h2o2 ExtData/PIESA/L127/A2_ACCMIP_gmic_MERRA_oh_h2o2_no3.x144_y91_z127_t14.2025.nc
SU_OH NA Y Y %y4-%m2-%d2t12:00:00 none none oh ExtData/PIESA/L127/A2_ACCMIP_gmic_MERRA_oh_h2o2_no3.x144_y91_z127_t14.2025.nc
SU_NO3 NA Y Y %y4-%m2-%d2t12:00:00 none none no3 ExtData/PIESA/L127/A2_ACCMIP_gmic_MERRA_oh_h2o2_no3.x144_y91_z127_t14.2025.nc
#---------------------------------------------------------------

# Production of SO2 from OCS oxidation
Expand Down
3 changes: 2 additions & 1 deletion ush/python/pygfs/task/analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ def __init__(self, config: Dict[str, Any]):
'APREFIX_ENS': f"enkf{self.task_config.RUN.replace('enkf', '')}.t{self.task_config.cyc:02d}z.",
'GPREFIX': f"{_da_prefix}.t{self.task_config.previous_cycle.hour:02d}z.",
'GPREFIX_ENS': f"enkf{_da_prefix}.t{self.task_config.previous_cycle.hour:02d}z.",
'iau_times_iso': _iau_times_iso,
'OCNRES': f"{self.task_config.OCNRES:03d}",
'iau_times_iso': _iau_times_iso,
'MOM6_LEVS': _ocnres_to_nlev[f"{self.task_config.OCNRES:03d}"],
'mom_domain_stack_size': 116640000, # TODO: Make the stack size resolution dependent
'OCNRES': f"{self.task_config.OCNRES:03d}",
Expand Down
Loading