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

Unify CDEPS gfs, cfsr, and gefs datm datamodes + Improve error checking in rt.sh (2388) + Add ability to read increment files on native cubed sphere grid (2304) #2389

Merged
merged 71 commits into from
Aug 27, 2024

Conversation

NickSzapiro-NOAA
Copy link
Collaborator

@NickSzapiro-NOAA NickSzapiro-NOAA commented Aug 7, 2024

Commit Queue Requirements:

  • Fill out all sections of this template.
  • All sub component pull requests have been reviewed by their code managers.
  • Run the full Intel+GNU RT suite (compared to current baselines) on either Hera/Derecho/Hercules
  • Commit 'test_changes.list' from previous step

Description:

Code for gfs, cfsr, and gefs datm datamodes is very similar (just with different function names). This PR removes the duplicates. As gefs datm datamode is already in ESCOMP/CDEPS, gefs is retained here. Note that GFS, GEFS, CFSR, etc. input datasets are still handled via streams in the same way, just with datamode == 'GEFS'. Sunset gfs_hafs datamode no longer used.

These PRs have also been merged for commit queue (via PR to this branch on their behalf):

Commit Message:

* UFSWM -  Unify CDEPS gfs, cfsr, and gefs datm datamodes. Add ability to read increment files on native cubed sphere grid.  Update rt scripts to fix checking the job exit status from Slurm and PBS schedulers.
  * FV3 - Add namelist parameter for cubed sphere increment read and update atmos_cubed_sphere hash for GFDL Atmospheric Cubed Sphere PR #[342](https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere/pull/342)
    * atmos_cubed_sphere - Add ability to read increments from files on native cubed sphere grid
  * CDEPS - Unify CDEPS gfs, cfsr, and gefs datm datamodes. Rename CDEPS-related FILENAME_BASE to FILEBASE_DATM in tests. Sunset gfs_hafs datamode.

Priority:

  • Normal

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Changes

Regression Test Changes (Please commit test_changes.list):

  • No Baseline Changes.

Input data Changes:

  • None.

Library Changes/Upgrades:

  • No Updates

Testing Log:

  • RDHPCS
    • Hera
    • Orion
    • Hercules
    • Jet
    • Gaea
    • Derecho
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
  • opnReqTest (complete task if unnecessary)

DavidNew-NOAA and others added 30 commits May 30, 2024 17:39
  In /github/workspace/tests/rt_utils.sh line 130:
    local test_status='PASS'
          ^---------^ SC2034 (warning): test_status appears unused. Verify use (or export if used externally).
@zach1221 zach1221 added jenkins-ort run ORT testing hera-RT Run Hera regression testing gaea-RT and removed jenkins-ort run ORT testing hera-RT Run Hera regression testing gaea-RT labels Aug 26, 2024
@zach1221
Copy link
Collaborator

Testing is complete. We can start the merging process with cubed-sphere #342

@zach1221
Copy link
Collaborator

@NickSzapiro-NOAA Please update .gitmodule urls and hashes.

NOAA-EMC/CDEPS@1f9eaaa
NOAA-EMC/fv3atm@70b3065

@zach1221 zach1221 merged commit 94a3cd7 into ufs-community:develop Aug 27, 2024
3 checks passed
@jkbk2004 jkbk2004 mentioned this pull request Aug 27, 2024
14 tasks
DavidHuber-NOAA added a commit to DavidHuber-NOAA/ufs-weather-model that referenced this pull request Sep 9, 2024
…r-model into develop

* 'develop' of https://github.com/ufs-community/ufs-weather-model:
  update mom6 to its main repo. 20240824 commit (FMA) (ufs-community#2412)
  Update CMEPS; fix aux history functionality for float variable type; Switch to using Aux history files in atm_ds2s_docn_dice test; Remove IFI tests (was ufs-community#2417) (ufs-community#2395)
  Combination for CCPP-physics ufs-community#213 and ufs-community#218 (H2O scheme refactor and C3/SAS/MYNN fix) (ufs-community#2408)
  Unify CDEPS gfs, cfsr, and gefs datm datamodes + Improve error checking in rt.sh (2388) + Add ability to read increment files on native cubed sphere grid (2304) (ufs-community#2389)
  sync with head of NOAA-EMC UPP develop (ufs-community#2326)
  Allow use of downscaled warmstart files for cpld_control_sfs test (ufs-community#2375)
  update to MOM6 main 20240729 commit (gfdl-to-main-2024-05-31) (ufs-community#2381)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
No Baseline Change No Baseline Change Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Synchronize DATM in EMC/CDEPS with authoritative ESCOMP/CDEPS
9 participants