Add WW3 daily-averaged wave fields needed for the NorESM merge - #683
Conversation
The NorESM WW3 cap exports 11 new Sw_*_avg fields and expects the mediator to output them in a daily-averaged auxiliary history file. This defines those fields in fd_cesm.yaml, and drops the stale ww3 histaux overrides that were still requesting the old instantaneous fields.
billsacks
left a comment
There was a problem hiding this comment.
@mvertens recently made some changes to the ww3 aux hist fields - see #677. It looks like this PR may need to be updated to merge cleanly with that one... but I also wonder if the changes from @mvertens make some of this unnecessary???
Once you reconcile this with @mvertens 's changes, I'm fine with this PR as long as @mvertens is good with it - so no need for further review from me.
|
@billsacks - I am wondering actually why none of the latest CMEPS changes that I brought in made it into this PR. But that said - those changes become irrelevant if the noresm defaults are picked up - which looking at this PR seems to be the case. We no longer need the noresm/cesm distinction - since only the noresm one is kept. |
|
@mvertens I started off of cmeps1.1.48 but then merged the latest main before submitting the PR, so I am not sure why your changes don't show up. Happy to revise it if you have a suggestion, but you are right that we are adopting NorESM defaults, so we probably no longer need noresm/cesm distinction (at least for the time being). |
|
@mvertens @billsacks I just realized I previously merged a stale main, so that's why @mvertens's latest changes didn't show up. I merged with the latest main this time, and will run a few tests to double check things. |
2b6ebe9 to
d6a22c7
Compare
|
@alperaltuntas - thanks for clarifying - this all makes sense. I'm happy to review again. |
|
Update: with the latest merge commit, all of my tests passed. So, this PR is ready again for review. |
|
Thanks, @alperaltuntas . I'm going to remove myself as a reviewer, deferring to you and @mvertens on this. It seems like you could potentially remove the coupling_mode selector from histaux_wav2med_file1_flds if those are back to being the same for cesm & noresm, but I'll let you and @mvertens make that decision. |
mvertens
left a comment
There was a problem hiding this comment.
@alperaltuntas - thanks. This looks correct to me now.
|
@billsacks This PR is now ready to be merged. Since I am not authorized, could you merge it? |
|
@alperaltuntas - @mvertens commented in #690 that this PR may conflict with that one. Before we merge this, can you look at the relevant parts of #690 to see how they might interfere, so we can figure out the best path forward with that? If this is critical to get in as soon as possible, though, we could merge this one now and then figure out a plan later. |
|
@billsacks I just pushed a commit that aligns this PR with #690. I confirmed with git merge-tree that there are no longer any conflicts between the two PRs in either merge order, and no duplicated entries in the merged result. I also reran the aux_ww3 suite and verified the history files are b4b against the previous run of this branch, so no answer changes. Given that several WW3-related PRs are waiting on this one, I'd appreciate it if we could merge it soonish. |
|
Awesome, thanks @alperaltuntas ! |
Description of changes
This PR is needed to sync WW3 forks of CESM and NorESM. The NorESM WW3 cap exports 11 new Sw_*_avg fields and expects the mediator to output them in a daily-averaged auxiliary history file. This defines those fields in fd_cesm.yaml, and drops the stale ww3 histaux overrides that were still requesting the old instantaneous fields.
Specific notes
This PR must be evaluated and merged in conjunction with:
No answer changes
The only user interface changes is the default value and description of histaux_wav2med_file1_doavg.
Testing performed
aux_ww3