Make ww3_grid into a callable subroutine#362
Conversation
|
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 |
|
@sbrus89 Hi, did you have a chance to review my PR to this feature branch? |
|
@JessicaMeixner-NOAA ok, that makes sense, please review it and I'll check the regtests today. |
|
The matrix ran fine on NOAA HPC and I reviewed the development. It looks fine to me. |
|
Thanks for running the regtests, @aliabdolali. Glad there weren't any issues. |
JessicaMeixner-NOAA
left a comment
There was a problem hiding this comment.
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.
|
@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. |
|
Hi @JessicaMeixner-NOAA @sbrus89 |
|
@sbrus89 Please merge noaa/develop to your PR, so I can merge it afterwards. |
|
@aliabdolali, I'll do that right now. Would you like me to squash the commits as well? |
|
@aliabdolali - Also, I believe I saw the conflict you mentioned in |
Yes, I mean make_makefile.sh. |
|
I just pushed the rebase, let me know if you'd like my changes squashed to a single commit. |
|
@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. |
|
Thanks very much for your help with this, @aliabdolali and @JessicaMeixner-NOAA. Issue #348 can be closed now as well. |
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.ftnhas been renamedw3gridmd.ftn. Then the W3GRIDPROGRAMsection has been converted to a W3GRIDMDMODULE. 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 newSUBROUTNEcalled W3GRID. A new file is then created calledw3_grid.ftnwith a PROGRAM called WW3GRID which uses W3GRIDMD and calls W3GRID.Issue(s) addressed
Addresses #348