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

Modifications for ufs-coastal app; update MOM6 to its main repo. 20250113 commit (original 20241127-PR) (was #2556) #2396

Merged
merged 62 commits into from
Jan 21, 2025

Conversation

DeniseWorthen
Copy link
Collaborator

@DeniseWorthen DeniseWorthen commented Aug 12, 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:

Updates WW3 for modifications and fixes required by UFS-Coastal App
Updates MOM6 for main repo

Commit Message:

* UFSWM - adds additional compile switch and namelist changes required for WW3 in Coastal App
  * WW3 - add export fields required for coupling with SCHISM
  * MOM6 - update to main repo. 20250113 commit (origianlly 20241127-PR)

Priority:

  • Normal (but PR has been held since late summer due to PR pause in WW3 repo)

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Changes

Regression Test Changes (Please commit test_changes.list):

  • PR Updates/Changes Baselines.

None

Input data Changes:

  • None.

Library Changes/Upgrades:

  • Required
    • Library names w/versions:
    • Git Stack Issue (JCSDA/spack-stack#)
  • No Updates

Testing Log:

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

DeniseWorthen and others added 2 commits August 8, 2024 18:45
* the wave restarts are not b4b against the develop baseline
but are b4b when compared against a baseline generated with the
trho fix

rt_atmwav_control_noaero_p8_intel.log: Comparing ufs.atmw.ww3.r.2021-03-22-64800 .....USING CMP......NOT IDENTICAL
rt_hafs_regional_atm_wav_intel.log: Comparing ufs.hafs.ww3.r.2019-08-29-21600 .....USING CMP......NOT IDENTICAL
@DeniseWorthen DeniseWorthen changed the title modifications for ufs-coastal app Modifications for ufs-coastal app Aug 12, 2024
@DeniseWorthen DeniseWorthen marked this pull request as ready for review August 12, 2024 23:08
@uturuncoglu
Copy link
Collaborator

@DeniseWorthen Do you think that we need to find more meaningful aliases for the new fields defined in the dictionary. We could try to come up a set of standard names for them but not sure. Let me know what you think?

@DeniseWorthen
Copy link
Collaborator Author

@uturuncoglu I'm not sure how useful the aliases are if we have the description. So, for example we could make an alias for Sw_ubry but it would basically be the description, something like alias: near_bottom_rms_wave_velocities_y? Do you know if SCHISM for example would prefer to import a field using a descriptive alias?

I do see now I should have probably named some of the new fields with "Fw" (as fluxes) and not "Sw" as states.

@uturuncoglu
Copy link
Collaborator

@DeniseWorthen Yes, SCHSIM follows convention like that. See following part, https://github.com/oceanmodeling/schism-esmf/blob/12e2ce43475fe85212c60de7894524d22a1bab96/src/schism/schism_nuopc_cap.F90#L414. It is not big deal and I am using short names at this point for the implementation but we might consider to add aliases and use them in the SCHSIM side. anyway, I'll let you know when PR is ready in ufs coastal side. So, you could check it.

@DeniseWorthen
Copy link
Collaborator Author

I see, thanks. We definitely might need aliases then.

@uturuncoglu
Copy link
Collaborator

@DeniseWorthen @JessicaMeixner-NOAA @janahaddad We had a meeting with costal team today. Here is our proposal,

  • Let's keep this PR and also WW3 one active for now. So, it might be merged with the UFS WM around November time frame (waiting in freeze mode 2-3 months) once WW3 team have more resource. We have no rush at this point and we could still test the implementation in our end without any issue.

  • In the mean time, I'll create a new branch in our UFS WM fork to bring all these changes. This will allow us to have further test in vortex coupling with a new configuration (we are working on it in Coastal side) and also create new RT to test it regularly. It will also help us to find issues in the coupling if we have and then we could fine tune the PR in here if it is required.

  • Then, once top level UFS WM PR is merged, we could sync UFS Costal fork to get all the changes.

Anyway, let me know what do you think about this plan. We are open any other suggestion at this point.

@DeniseWorthen
Copy link
Collaborator Author

@uturuncoglu I do think it is a good idea for Coastal to test the changes in the WW3 cap as much as possible while we wait for the stoppage of PRs in WW3 to lift. Also keep in mind that once the stoppage lifts, PRs to dev/ufs-weather-model will most likely be further delayed as community development (going to the develop branch) will also need to proceed.

Also, I wanted to make Coastal aware of Issue NOAA-EMC/WW3#1298 in case you haven't seen it.

@uturuncoglu
Copy link
Collaborator

@DeniseWorthen That is great. BTW, Thanks for pointing the PIO PR.

@jkbk2004 jkbk2004 added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Jan 18, 2025
@jkbk2004 jkbk2004 added the jenkins-ort run ORT testing label Jan 21, 2025
@jiandewang
Copy link
Collaborator

@DeniseWorthen can you modify the PR tilte and add "update MOM6 to its main repo. 20250113 commit (20241127-PR)" ?

@DeniseWorthen DeniseWorthen changed the title Modifications for ufs-coastal app Modifications for ufs-coastal app; update MOM6 to its main repo. 20250113 commit (original 20241127-PR) (was #2556) Jan 21, 2025
@DeniseWorthen
Copy link
Collaborator Author

@jiandewang I also added a commit message line for MOM6

@jiandewang
Copy link
Collaborator

@DeniseWorthen Thanks

@jkbk2004
Copy link
Collaborator

@BrianCurtis-NOAA do you want to go for merging this pr if we skip Acorn ?

@jkbk2004
Copy link
Collaborator

We can start merging process.

@jiandewang
Copy link
Collaborator

kust merged MOM6 with hash # 6fff095

Copy link
Collaborator

@dpsarmie dpsarmie left a comment

Choose a reason for hiding this comment

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

Logs on Hercules weren't found for hrrr_control_2threads_gnu but test did pass. (More of an FYI / record keeping in case this keeps happening)

@jkbk2004
Copy link
Collaborator

Rocoto/Hercules is not that robust: a few cases are randomly dropped. But if jobs are resubmitted, all is ok.

@jkbk2004 jkbk2004 merged commit 33cde4b into ufs-community:develop Jan 21, 2025
5 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jenkins-ort run ORT testing 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.

9 participants