Skip to content

[develop] Update GSI and GSI-monitor hashes for EE2#4729

Open
CatherineThomas-NOAA wants to merge 2 commits intoNOAA-EMC:developfrom
CatherineThomas-NOAA:dev_gsiupd
Open

[develop] Update GSI and GSI-monitor hashes for EE2#4729
CatherineThomas-NOAA wants to merge 2 commits intoNOAA-EMC:developfrom
CatherineThomas-NOAA:dev_gsiupd

Conversation

@CatherineThomas-NOAA
Copy link
Copy Markdown
Contributor

Description

Companion to #4728

Updates the GSI hash to remove unused variables (NOAA-EMC/GSI#989) and the GSI-monitor to remove goto statements (NOAA-EMC/GSI-Monitor#206) and unused scripts (NOAA-EMC/GSI-Monitor#207).

Refs #4676
Refs #4718

Type of change

  • Maintenance (code refactor, clean-up, new CI test, etc.)

Change characteristics

How has this been tested?

generate_workflows -G -E -S -C on WCOSS2 and Gaea C6 - All tests passed, but with an older merge of develop ( 83543df), I will rerun tests

develop at 83543df was run and the low-res v17 and C96 atm3dvar tests had identical results to this PR

Checklist

  • Any dependent changes have been merged and published
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have documented my code, including function, input, and output descriptions
  • My changes generate no new warnings
  • New and existing tests pass with my changes
  • This change is covered by an existing CI test or a new one has been added
  • Any new scripts have been added to the .github/CODEOWNERS file with owners
  • I have made corresponding changes to the system documentation if necessary

@DavidHuber-NOAA
Copy link
Copy Markdown
Contributor

@CatherineThomas-NOAA is this PR ready for review as well?

@CatherineThomas-NOAA
Copy link
Copy Markdown
Contributor Author

@DavidHuber-NOAA - I had previously run CI tests with develop but there were several PRs merged since then, so I should rerun tests. I'll do that today.

@CatherineThomas-NOAA
Copy link
Copy Markdown
Contributor Author

Tests on WCOSS2 and Gaea C6 pass (will post results separately). The C96C48mx500_S2SW_cyc_gfs test reproduces with develop. Ready for review.

@CatherineThomas-NOAA CatherineThomas-NOAA marked this pull request as ready for review April 1, 2026 14:03
@CatherineThomas-NOAA
Copy link
Copy Markdown
Contributor Author

WCOSS2 -G -E -S -C Tests - All Pass

gw_cistat -r /lfs/h2/emc/ptmp/catherine.thomas/RUNTESTS_dev_gsiupd2
######################### C48_ATM_dev_gsiupd2 ##########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Mar 31 2026 17:40:16    Mar 31 2026 18:35:12
#################### C48_gsienkf_atmDA_dev_gsiupd2 #####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 31 2026 17:40:42    Mar 31 2026 18:00:40
202402240000        Done    Mar 31 2026 17:40:42    Mar 31 2026 19:00:42
202402240600        Done    Mar 31 2026 17:40:42    Mar 31 2026 19:55:35
################### C48mx500_3DVarAOWCDA_dev_gsiupd2 ###################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103241800        Done    Mar 31 2026 17:40:39    Mar 31 2026 19:00:47
202103250000        Done    Mar 31 2026 17:40:39    Mar 31 2026 19:20:43
#################### C48mx500_hybAOWCDA_dev_gsiupd2 ####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103241800        Done    Mar 31 2026 17:40:11    Mar 31 2026 18:00:20
202103250000        Done    Mar 31 2026 17:40:11    Mar 31 2026 19:00:12
###################### C48_S2SWA_gefs_dev_gsiupd2 ######################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Mar 31 2026 17:40:16    Mar 31 2026 19:00:09
#################### C48_S2SW_extended_dev_gsiupd2 #####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Mar 31 2026 17:40:27    Mar 31 2026 20:10:16
202103231800        Done    Mar 31 2026 17:40:27    Mar 31 2026 20:05:33
#################### C48_ufsenkf_atmDA_dev_gsiupd2 #####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 31 2026 17:40:19    Mar 31 2026 18:00:16
202402240000        Done    Mar 31 2026 17:40:19    Mar 31 2026 18:55:15
202402240600        Done    Mar 31 2026 17:40:19    Mar 31 2026 19:45:09
################## C96_atm3DVar_extended_dev_gsiupd2 ###################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201800        Done    Mar 31 2026 17:40:17    Mar 31 2026 20:05:40
202112210000        Done    Mar 31 2026 17:40:17    Mar 31 2026 22:25:14
202112210600        Done    Mar 31 2026 17:40:17    Mar 31 2026 23:20:24
202112211200        Done    Mar 31 2026 20:10:10    Apr 01 2026 00:40:20
202112211800        Done    Mar 31 2026 22:30:07    Apr 01 2026 03:15:13
##################### C96C48_hybatmDA_dev_gsiupd2 ######################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201800        Done    Mar 31 2026 17:40:32    Mar 31 2026 18:05:59
202112210000        Done    Mar 31 2026 17:40:32    Mar 31 2026 20:05:36
202112210600        Done    Mar 31 2026 17:40:32    Mar 31 2026 20:05:36
################### C96C48_hybatmsnowDA_dev_gsiupd2 ####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 31 2026 17:40:21    Mar 31 2026 18:05:35
202112201800        Done    Mar 31 2026 17:40:21    Mar 31 2026 20:00:18
202112210000        Done    Mar 31 2026 17:40:21    Mar 31 2026 20:00:18
################### C96C48_hybatmsoilDA_dev_gsiupd2 ####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202205150600        Done    Mar 31 2026 17:40:17    Mar 31 2026 18:05:08
202205151200        Done    Mar 31 2026 17:40:17    Mar 31 2026 20:00:15
202205151800        Done    Mar 31 2026 17:40:17    Mar 31 2026 20:00:15
################# C96C48mx500_S2SW_cyc_gfs_dev_gsiupd2 #################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 31 2026 17:40:24    Mar 31 2026 19:30:24
202112201800        Done    Mar 31 2026 17:40:24    Mar 31 2026 20:30:20
202112210000        Done    Mar 31 2026 17:40:24    Mar 31 2026 20:50:15
202112211800        Done    Mar 31 2026 19:35:16    Mar 31 2026 21:00:18
################## C96C48_ufsgsi_hybatmDA_dev_gsiupd2 ##################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 31 2026 17:40:17    Mar 31 2026 18:05:34
202402240000        Done    Mar 31 2026 17:40:17    Mar 31 2026 20:10:10
202402240600        Done    Mar 31 2026 17:40:17    Mar 31 2026 19:55:12
################### C96C48_ufs_hybatmDA_dev_gsiupd2 ####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 31 2026 17:40:34    Mar 31 2026 18:05:35
202402240000        Done    Mar 31 2026 17:40:34    Mar 31 2026 20:15:39
202402240600        Done    Mar 31 2026 17:40:34    Mar 31 2026 19:55:40
##################### C96_gcafs_cycled_dev_gsiupd2 #####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 31 2026 17:40:13    Mar 31 2026 18:00:14
202112201800        Done    Mar 31 2026 17:40:13    Mar 31 2026 20:15:10
202112210000        Done    Mar 31 2026 17:40:13    Mar 31 2026 19:25:16
################## C96_gcafs_cycled_noDA_dev_gsiupd2 ###################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 31 2026 17:40:32    Mar 31 2026 18:00:35
202112201800        Done    Mar 31 2026 17:40:32    Mar 31 2026 20:00:43
202112210000        Done    Mar 31 2026 17:40:32    Mar 31 2026 18:55:32
####################### C96mx100_S2S_dev_gsiupd2 #######################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
199405010000        Done    Mar 31 2026 17:40:20    Mar 31 2026 19:15:18

@CatherineThomas-NOAA
Copy link
Copy Markdown
Contributor Author

Gaea C6 -G -E -S -C Tests - All Pass

gw_cistat -r /gpfs/f6/gfs-cpu/world-shared/Catherine.Thomas/tmp/RUNTESTS_dev_gsiupd2
######################### C48_ATM_dev_gsiupd2 ##########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:40:07
#################### C48_gsienkf_atmDA_dev_gsiupd2 #####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 31 2026 17:45:09    Mar 31 2026 18:05:07
202402240000        Done    Mar 31 2026 17:45:09    Mar 31 2026 19:00:08
202402240600        Done    Mar 31 2026 17:45:09    Mar 31 2026 19:50:07
################### C48mx500_3DVarAOWCDA_dev_gsiupd2 ###################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103241800        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:55:08
202103250000        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:45:07
#################### C48mx500_hybAOWCDA_dev_gsiupd2 ####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103241800        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:05:07
202103250000        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:00:08
###################### C48_S2SWA_gefs_dev_gsiupd2 ######################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:05:08
######################### C48_S2SW_dev_gsiupd2 #########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:45:08
#################### C48_ufsenkf_atmDA_dev_gsiupd2 #####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:05:07
202402240000        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:00:08
202402240600        Done    Mar 31 2026 17:45:10    Mar 31 2026 20:00:09
####################### C96_atm3DVar_dev_gsiupd2 #######################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201800        Done    Mar 31 2026 17:45:09    Mar 31 2026 18:05:07
202112210000        Done    Mar 31 2026 17:45:09    Mar 31 2026 19:50:08
202112210600        Done    Mar 31 2026 17:45:09    Mar 31 2026 20:10:07
##################### C96C48_hybatmDA_dev_gsiupd2 ######################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201800        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:05:07
202112210000        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:50:07
202112210600        Done    Mar 31 2026 17:45:10    Mar 31 2026 20:10:07
################### C96C48_hybatmsnowDA_dev_gsiupd2 ####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:05:07
202112201800        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:50:08
202112210000        Done    Mar 31 2026 17:45:10    Mar 31 2026 20:10:08
################### C96C48_hybatmsoilDA_dev_gsiupd2 ####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202205150600        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:10:08
202205151200        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:50:08
202205151800        Done    Mar 31 2026 17:45:10    Mar 31 2026 20:15:07
################# C96C48mx500_S2SW_cyc_gfs_dev_gsiupd2 #################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:15:07
202112201800        Done    Mar 31 2026 17:45:10    Mar 31 2026 20:40:10
202112210000        Done    Mar 31 2026 17:45:10    Mar 31 2026 21:10:07
202112211800        Done    Mar 31 2026 19:20:07    Mar 31 2026 21:15:20
##################### C96_gcafs_cycled_dev_gsiupd2 #####################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:05:07
202112201800        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:45:07
202112210000        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:45:07
################## C96_gcafs_cycled_noDA_dev_gsiupd2 ###################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 31 2026 17:45:10    Mar 31 2026 18:05:08
202112201800        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:35:20
202112210000        Done    Mar 31 2026 17:45:10    Mar 31 2026 19:05:08
####################### C96mx100_S2S_dev_gsiupd2 #######################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
199405010000        Done    Mar 31 2026 17:45:09    Mar 31 2026 19:20:07

Copy link
Copy Markdown
Contributor

@RussTreadon-NOAA RussTreadon-NOAA left a comment

Choose a reason for hiding this comment

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

This PR updates sorc/gsi_enkf.fd to c2e7964. This hash removed unused variables from the GSI_MODE=Regional build. This build enables gsi.x to run in both global and regional modes.

One stated goal of this PR was to remove unused variables from the GSI. Updating sorc/gsi_enf.fd to c2e7964 is a step in this direction.

Approve.

Copy link
Copy Markdown
Contributor

@EdwardSafford-NOAA EdwardSafford-NOAA left a comment

Choose a reason for hiding this comment

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

Changes to GSI-monitor are as intended.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants