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

wave-ocean coupling #91

Merged

Conversation

JessicaMeixner-NOAA
Copy link
Collaborator

@JessicaMeixner-NOAA JessicaMeixner-NOAA commented May 11, 2020

This adds wave->ocean coupling, so that now the wave coupling is two-way with the atmosphere, two-way with the ocean and one way (ice concentration -> waves) with ice.

The wave model passes Stokes drift to the ocean model which is then used for sea-state dependent Langmuir mixing.

The wave regression test is updated to include wave coupling with both atm and ocean which requires a new baseline. All other baselines not using WW3 are the same as the old baseline though.

Related Issue:
#37

Related PRs:
WW3: NOAA-EMC/WW3#196
MOM6: NOAA-EMC/MOM6#23

outstanding issues:

DeniseWorthen and others added 30 commits November 20, 2019 12:22
merge develop/ufs-s2s-model
MOM_input template for initial condition files
Add debug compilation flag specification at top level (ufs-community#17)
@DeniseWorthen
Copy link
Collaborator

Have regression tests and baselines been made for the new wave grid (with the unblocked med)?

@JessicaMeixner-NOAA
Copy link
Collaborator Author

Have regression tests and baselines been made for the new wave grid (with the unblocked med)?

No they have not. Before that is done, should we also add the lake oro? @SMoorthi-emc sent me the location of oro data with lakes, but now I do not know if that means I need to re-generate the ICs for atm with this new oro data or not.

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented May 15, 2020 via email

@JessicaMeixner-NOAA
Copy link
Collaborator Author

@shansun6 the oro data I got from @SMoorthi-emc is originally from you, if I am running with this orodata and the non-fractional grid, will it be consistent as @junwang-noaa describes is needed to not re-run chgres?

I have a run started with the new orodata now and I'll go ahead and start making the new baselines with the new wave model grid and then with the new wave model grid and the new oro data so that we can proceed forward with either strategy asap to complete this PR.

@SMoorthi-emc
Copy link
Collaborator

SMoorthi-emc commented May 15, 2020 via email

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented May 15, 2020 via email

@DeniseWorthen
Copy link
Collaborator

Yes, that was my assumption; we can approve the PR but not merge until we have updated RTs.

@JessicaMeixner-NOAA
Copy link
Collaborator Author

@junwang-noaa yes, I will re-run regression tests after updating for oro data. I currently was only going to update the wave test, based on your comment about C96 oro data, do you want all C384 oro data updated?

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented May 15, 2020 via email

@JessicaMeixner-NOAA
Copy link
Collaborator Author

JessicaMeixner-NOAA commented May 18, 2020

Baselines with lake information in the oro_data for c384 and the new WW3 grid have been made. Regression test logs for Orion and Hera have been pushed to the branch. In the baseline area, a script and needed inputs were added in case anyone else needs to make a new mod_def file for WW3 after an update of WW3 which requires new mod_defs. The are /machine-specific-path-to-baseline/develop-20200515/WW3_input_data/createmoddefs/creategridfiles.sh

@DeniseWorthen and @junwang-noaa please let me know if there are any other updates that need to be made for this PR. A clean set of runs with and without waves are finishing on wcoss-phase2 soon. So it's this code+wcoss-phase2 porting updates.

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented May 18, 2020 via email

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented May 18, 2020 via email

@DeniseWorthen DeniseWorthen merged commit b116b71 into ufs-community:develop May 18, 2020
@DeniseWorthen
Copy link
Collaborator

Our previous tag was just v3.1, based on the naming convention for release tags. I can either stick with v4.0 or name it more descriptively. What do you think?

So just to be sure, we want a second branch in ufs-s2s-model for wcoss-phase2 porting? Don't changes need to be pushed to that branch (so I don't want to tag it right away?).

@JessicaMeixner-NOAA
Copy link
Collaborator Author

@DeniseWorthen It was my understanding for the tag, that it would be the version from the develop branch that can be run on orion/hera (since a tag for wcoss-phase2 would only be valid until Jun 1st). At least that was what I remember from last week.

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented May 18, 2020 via email

@DeniseWorthen
Copy link
Collaborator

So, so I will make a tag from the current develop called s2s_prototype4.0

I will make a second branch called wcoss-phase2-port and a tag from that also.

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented May 18, 2020 via email

@DeniseWorthen
Copy link
Collaborator

Will do.

DeniseWorthen added a commit to DeniseWorthen/ufs-s2s-model that referenced this pull request May 19, 2020
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.

5 participants