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

Make ww3_grid into a callable subroutine #362

Merged
merged 3 commits into from
May 26, 2021

Conversation

sbrus89
Copy link
Collaborator

@sbrus89 sbrus89 commented Apr 22, 2021

Pull Request Summary

The idea behind this PR is to make ww3_grid functionality callable from a coupled model initialization subroutine

Description

The ww3_grid.ftn has been renamed w3gridmd.ftn. Then the W3GRID PROGRAM section has been converted to a W3GRIDMD MODULE. All local variables of the previous W3GRID program become module variables in the new W3GRIDMD module. The code from the W3GRID program is contained in a new SUBROUTNE called W3GRID. A new file is then created called w3_grid.ftn with a PROGRAM called WW3GRID which uses W3GRIDMD and calls W3GRID.

Issue(s) addressed

Addresses #348

@sbrus89
Copy link
Collaborator Author

sbrus89 commented Apr 22, 2021

The files changed tab is a little messy because of the file name change in the first commit. A clearer comparison of the changes is here: https://github.com/sbrus89/WW3/compare/61354541546ee33bce3bc231fcfc541eba6e82b8..23ae3f542bca3198ac686b233f5643d31f8ec301
This is the diff after the ww3_grid.ftn -> w3gridmd.ftn rename

@aliabdolali
Copy link
Contributor

@sbrus89 Hi, did you have a chance to review my PR to this feature branch?

@aliabdolali
Copy link
Contributor

@JessicaMeixner-NOAA ok, that makes sense, please review it and I'll check the regtests today.

@aliabdolali
Copy link
Contributor

The matrix ran fine on NOAA HPC
See the summary of matrix.comp with expected non-b4b cases.
MatrixCOMP_GRID.zip

and I reviewed the development. It looks fine to me.

@sbrus89
Copy link
Collaborator Author

sbrus89 commented May 6, 2021

Thanks for running the regtests, @aliabdolali. Glad there weren't any issues.

Copy link
Collaborator

@JessicaMeixner-NOAA JessicaMeixner-NOAA left a comment

Choose a reason for hiding this comment

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

Thanks for adding the updates to w3_new @sbrus89

I see no issues with this PR. My approval is based on the assumption that before this PR goes in (I believe we have a few ahead in the queue if we go in order), that a diff between ww3_grid in the develop branch to w3gridmd in this branch is done to make sure that any updates to ww3_grid are captured in the new subroutine and not lost.

@sbrus89
Copy link
Collaborator Author

sbrus89 commented May 13, 2021

@JessicaMeixner-NOAA, I agree. Absolutely we should check the diffs before this goes in to make sure all the updates are there. I will rebase and fix conflicts if necessary.

@aliabdolali
Copy link
Contributor

Hi @JessicaMeixner-NOAA @sbrus89
I have reviewed and checked the regtests successfully on our HPC with known non-b4b identical cases.
DIFF_SBRUS.zip

@aliabdolali
Copy link
Contributor

@sbrus89 Please merge noaa/develop to your PR, so I can merge it afterwards.
When I was checking regtests with your PR, I merged NOAA/develop and there was a conflict in w3_new. Please solve that conflict (1 files is added from your PR to w3_new and one other in NOAA/Develop, so you just need to keep both). Please let me know once you did it and we are good to go with accpting your PR.

@sbrus89
Copy link
Collaborator Author

sbrus89 commented May 26, 2021

@aliabdolali, I'll do that right now. Would you like me to squash the commits as well?

@sbrus89
Copy link
Collaborator Author

sbrus89 commented May 26, 2021

@aliabdolali - Also, I believe I saw the conflict you mentioned in make_makefile.sh and not in w3_new. Was that the case for you as well?

@aliabdolali
Copy link
Contributor

@aliabdolali - Also, I believe I saw the conflict you mentioned in make_makefile.sh and not in w3_new. Was that the case for you as well?

Yes, I mean make_makefile.sh.

@sbrus89 sbrus89 force-pushed the ww3_grid_mod_PR branch from 23ae3f5 to 6899a09 Compare May 26, 2021 16:42
@sbrus89
Copy link
Collaborator Author

sbrus89 commented May 26, 2021

I just pushed the rebase, let me know if you'd like my changes squashed to a single commit.

@JessicaMeixner-NOAA
Copy link
Collaborator

@sbrus89 we will squash them into one when it's merged to the develop branch, so it's not necessary for you to do it on your end. Do you have a preferred commit message for when we squash and merge?

@sbrus89
Copy link
Collaborator Author

sbrus89 commented May 26, 2021

@sbrus89 we will squash them into one when it's merged to the develop branch, so it's not necessary for you to do it on your end. Do you have a preferred commit message for when we squash and merge?

Sounds good @JessicaMeixner-NOAA. For a commit message, maybe something like: "Modularize ww3_grid functionality"? I don't have a strong preference though, so feel free to modify.

@aliabdolali aliabdolali merged commit 6efe9bb into NOAA-EMC:develop May 26, 2021
@sbrus89
Copy link
Collaborator Author

sbrus89 commented May 26, 2021

Thanks very much for your help with this, @aliabdolali and @JessicaMeixner-NOAA. Issue #348 can be closed now as well.

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.

3 participants