From 22fded17db67b1667123c2fecbceed51add3c2a1 Mon Sep 17 00:00:00 2001 From: shlyaeva Date: Mon, 18 Nov 2024 10:16:32 -0600 Subject: [PATCH 1/3] Run one executable for soca2cice (instead of two) --- scripts/exglobal_marine_analysis_checkpoint.py | 5 ++--- ush/python/pygfs/task/marine_analysis.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/exglobal_marine_analysis_checkpoint.py b/scripts/exglobal_marine_analysis_checkpoint.py index 84b180b2876..c47a2e3a0e9 100755 --- a/scripts/exglobal_marine_analysis_checkpoint.py +++ b/scripts/exglobal_marine_analysis_checkpoint.py @@ -24,6 +24,5 @@ # Prepare the SOCA increment for MOM6 IAU MarineAnl.checkpoint_mom6_iau('socaincr2mom6.yaml') - # Insert the seaice analysis into the CICE6 restarts in 2 sequential stages - MarineAnl.checkpoint_cice6('soca_2cice_arctic.yaml') - MarineAnl.checkpoint_cice6('soca_2cice_antarctic.yaml') + # Insert the seaice analysis into the CICE6 restart + MarineAnl.checkpoint_cice6('soca_2cice_global.yaml') diff --git a/ush/python/pygfs/task/marine_analysis.py b/ush/python/pygfs/task/marine_analysis.py index 75cc28c7b30..4f8fa760c02 100644 --- a/ush/python/pygfs/task/marine_analysis.py +++ b/ush/python/pygfs/task/marine_analysis.py @@ -284,7 +284,7 @@ def _prep_checkpoint(self: Task) -> None: # render the SOCA to CICE YAML file for the Arctic and Antarctic logger.info("render the SOCA to CICE YAML file for the Arctic and Antarctic") - varchgyamls = ['soca_2cice_arctic.yaml', 'soca_2cice_antarctic.yaml'] + varchgyamls = ['soca_2cice_global.yaml'] for varchgyaml in varchgyamls: soca2cice_config = parse_j2yaml(path=os.path.join(self.task_config.MARINE_JCB_GDAS_ALGO, f'{varchgyaml}.j2'), data=soca2cice_param) From 79a636b39b7f73a0ffc93f396c8bbf86abbc61e0 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Thu, 21 Nov 2024 22:32:03 +0000 Subject: [PATCH 2/3] update gdas.cd hash (#1367) --- sorc/gdas.cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index e514b926561..0218abf2ae2 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit e514b926561bfc8fa3de741876505aff74255c95 +Subproject commit 0218abf2ae20ada7a73a49c9a86833276024c466 From b116bf86035ecbc7043c6f51bbe69e25769fda81 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Fri, 22 Nov 2024 13:53:15 +0000 Subject: [PATCH 3/3] update gdas.cd hash to fix C96C48_hybatmaerosnowDA failure (#3118) --- sorc/gdas.cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 0218abf2ae2..9ab7994a0ca 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 0218abf2ae20ada7a73a49c9a86833276024c466 +Subproject commit 9ab7994a0caf6b201613dd7e7ceae482ffa600e0