Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the mean EnKF soil increment to the deterministic member #3295

Open
wants to merge 43 commits into
base: develop
Choose a base branch
from

Conversation

ClaraDraper-NOAA
Copy link
Contributor

@ClaraDraper-NOAA ClaraDraper-NOAA commented Feb 4, 2025

Description

Add mean EnKF soil increment to the deterministic member. Includes new regriding script and executable (in GDASApp) to perform masked bi-linear interpolation of the soil increments.

Resolves 2773

Type of change

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

Change characteristics

  • 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?
    • [ YES] UFS-utils

OUTDATED:
Exercizing the new soil analysis feature requires updating UFS_UTILS to at least commit e718003

UPDATE Feb 5:
After responding to reviews, requires updating to UFS_UTILS PR 1022

How has this been tested?

Tested on hera:
C96_atm3DVar, C96C48_hybatmaerosnowDA, and the default test ran succesfully.
Confirmed new functionality works as expected.
Confirmed that the commits do not change output from cycling the DA if the the new feature is not selected.

Checklist

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

NOTE:

  • Exercizing the new feature requires some additional fix files, currently at $TMP_FIX_FILES in ush/regrid_gsiSfcIncr_to_tile.sh . These will need to be added to a fix directory, if this PR is accepted as is (note: these files could also be generated on the fly)
  • Exercizing the new feature requires jobs/rocoto/sfcanl.sh and sfc.sh to load the ufsda modules in place of the fv3gfs modules. My understanding is that the modules will eventually be unified, but for now I've added comments to the relevant scripts noting this.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

ShellCheck found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link
Contributor

@CoryMartin-NOAA CoryMartin-NOAA left a comment

Choose a reason for hiding this comment

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

first pass

Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

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

the changes looks good. seems like some checks are failing. I tried to recommend a couple updates that might help.

@ClaraDraper-NOAA
Copy link
Contributor Author

All:

  1. I think I've addressed everything. I resolved any comments where I thought the change was obvious. Given the large number of changes, and my propensity for typos, I'm going to repeat the tests to make sure I didn't mess anything up. I'll comment again once that's done.

  2. I've also found a bug I need to fix.

  3. I've prepared a PR in UFS_UTILS to tidy up the variable names, as I think this is a good time to do that. I'll edit the first comment above to note that.

Copy link
Contributor

@CoryMartin-NOAA CoryMartin-NOAA left a comment

Choose a reason for hiding this comment

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

last comment, otherwise I think the changes look good (have not tested).

We should turn this on in one or more of the CI tests

@ClaraDraper-NOAA
Copy link
Contributor Author

last comment, otherwise I think the changes look good (have not tested).

We should turn this on in one or more of the CI tests

I've added a CI test.

@ClaraDraper-NOAA
Copy link
Contributor Author

All - I have one change I need to make tomorrow (staging the orog fix files), which will require a fortran change. Otherwise, I think everything else is done. Thanks for all your input!

@RussTreadon-NOAA RussTreadon-NOAA modified the milestone: GFS v17 Feb 8, 2025
@aerorahul
Copy link
Contributor

@CatherineThomas-NOAA noted yesterday that some more work is needed to finish this PR.

@ClaraDraper-NOAA
Copy link
Contributor Author

Quick update: the UFS_UTILS PR has been merged, and we're sorting out one last issue before updating the GDASApp hash. Once that's done, I'll update both hashes, and we should be good to merge. I checked with @CatherineThomas-NOAA, and she was referring to the two submodules that need updating.

Note that running the soil analysis requires some additional fix files, and changing the modules for the two sfc update jobs. Do we want to add the new fix files within this PR?

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.

Add soil increments to deterministic member
6 participants