-
Notifications
You must be signed in to change notification settings - Fork 371
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
Add ocean option for Redi kappa to be set equal to GM (AMOC PR 3/6) #4904
Conversation
826ff40
to
c1ea7b9
Compare
888ea12
to
0996cfa
Compare
c1ea7b9
to
7f609b2
Compare
code looks fine here, just needs the transplant of the little bit of equalGM code from the 2/6 PR. |
5 year This PR: config_GM_closure = 'Visbeck' |
7f609b2
to
d2b96ca
Compare
Rebased after #4864 changes so this merges smoothly, plus addition of extra line mentioned by @vanroekel above. Passes nightly regression suite with gnu on badger with
and passes
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved based on my 5 year tests.
d2b96ca
to
8c2fafc
Compare
7bc8a33
to
24859cf
Compare
8c2fafc
to
142ee46
Compare
This should be ready to go, after @vanroekel's approval, right? |
Yes. @vanroekel please review. I tested with gnu debug on badger with nightly test suite, passes all with default flags; then again with
and it passes all tests. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so one thing @milenaveneziani noted that should be made clearer I think is this capability as implemented doesn't work for all schemes. I think only Visbeck and constant will work. E&G won't as it uses a 3-D varying array so RediKappa can't copy that. Putting comments in the registry would be sufficient for now
description="Control what type of function is used for Redi $\kappa$." | ||
possible_values="'constant', 'data'" | ||
description="Control what type of function is used for Redi $\kappa$. For 'equalGM', RediKappa is set to gmBolusKappa, so picks up the closure used by GM." | ||
possible_values="'constant', 'equalGM', 'data'" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would it be good to say this only works for 2-d schemes (e.g. constant or visbeck)? This won't work for edenGreatbatch
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I added that comment above.
Good point @vanroekel. I had forgotten about that. I agree that a comment in the Registry would be great at this point. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me. Thanks for the extra comment @mark-petersen
Passes:
|
test merge passes:
This PR should be good to go once the repo is open |
…4904) Add ocean option for Redi kappa to be set equal to GM Brings in a new option to config_Redi_closure, 'equalGM', that sets RediKappa equal to gmBolusKappa everywhere. Default remains config_Redi_closure = 'constant'. [BFB]
merged to next |
merged to master |
add new option: config_Redi_closure = 'equalGM', sets RediKappa equal to gmBolusKappa everywhere. Default remains config_Redi_closure = 'constant'.
[BFB]