From c437c087da7337aa5fdf370b35106a2df26799c4 Mon Sep 17 00:00:00 2001 From: "travis.j.elless" Date: Fri, 14 Feb 2025 16:31:09 +0000 Subject: [PATCH 1/6] add missing file failsafe --- ush/python/pygfs/task/snow_analysis.py | 5 +++++ ush/python/pygfs/task/snowens_analysis.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ush/python/pygfs/task/snow_analysis.py b/ush/python/pygfs/task/snow_analysis.py index 4e04799f3f..015b98409a 100644 --- a/ush/python/pygfs/task/snow_analysis.py +++ b/ush/python/pygfs/task/snow_analysis.py @@ -176,6 +176,11 @@ def prepare_IMS(self) -> None: prep_ims_config = parse_j2yaml(self.task_config.IMS_OBS_LIST, localconf) logger.debug(f"{self.task_config.IMS_OBS_LIST}:\n{pformat(prep_ims_config)}") + asc_file = os.path.join(localconf.COMIN_OBS,f"{self.task_config.OPREFIX}imssnow96.asc") + if not os.path.isfile(asc_file): + logger.exception(f"Obs files are missing. Will not execute CALCFIMSEXE") + return + # copy the IMS obs files from COMIN_OBS to DATA/obs logger.info("Copying IMS obs for CALCFIMSEXE") FileHandler(prep_ims_config.calcfims).sync() diff --git a/ush/python/pygfs/task/snowens_analysis.py b/ush/python/pygfs/task/snowens_analysis.py index 18073af6b9..d7a2bcf339 100644 --- a/ush/python/pygfs/task/snowens_analysis.py +++ b/ush/python/pygfs/task/snowens_analysis.py @@ -197,6 +197,11 @@ def prepare_IMS(self) -> None: prep_ims_config = parse_j2yaml(self.task_config.IMS_OBS_LIST, localconf) logger.debug(f"{self.task_config.IMS_OBS_LIST}:\n{pformat(prep_ims_config)}") + asc_file = os.path.join(localconf.COMIN_OBS,f"{self.task_config.OPREFIX}imssnow96.asc") + if not os.path.isfile(asc_file): + logger.exception(f"Obs files are missing. Will not execute CALCFIMSEXE") + return + # copy the IMS obs files from COMIN_OBS to DATA/obs logger.info("Copying IMS obs for CALCFIMSEXE") FileHandler(prep_ims_config.calcfims).sync() From 15914aec2426b2d77fde115c4c7566431960d433 Mon Sep 17 00:00:00 2001 From: "travis.j.elless" Date: Fri, 14 Feb 2025 16:36:05 +0000 Subject: [PATCH 2/6] update norms --- ush/python/pygfs/task/snow_analysis.py | 2 +- ush/python/pygfs/task/snowens_analysis.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ush/python/pygfs/task/snow_analysis.py b/ush/python/pygfs/task/snow_analysis.py index 015b98409a..1da02f9da3 100644 --- a/ush/python/pygfs/task/snow_analysis.py +++ b/ush/python/pygfs/task/snow_analysis.py @@ -176,7 +176,7 @@ def prepare_IMS(self) -> None: prep_ims_config = parse_j2yaml(self.task_config.IMS_OBS_LIST, localconf) logger.debug(f"{self.task_config.IMS_OBS_LIST}:\n{pformat(prep_ims_config)}") - asc_file = os.path.join(localconf.COMIN_OBS,f"{self.task_config.OPREFIX}imssnow96.asc") + asc_file = os.path.join(localconf.COMIN_OBS, f"{self.task_config.OPREFIX}imssnow96.asc") if not os.path.isfile(asc_file): logger.exception(f"Obs files are missing. Will not execute CALCFIMSEXE") return diff --git a/ush/python/pygfs/task/snowens_analysis.py b/ush/python/pygfs/task/snowens_analysis.py index d7a2bcf339..dad5ae65a7 100644 --- a/ush/python/pygfs/task/snowens_analysis.py +++ b/ush/python/pygfs/task/snowens_analysis.py @@ -197,7 +197,7 @@ def prepare_IMS(self) -> None: prep_ims_config = parse_j2yaml(self.task_config.IMS_OBS_LIST, localconf) logger.debug(f"{self.task_config.IMS_OBS_LIST}:\n{pformat(prep_ims_config)}") - asc_file = os.path.join(localconf.COMIN_OBS,f"{self.task_config.OPREFIX}imssnow96.asc") + asc_file = os.path.join(localconf.COMIN_OBS, f"{self.task_config.OPREFIX}imssnow96.asc") if not os.path.isfile(asc_file): logger.exception(f"Obs files are missing. Will not execute CALCFIMSEXE") return From 3d96d1f1e936b1d3c5a53a012636ced9a4a0693a Mon Sep 17 00:00:00 2001 From: Travis Elless <113720457+TravisElless-NOAA@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:11:54 +0000 Subject: [PATCH 3/6] Update ush/python/pygfs/task/snow_analysis.py Co-authored-by: Jiarui Dong --- ush/python/pygfs/task/snow_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/python/pygfs/task/snow_analysis.py b/ush/python/pygfs/task/snow_analysis.py index 1da02f9da3..30a7ffc2c4 100644 --- a/ush/python/pygfs/task/snow_analysis.py +++ b/ush/python/pygfs/task/snow_analysis.py @@ -176,7 +176,7 @@ def prepare_IMS(self) -> None: prep_ims_config = parse_j2yaml(self.task_config.IMS_OBS_LIST, localconf) logger.debug(f"{self.task_config.IMS_OBS_LIST}:\n{pformat(prep_ims_config)}") - asc_file = os.path.join(localconf.COMIN_OBS, f"{self.task_config.OPREFIX}imssnow96.asc") + asc_file = os.path.join(localconf.COMIN_OBS, f"{localconf.OPREFIX}imssnow96.asc") if not os.path.isfile(asc_file): logger.exception(f"Obs files are missing. Will not execute CALCFIMSEXE") return From 586a62cb1c86cbf86243475bc33d60e98b5c08e1 Mon Sep 17 00:00:00 2001 From: Travis Elless <113720457+TravisElless-NOAA@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:12:04 +0000 Subject: [PATCH 4/6] Update ush/python/pygfs/task/snowens_analysis.py Co-authored-by: Jiarui Dong --- ush/python/pygfs/task/snowens_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/python/pygfs/task/snowens_analysis.py b/ush/python/pygfs/task/snowens_analysis.py index dad5ae65a7..5363b4ad49 100644 --- a/ush/python/pygfs/task/snowens_analysis.py +++ b/ush/python/pygfs/task/snowens_analysis.py @@ -197,7 +197,7 @@ def prepare_IMS(self) -> None: prep_ims_config = parse_j2yaml(self.task_config.IMS_OBS_LIST, localconf) logger.debug(f"{self.task_config.IMS_OBS_LIST}:\n{pformat(prep_ims_config)}") - asc_file = os.path.join(localconf.COMIN_OBS, f"{self.task_config.OPREFIX}imssnow96.asc") + asc_file = os.path.join(localconf.COMIN_OBS, f"{localconf.OPREFIX}imssnow96.asc") if not os.path.isfile(asc_file): logger.exception(f"Obs files are missing. Will not execute CALCFIMSEXE") return From d93db353ed2016bcbd13b81bcfa341f64bfa2ddf Mon Sep 17 00:00:00 2001 From: "travis.j.elless" Date: Fri, 14 Feb 2025 19:28:42 +0000 Subject: [PATCH 5/6] update logger statements --- ush/python/pygfs/task/snow_analysis.py | 2 +- ush/python/pygfs/task/snowens_analysis.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ush/python/pygfs/task/snow_analysis.py b/ush/python/pygfs/task/snow_analysis.py index 30a7ffc2c4..84f4bb306d 100644 --- a/ush/python/pygfs/task/snow_analysis.py +++ b/ush/python/pygfs/task/snow_analysis.py @@ -178,7 +178,7 @@ def prepare_IMS(self) -> None: asc_file = os.path.join(localconf.COMIN_OBS, f"{localconf.OPREFIX}imssnow96.asc") if not os.path.isfile(asc_file): - logger.exception(f"Obs files are missing. Will not execute CALCFIMSEXE") + logger.warn(f"WARNING: Obs files are missing. Will not execute CALCFIMSEXE") return # copy the IMS obs files from COMIN_OBS to DATA/obs diff --git a/ush/python/pygfs/task/snowens_analysis.py b/ush/python/pygfs/task/snowens_analysis.py index 5363b4ad49..aaa809dd38 100644 --- a/ush/python/pygfs/task/snowens_analysis.py +++ b/ush/python/pygfs/task/snowens_analysis.py @@ -199,7 +199,7 @@ def prepare_IMS(self) -> None: asc_file = os.path.join(localconf.COMIN_OBS, f"{localconf.OPREFIX}imssnow96.asc") if not os.path.isfile(asc_file): - logger.exception(f"Obs files are missing. Will not execute CALCFIMSEXE") + logger.warn(f"WARNING: Obs files are missing. Will not execute CALCFIMSEXE") return # copy the IMS obs files from COMIN_OBS to DATA/obs From cde3586396f3b3158a55d5d3912f2e72499b0939 Mon Sep 17 00:00:00 2001 From: "travis.j.elless" Date: Fri, 14 Feb 2025 19:35:33 +0000 Subject: [PATCH 6/6] logger update 2 --- ush/python/pygfs/task/snow_analysis.py | 2 +- ush/python/pygfs/task/snowens_analysis.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ush/python/pygfs/task/snow_analysis.py b/ush/python/pygfs/task/snow_analysis.py index 84f4bb306d..9dbda9406f 100644 --- a/ush/python/pygfs/task/snow_analysis.py +++ b/ush/python/pygfs/task/snow_analysis.py @@ -178,7 +178,7 @@ def prepare_IMS(self) -> None: asc_file = os.path.join(localconf.COMIN_OBS, f"{localconf.OPREFIX}imssnow96.asc") if not os.path.isfile(asc_file): - logger.warn(f"WARNING: Obs files are missing. Will not execute CALCFIMSEXE") + logger.warning(f"WARNING: Obs files are missing. Will not execute CALCFIMSEXE") return # copy the IMS obs files from COMIN_OBS to DATA/obs diff --git a/ush/python/pygfs/task/snowens_analysis.py b/ush/python/pygfs/task/snowens_analysis.py index aaa809dd38..8f4c9890ca 100644 --- a/ush/python/pygfs/task/snowens_analysis.py +++ b/ush/python/pygfs/task/snowens_analysis.py @@ -199,7 +199,7 @@ def prepare_IMS(self) -> None: asc_file = os.path.join(localconf.COMIN_OBS, f"{localconf.OPREFIX}imssnow96.asc") if not os.path.isfile(asc_file): - logger.warn(f"WARNING: Obs files are missing. Will not execute CALCFIMSEXE") + logger.warning(f"WARNING: Obs files are missing. Will not execute CALCFIMSEXE") return # copy the IMS obs files from COMIN_OBS to DATA/obs