-
Notifications
You must be signed in to change notification settings - Fork 388
fix Rayleigh drag logic on implicit vertical mix #676
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
fix Rayleigh drag logic on implicit vertical mix #676
Conversation
| dt, kineticEnergyCell, & | ||
| vertViscTopOfEdge, layerThickness, layerThicknessEdge, normalVelocity, & | ||
| ssh, bottomDepth, err) | ||
| else if (config_Rayleigh_damping_depth_variable) then |
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.
The actual bug was that this line should have been:
- else if (config_Rayleigh_damping_depth_variable) then
+ else if (config_Rayleigh_friction.or. &
+ config_Rayleigh_bottom_friction.or. &
+ config_Rayleigh_damping_depth_variable) then
but the logic is funny (nested if), so I changed the branching to be more direct.
|
@vanroekel and @xylar, with this fix the |
vanroekel
left a comment
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 by visual inspection and test run through pre_spinup1 with this PR.
|
@mark-petersen further testing of this in debug with gcc gives an error in the first timestep. Stack trace is below |
|
@vanroekel thanks for testing. What test case was that, and which part? EC60to30 prep_spinup1? |
|
@vanroekel I was not able to reproduce your error, either with gnu debug or intel debug, with EC60to30 prep_spinup1 or with QU240 run with Rayleigh drag turned on. Can you send me your run directory with that error? |
|
@mark-petersen Here is my directory I wonder if this is something in my environment or bad node. I've also been getting random OOM errors on grizzly in this test case as well. |
|
here are my modules loaded |
|
I'm running with this and #668 merged into @vanroekel, I think you would benefit with updating to SCORPIO/PIO2 Here is the full script I use to get myself set up on Grizzly: Note: the |
|
If you want to use Gnu, I don't know what the corresponding setup looks like. I haven't been using GNU on Grizzly in awhile. |
|
@mark-petersen, could you share the Gnu configuration you use? |
For intel, I use what Phil Wolfram set up just before he left:
Looking at my gnu libraries, they are embarrassingly old: Since the latest on grizzly and badger is gcc/9.3.0! On badger, we are just slightly better:
That last set looks like what Luke is using on Grizzly. I try to keep up the library configuration notes here: https://acme-climate.atlassian.net/wiki/spaces/ECG/pages/1054113803/MPAS+Testing+and+Machine-specific+Instructions#grizzly,-gnu |
|
It sounds like we need to see if things were broken on Gnu well before this current issue. That's unfortunate! |
|
Ha! I was able to reproduce the error Luke found, but only with |
xylar
left a comment
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.
|
Tested with nightly regression suite before/after this PR with gnu 6.4.0 on badger, both debug and optimized. All tests run and are bfb with ocean/develop. Therefore, I'm concluding that the error we see in EC60to30 spinup is unrelated to this particular PR. I just made an issue here: #685 |
…/develop fix Rayleigh drag logic on implicit vertical mix #676
Update MPAS-Source: fix Rayleigh damping and line continuation This PR brings in a new mpas-source submodule with changes only to the ocean core. The changes are for two bug fixes: * fix Rayleigh drag logic on implicit vertical mix, which only impacts standalone MPAS ocean spin-up simulations (MPAS-Dev/MPAS-Model/pull/676); and * fix bad continuation character in ocn init tidal boundary (MPAS-Dev/MPAS-Model/pull/675) [BFB]
Update MPAS-Source: fix Rayleigh damping and line continuation This PR brings in a new mpas-source submodule with changes only to the ocean core. The changes are for two bug fixes: * fix Rayleigh drag logic on implicit vertical mix, which only impacts standalone MPAS ocean spin-up simulations (MPAS-Dev/MPAS-Model/pull/676); and * fix bad continuation character in ocn init tidal boundary (MPAS-Dev/MPAS-Model/pull/675) [BFB]
…nto ocean/develop fix Rayleigh drag logic on implicit vertical mix MPAS-Dev#676 Fix if statement for Rayleigh drag introduced in MPAS-Dev#485. When Rayleigh drag was on, it turned off implicit vertical mixing. We only use Rayleigh drag for spin-up, so this does not change normal forward model runs or E3SM simulations.
Fix if statement for Rayleigh drag introduced in #485. When Rayleigh drag was on, it turned off implicit vertical mixing. We only use Rayleigh drag for spin-up, so this does not change normal forward model runs or E3SM simulations.