Skip to content

Source set_strict rather than call it as a function#4690

Open
CoryMartin-NOAA wants to merge 7 commits intoNOAA-EMC:developfrom
CoryMartin-NOAA:feature/strict
Open

Source set_strict rather than call it as a function#4690
CoryMartin-NOAA wants to merge 7 commits intoNOAA-EMC:developfrom
CoryMartin-NOAA:feature/strict

Conversation

@CoryMartin-NOAA
Copy link
Contributor

@CoryMartin-NOAA CoryMartin-NOAA commented Mar 20, 2026 •
edited
Loading

Description

To adhere to NWS operational standards, we must, rather than define and execute bash functions to set and unset strict mode, source ush scripts that set and unset strict mode. This PR removes the functions and instead creates simplified bash that can be sourced, and all places that previously called the functions have been replaced by a source of the scripts.

Additionally, the set_strict has been removed from jjob_shell_setup and is now explicitly called at the top of every j-job.

Resolves ##4682

Type of change

  • Bug fix (fixes something broken)
  • New feature (adds functionality)
  • Maintenance (code refactor, clean-up, new CI test, etc.)

Change characteristics

  • Is this change expected to change outputs (e.g. value changes to existing outputs, new files stored in COM, files removed from COM, filename changes, additions/subtractions to archives)? NO
  • Is this a breaking change (a change in existing functionality)? NO
  • Does this change require a documentation update? NO
  • Does this change require an update to any of the following submodules? No - [ ] EMC verif-global
    • GDAS
    • GFS-utils
    • GSI
    • GSI-monitor
    • GSI-utils
    • UFS-utils
    • UFS-weather-model
    • wxflow

How has this been tested?

On Ursa:

############################### C48_ATM ################################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Mar 20 2026 19:10:07    Mar 20 2026 20:20:05
############################### C48_S2SW ###############################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Mar 20 2026 19:10:07    Mar 20 2026 20:20:05
########################## C48_gsienkf_atmDA ###########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:30:07
202402240000        Done    Mar 20 2026 19:10:07    Mar 20 2026 20:25:06
202402240600        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:10:05
########################## C48_ufsenkf_atmDA ###########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:30:07
202402240000        Done    Mar 20 2026 19:10:07    Mar 20 2026 20:40:07
202402240600        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:30:08
######################### C48mx500_3DVarAOWCDA #########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103241800        Done    Mar 20 2026 19:10:07    Mar 20 2026 20:25:06
202103250000        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:05:07
########################## C48mx500_hybAOWCDA ##########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103241800        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:40:06
202103250000        Done    Mar 20 2026 19:10:07    Mar 20 2026 20:45:07
########################### C96C48_hybatmDA ############################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201800        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:35:07
202112210000        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:05:07
202112210600        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:40:07
######################### C96C48_hybatmsnowDA ##########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:40:06
202112201800        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:10:05
202112210000        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:30:08
######################### C96C48_hybatmsoilDA ##########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202205150600        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:40:06
202205151200        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:20:06
202205151800        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:45:08
######################### C96C48_ufs_hybatmDA ##########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:40:05
202402240000        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:25:07
202402240600        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:30:08
######################## C96C48_ufsgsi_hybatmDA ########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202402231800        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:40:05
202402240000        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:25:07
202402240600        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:35:06
####################### C96C48mx500_S2SW_cyc_gfs #######################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 20 2026 19:10:07    Mar 20 2026 20:50:07
202112201800        Done    Mar 20 2026 19:10:07    Mar 20 2026 22:10:06
202112210000        Done    Mar 20 2026 19:10:07    Mar 20 2026 22:35:06
############################# C96_atm3DVar #############################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201800        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:35:07
202112210000        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:15:07
202112210600        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:40:07
########################### C96_gcafs_cycled ###########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:30:06
202112201800        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:20:06
202112210000        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:05:07
######################## C96_gcafs_cycled_noDA #########################
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Mar 20 2026 19:10:07    Mar 20 2026 19:30:06
202112201800        Done    Mar 20 2026 19:10:07    Mar 20 2026 21:00:08
202112210000        Done    Mar 20 2026 19:10:07    Mar 20 2026 20:40:07

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

@CoryMartin-NOAA CoryMartin-NOAA self-assigned this Mar 20, 2026
@CoryMartin-NOAA
Copy link
Contributor Author

CoryMartin-NOAA commented Mar 20, 2026 •
edited
Loading

@RussTreadon-NOAA @DavidNew-NOAA I have a hunch this will require changes to GDASApp tests. Let me check and if so, I will open a PR there too.

EDIT: A grep/search says we should (hopefully) be good

@CoryMartin-NOAA
Copy link
Contributor Author

CoryMartin-NOAA commented Mar 20, 2026

Running -G and -C tests on Ursa. Will report back once they are done.

@CoryMartin-NOAA CoryMartin-NOAA marked this pull request as ready for review March 23, 2026 12:31
@CoryMartin-NOAA
Copy link
Contributor Author

CoryMartin-NOAA commented Mar 23, 2026

All tests passed on Ursa. Ready for review and more thorough CI testing.

DavidHuber-NOAA
DavidHuber-NOAA reviewed Mar 23, 2026
View reviewed changes
DavidHuber-NOAA
DavidHuber-NOAA previously approved these changes Mar 23, 2026
View reviewed changes
Copy link
Contributor

@DavidHuber-NOAA DavidHuber-NOAA left a comment

Choose a reason for hiding this comment

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

Looks good! One thought, but not necessary to incorporate into this PR.

@DavidHuber-NOAA DavidHuber-NOAA added the CI-Ursa-Passed (cm) Manual CI passed on Ursa label Mar 23, 2026
@CoryMartin-NOAA
Revert "update set_strict"
9a0c614 
This reverts commit a839dc2.
@EdwardSafford-NOAA
Copy link
Contributor

EdwardSafford-NOAA commented Mar 23, 2026

Changes to DA monitor jobs and script look good. I think exgdas_atmos_verfozn.sh needs to be included in these changes too, doesn't it?

@CoryMartin-NOAA
Copy link
Contributor Author

CoryMartin-NOAA commented Mar 23, 2026

@EdwardSafford-NOAA I didn't see the set_strict in that file

@EdwardSafford-NOAA
Copy link
Contributor

EdwardSafford-NOAA commented Mar 23, 2026

Ok, just thought it might need to be included because its parent J-job is. If that's not the case then all good and I'll approve.

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

Reviewers

@EdwardSafford-NOAA EdwardSafford-NOAA EdwardSafford-NOAA approved these changes

@DavidHuber-NOAA DavidHuber-NOAA DavidHuber-NOAA approved these changes

@HananehJafary-NOAA HananehJafary-NOAA Awaiting requested review from HananehJafary-NOAA HananehJafary-NOAA is a code owner

@TravisElless-NOAA TravisElless-NOAA Awaiting requested review from TravisElless-NOAA TravisElless-NOAA is a code owner

@WenMeng-NOAA WenMeng-NOAA Awaiting requested review from WenMeng-NOAA WenMeng-NOAA is a code owner

@JessicaMeixner-NOAA JessicaMeixner-NOAA Awaiting requested review from JessicaMeixner-NOAA JessicaMeixner-NOAA is a code owner

@sbanihash sbanihash Awaiting requested review from sbanihash sbanihash is a code owner

@jiaruidong2017 jiaruidong2017 Awaiting requested review from jiaruidong2017 jiaruidong2017 is a code owner

@guillaumevernieres guillaumevernieres Awaiting requested review from guillaumevernieres guillaumevernieres is a code owner

@AndrewEichmann-NOAA AndrewEichmann-NOAA Awaiting requested review from AndrewEichmann-NOAA AndrewEichmann-NOAA is a code owner

@bbakernoaa bbakernoaa Awaiting requested review from bbakernoaa bbakernoaa is a code owner

@JesseMeng-NOAA JesseMeng-NOAA Awaiting requested review from JesseMeng-NOAA JesseMeng-NOAA is a code owner

@ChristopherHill-NOAA ChristopherHill-NOAA Awaiting requested review from ChristopherHill-NOAA ChristopherHill-NOAA is a code owner

@EricSinsky-NOAA EricSinsky-NOAA Awaiting requested review from EricSinsky-NOAA EricSinsky-NOAA is a code owner

@RussTreadon-NOAA RussTreadon-NOAA Awaiting requested review from RussTreadon-NOAA RussTreadon-NOAA is a code owner

@DavidNew-NOAA DavidNew-NOAA Awaiting requested review from DavidNew-NOAA DavidNew-NOAA is a code owner

@BrianCurtis-NOAA BrianCurtis-NOAA Awaiting requested review from BrianCurtis-NOAA BrianCurtis-NOAA is a code owner

@CatherineThomas-NOAA CatherineThomas-NOAA Awaiting requested review from CatherineThomas-NOAA CatherineThomas-NOAA is a code owner

@BoCui-NOAA BoCui-NOAA Awaiting requested review from BoCui-NOAA BoCui-NOAA is a code owner

@jack-woollen jack-woollen Awaiting requested review from jack-woollen jack-woollen is a code owner

Assignees

@CoryMartin-NOAA CoryMartin-NOAA

Labels

CI-Ursa-Passed (cm) Manual CI passed on Ursa

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@CoryMartin-NOAA @EdwardSafford-NOAA @DavidHuber-NOAA