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

Integrate WMMA #724

Merged
merged 26 commits into from
Jan 30, 2024
Merged

Integrate WMMA #724

merged 26 commits into from
Jan 30, 2024

Conversation

adarmenov
Copy link
Contributor

Integrate WMMA changes into main.

adarmenov added 19 commits October 5, 2020 09:25
@adarmenov
add NOAA's Wavewatch model
5c190be
@adarmenov
change the GMAO_Shared develop flavor to WMMA
402f61f
@adarmenov
change the GEOSgcm_GridComp develop flavor to WMMA
df567f7
@adarmenov
Merge remote-tracking branch 'origin/main' into feature/adarmenov/#208-…
b8c0f49 
…wmma
@adarmenov
Update the WW3 and UMWM entries
4190a49 
   - Update the WW3 remote
   - Add UMWM
@adarmenov
Update WW3 to geos/6.07.1
ba480e7
@adarmenov
Merge branch 'main' into feature/adarmenov/#208-wmma
50deada
@adarmenov
Move to geos/develop for WW3
a46088c
@adarmenov
Merge branch 'main' into feature/adarmenov/#208-wmma
12926ff
@adarmenov
Update MAPL to v2.18.1 to address connectivity issue
ff21589
@adarmenov
Update GEOSgcm_GridComp(develop) and ww3(develop)
dedd83b 
Edits that pertain to WGCM/WMMA
- update GEOSgcm_GridComp(develop) to feature/adarmenov/#347-wmma-ww3-mapl-iterface
- update ww3(develop) to feature/adarmenov/#1-mapl-iterface
@adarmenov
Update MAPL to v2.19.0
c248f59
@adarmenov
Update MAPL to v2.19.1
cc9f9c0
@adarmenov
Update MAPL to v2.19.2
4606bba
@adarmenov
Update GEOSgcm_GridComp to feature/adarmenov/#347-wmma
d9de11e
@adarmenov
Update WW3 to geos/develop
7e546bf
@adarmenov
Update GEOSgcm_App to feature/adarmenov/#318-wmma
38a2cd0
@adarmenov
Merge tag 'tags/v11.4.0' into feature/adarmenov/#208-wmma
8301754 
Resolved conflicts in:
  components.yaml
@adarmenov
Update WW3 to v6.07.1-geos-r1 and UMWM to v2.0.0-geos-r1
70185a6
@adarmenov adarmenov added enhancement New feature or request Contingent - DNA These changes are contingent on other PRs 0 diff structural Structural changes to repository that are zero-diff labels Dec 20, 2023
@adarmenov adarmenov self-assigned this Dec 20, 2023
@adarmenov adarmenov requested a review from a team as a code owner December 20, 2023 19:57
@adarmenov
Copy link
Contributor Author

@sdrabenh - I've created PRs in GMAO_Shared, GEOSgcm_GridComp, GEOS_OceanGridComp and GEOSgcm_App. The WMMA (WAVEWATCH, UMWM, sea spray) changes in these fixtures are in branches named 'feature/adarmenov/integrate-wmma'.

@adarmenov
Copy link
Contributor Author

adarmenov commented Dec 20, 2023 •
edited by sdrabenh
Loading

The PRs are:

@mathomp4
Copy link
Member

mathomp4 commented Jan 4, 2024

The first GNU CI failure is due to using an Intel compiler flag with GNU. I'm going to try and fix this up.

I might also propose some changes to some of the CMake. What's there works, but it's not quite the style we currently use in GEOS CMake.

I assume @sanAkel is looking at the coupled run failure.

mathomp4
mathomp4 reviewed Jan 4, 2024
View reviewed changes
components.yaml Outdated Show resolved Hide resolved
@adarmenov
Copy link
Contributor Author

...
I assume @sanAkel is looking at the coupled run failure.

The reason for the coupled run failure is that only datasea has the 'DW' export. If ocean depth is not an export that would be required in the foreseeable future by GCs other than WGCM, then IMO it will be easier if this variable is handled by WGCM. Thoughts @sanAkel?

This was referenced Jan 5, 2024
Closed
Merged
@mathomp4
Copy link
Member

mathomp4 commented Jan 5, 2024 •
edited
Loading

Okay. I have two new PRs in GEOSgcm_GridComp and WW3:

with the changes I needed for GNU builds. I'll try and retrigger the CI here to see if it gets further.

In my testing, these are zero-diff for an AMIP Intel run where waves aren't used.

@mathomp4
Copy link
Member

mathomp4 commented Jan 5, 2024

I'll try and retrigger the CI here to see if it gets further.

Sigh. I'm an idiot. The CI won't work until these are in the anton branches. Friday brain.

This was referenced Jan 5, 2024
Closed
Merged
@sdrabenh sdrabenh removed the Contingent - DNA These changes are contingent on other PRs label Jan 30, 2024
@sdrabenh sdrabenh merged commit 24debb1 into main Jan 30, 2024
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mathomp4 mathomp4 mathomp4 left review comments

@sdrabenh sdrabenh sdrabenh approved these changes

Assignees

@adarmenov adarmenov

Labels
0 diff structural Structural changes to repository that are zero-diff enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adarmenov @mathomp4 @sdrabenh