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.

Sign up for GitHub

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

Jump to bottom

sync with head of NOAA-EMC UPP develop #2326

Merged
merged 94 commits into from
Aug 23, 2024
Merged

sync with head of NOAA-EMC UPP develop #2326

merged 94 commits into from
Aug 23, 2024

Conversation

SamuelTrahanNOAA
Copy link
Collaborator

@SamuelTrahanNOAA SamuelTrahanNOAA commented Jun 13, 2024 •
edited by zach1221
Loading

Commit Queue Requirements:

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

Description:

  1. Sync FV3/upp with the head of its authoritative branch.
  2. Update library g2tmpl to version 1.13.0
  3. Update library g2 to version 3.5.1
  4. Inline post FV3/io/post_FV3.F90 is updated for the new UPP.
  5. Update the UPP control files for global, rrfs and hafs used in inline post in regression tests.
  6. FV3's spack.yaml has explicit UPP dependencies (g2, g2tmpl, etc.) and all libraries have exact version numbers. These version numbers match the top of ufs-weather-model's develop branch for hercules.

Syncing to the top of FV3/upp brings in many bug fixes and new features. Users must update their build systems and static files due to this update.

After this update, users must...

  1. Update to g2tmpl version 1.13.0.
  2. Update to g2 version 3.5.1
  3. Ensure ufs-weather-model/modulefiles, FV3/io/post_FV3.F90, and FV3/upp are all updated in their forks.
  4. Regenerate postxconfig*.txt files if running the inline post.

The reasons users must update are...

  1. Some variables change from GRIB template 4.8 to 4.9. This requires a newer version of g2tmpl. Also, it requires changes to postxconfig*.txt files if you use those variables. GRIB records for those variables will change to, so it will affect downstream users who use those fields.
  2. As a cleanup measure, variable names for number concentration on hybrid levels no longer have the "GSL_" prefix. Your postxconfig*.txt files must update to match, if you use those variables.
  3. UPP's EBB variable changed from 2D to 4D. This requires a change to FV3/io/post_FV3.F90 to send CCPP's ebu_smoke to UPP's EBB. That change is not backward-compatible to older versions. Both post_FV3.F90 and UPP must update at the same time.

Commit Message:

* UFSWM - update g2tmpl library, g2 library, UPP hash. Sync parm files with new UPP version.
  * FV3 - update inline post for UPP, point UPP submodule to head of develop, revise spack.yaml

Priority:

  • Normal

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

Changes

Regression Test Changes (Please commit test_changes.list):

  • PR Updates/Changes Baselines - any FV3 test that uses the inline post may have changed GRIB output.

Input data Changes:

  • None.

Library Changes/Upgrades:

  • Required
    • Library names w/versions: g2tmpl version 1.13.0, g2 version 3.5.1
    • Git Stack Issue - none; changes are already merged

This is already in Spack Stack, and ported to some platforms, but must be added to ufs-weather-model's Spack Stack directories.

Testing Log:

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

This was referenced Jun 13, 2024
Merged
Merged
@SamuelTrahanNOAA SamuelTrahanNOAA marked this pull request as ready for review June 17, 2024 20:18
@SamuelTrahanNOAA SamuelTrahanNOAA changed the title update UPP & add number concentration to gnv1_nested test sync with head of NOAA-EMC UPP develop Jun 20, 2024
@SamuelTrahanNOAA
Copy link
Collaborator Author

I'd like @WenMeng-NOAA to check the pull request description. Please provide any details I should add to the PR description.

@WenMeng-NOAA
Copy link
Contributor

I'd like @WenMeng-NOAA to check the pull request description. Please provide any details I should add to the PR description.

@SamuelTrahanNOAA You might add one item in PR description:
. Update the UPP control files for global, rrfs and hafs used in inline post in regression tests.

@SamuelTrahanNOAA
Copy link
Collaborator Author

I cannot test this with the GNU compilers until someone installs the GNU version of g2tmpl 1.12.0

@WenMeng-NOAA
Copy link
Contributor

@SamuelTrahanNOAA Running CRTM to generate simulated satellite products in ufs-weather-model RTs would be inefficient since CRTM requires more resources. Can you pick up the following control files for inline post from my directory /home/Wen.Meng/stmp2/xml/xml_to_txt on Hera:
postxconfig-NT-gfs.txt
postxconfig-NT-gfs_FH00.txt
postxconfig-NT-hafs.txt
postxconfig-NT-fv3lam.txt

There should be no simulated satellite variables included. So there is no need to load CRTM fix files at runtime.

@SamuelTrahanNOAA
Copy link
Collaborator Author

from my directory /home/Wen.Meng/stmp2/xml/xml_to_txt

I already copied those files, and the UPP still fails unless I have CRTM fix files. You've updated postxconfig-NT-fv3lam.txt since I copied it, so I'll update that one now.

@SamuelTrahanNOAA
Copy link
Collaborator Author

@WenMeng-NOAA - To be clear: When I use those files, the inline post still aborts unless the CRTM fix files are present.

@WenMeng-NOAA
Copy link
Contributor

from my directory /home/Wen.Meng/stmp2/xml/xml_to_txt

I already copied those files, and the UPP still fails unless I have CRTM fix files. You've updated postxconfig-NT-fv3lam.txt since I copied it, so I'll update that one now.

@SamuelTrahanNOAA That's right. The postxconfig-NT-fv3lam.txt was updated with removal of these simulated satellite fields. There should be no simulated satellite fields included in the inline post control files. Could you test again and let me know if you still see issues. Thanks!

@SamuelTrahanNOAA
Copy link
Collaborator Author

Delaying Acorn is worth it instead of delaying everything.

I concur with this. We should merge this PR as soon as possible.

@BrianCurtis-NOAA
Copy link
Collaborator

I'm starting Acorn testing, I will report on it's success/failure soon.

@Hang-Lei-NOAA
Copy link

Hang-Lei-NOAA commented Aug 22, 2024 via email

@SamuelTrahanNOAA
Copy link
Collaborator Author

Are the Jet tests running? I don't see any committed logs for Jet, other than my own.

@zach1221
Copy link
Collaborator

Are the Jet tests running? I don't see any committed logs for Jet, other than my own.

Jet is running.

@BrianCurtis-NOAA
Copy link
Collaborator

I'm working with Hang, but things will push into tomorrow. We'll try to get Acorn in!

@BrianCurtis-NOAA
Copy link
Collaborator

Acorn update:

  • Special thanks to @Hang-Lei-NOAA for getting a temporary g2/g2tmpl installed on Alex's spack stack.
  • Baseline generation was successful
  • Working on moving baselines to storage area, and then running the full suite.

@BrianCurtis-NOAA
Copy link
Collaborator

BrianCurtis-NOAA commented Aug 23, 2024 •
edited
Loading

@SamuelTrahanNOAA since IFI isn't normally tested, it doesn't pass baseline comparison, but I want to confirm with you that it just needs new baselines, I can get that done.

baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20240821/regional_ifi_control_intel
working dir  = /lfs/h2/emc/ptmp/brian.curtis/FV3_RT/rt_2126453/regional_ifi_control_intel
Checking test regional_ifi_control_intel results ....
 Comparing [dynf000.nc](http://dynf000.nc/) .....USING NCCMP......OK
 Comparing [dynf006.nc](http://dynf006.nc/) .....USING NCCMP......OK
 Comparing [phyf000.nc](http://phyf000.nc/) .....USING NCCMP......OK
 Comparing [phyf006.nc](http://phyf006.nc/) .....USING NCCMP......OK
 Comparing PRSLEV.GrbF00 .....USING CMP......NOT IDENTICAL
 Comparing PRSLEV.GrbF06 .....USING CMP......NOT IDENTICAL
 Comparing NATLEV.GrbF00 .....USING CMP......NOT IDENTICAL
 Comparing NATLEV.GrbF06 .....USING CMP......NOT IDENTICAL

@SamuelTrahanNOAA
Copy link
Collaborator Author

@BrianCurtis-NOAA - The tests with IFI should change because they contain all the other post fields. Any tests which run the post are expected to change. (Unless they happen to avoid all the variables whose metadata has changed.)

@BrianCurtis-NOAA
Copy link
Collaborator

Acorn worked! We'll have to make Hang's changes permanent once Alex comes back.

@zach1221
Copy link
Collaborator

Ok, I think we're ready to begin the merge process with the fv3atm sub-component PR.

@BrianCurtis-NOAA
Copy link
Collaborator

BrianCurtis-NOAA commented Aug 23, 2024 •
edited
Loading

Might want to look into why superlinter is failing after this PR is merged.

Well it did have the red X, but now it's good. so i don't know what's going on.

@zach1221
Copy link
Collaborator

@SamuelTrahanNOAA fv3atm PR #845 is merged. Please update hash and gitmodule url.
hash: NOAA-EMC/fv3atm@ee3378b

@SamuelTrahanNOAA
Copy link
Collaborator Author

I've updated the FV3 hash and reverted .gitmodules.

I think we're ready to go!

@zach1221 zach1221 merged commit fcc9f84 into ufs-community:develop Aug 23, 2024
3 checks passed
@WenMeng-NOAA
Copy link
Contributor

Thanks for all your efforts!

@DeniseWorthen DeniseWorthen mentioned this pull request Sep 6, 2024
Closed
DavidHuber-NOAA added a commit to DavidHuber-NOAA/ufs-weather-model that referenced this pull request Sep 9, 2024
@DavidHuber-NOAA
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
fb22998 
…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)
HelinWei-NOAA pushed a commit to HelinWei-NOAA/ufs-weather-model that referenced this pull request Sep 15, 2024
@SamuelTrahanNOAA
sync with head of NOAA-EMC UPP develop (ufs-community#2326)
27086fb 
* UFSWM - update g2tmpl library, g2 library, UPP hash. Sync parm files with new UPP version.
  * FV3 - update inline post for UPP, point UPP submodule to head of develop, revise spack.yaml
@NickSzapiro-NOAA NickSzapiro-NOAA mentioned this pull request Sep 23, 2024
Draft
29 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@InnocentSouopgui-NOAA InnocentSouopgui-NOAA InnocentSouopgui-NOAA left review comments

@FernandoAndrade-NOAA FernandoAndrade-NOAA FernandoAndrade-NOAA approved these changes

@jkbk2004 jkbk2004 Awaiting requested review from jkbk2004

@BrianCurtis-NOAA BrianCurtis-NOAA Awaiting requested review from BrianCurtis-NOAA

Assignees
No one assigned
Labels
Baseline Updates Current baselines will be updated. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.