-
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
Enables and modifies the submesoscale eddy parameterization #5172
Enables and modifies the submesoscale eddy parameterization #5172
Conversation
results are shown in #5099 also there is 800 years of simulation analysis here |
This is the metric that shows the major change due to turning on the mesoscale eddy parameterization: |
Adding reviewers from the AMOC working group, who were involved in these changes. The code is already in. Here we simply turn it on. Your approval here really says that you agree with setting |
lines.append(' <var name="normalMLEvelocity"/>') | ||
lines.append(' <var name="vertMLEVelocityTop"/>') |
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.
lines.append(' <var name="normalMLEvelocity"/>') | |
lines.append(' <var name="vertMLEVelocityTop"/>') | |
lines.append(' <var name="normalMLEvelocity"/>') | |
lines.append(' <var name="vertMLEVelocityTop"/>') |
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.
Thanks for adding theses! They are needed for the offline MOC and are likely to be useful for debugging.
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.
We need to add them to standalone as well. We want to maintain consistency:
https://github.com/E3SM-Project/E3SM/blob/master/components/mpas-ocean/src/analysis_members/Registry_time_series_stats_monthly_mean.xml#L135-L136
It seems like we probably want to enable config_submesoscale_enable = .true.
in many compass tests, too, following this PR.
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.
Done!
@vanroekel - testing of this PR fails due to the addition of vertMLEVelocityTop to the streams file. Apparently that array is not defined anywhere in the mpas-o source? |
@jonbob -- sorry about that -- this variable should be |
@vanroekel - I can take care of that, if you're jammed up. I just removed the bad arrays from the streams for testing, so it's not holding anything up |
components/mpas-ocean/src/analysis_members/Registry_time_series_stats_monthly_mean.xml
Outdated
Show resolved
Hide resolved
@vanroekel - do you want to change config_submesoscale_Ce to 0.08 in this PR, to match the value of the long run you did? |
yes definitely. thanks for catching that @jonbob it should be changed now |
The computation is for the gradient of density but the array was called gradBuoyEddy. This commit switches it to gradDensityEddy for clarity
Coordinated with Luke: rebased on master after #5171 merge. Compiled with gnu and intel, tested with nightly stand-alone suite with gnu debug and |
b1f85d7
to
ddd41fd
Compare
@mark-petersen - I had already started merging this to next for testing |
@xylar, @lconlon, @katsmith133 - can you please review (or finish your review)? |
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.
Looks good to me based upon visual inspection
@vanroekel - can you check and make sure I changed the streams output field to the one you intended? |
Tested this PR on Chrysalis with
and it died on run start-up with the problem in #5204. I'll see if I can figure that out tomorrow. |
@mark-petersen -- acme-small is a queue on anvil, not chrysalis. You also need to add " --project e3sm" on chrysalis. For me, a test merge passes SMS_D_Ld3.T62_oQU120.CMPASO-IAF.chrysalis_intel. I just started SMS_D.T62_oQU120_ais20.MPAS_LISIO_TEST.chrysalis_gnu and it just successfully completed as well. |
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 code inspection and @vanroekel's and @jonbob's testing.
@jonbob streams changes look good to me. Thanks! |
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 testing above.
Thanks all. This is a big accomplishment. There were sufficient reviewers, so I'm removing LeAnn and Alice, who are out. |
…on' into next (PR #5172) Enables and modifies the submesoscale eddy parameterization This enables the Fox-Kemper et al 2011 submesoscale eddy parameterization as the default for all configurations. It also fixes a unit error in the submesoscale eddy code that did not influence the long control run, but was introduced in the first PR (#5099). The variable gradBuoyEddy was not the buoyancy but the density gradient. Here the name is changed to gradDensityEddy for clarity. [NML] [CC]
test merge passes:
with expected NML and regular DIFFs merged to next |
merged to master and expected DIFFs and NML DIFFs blessed, except: SMS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.chrysalis_intel.allactive-wcprodrrm which did not complete but was running fine |
This enables the Fox-Kemper et al 2011 submesoscale eddy parameterization as the default for all configurations.
It also fixes a unit error in the submesoscale eddy code that did not influence the long control run, but was introduced in the first PR (#5099). The variable gradBuoyEddy was not the buoyancy but the density gradient. Here the name is changed to gradDensityEddy for clarity.
[NML]
[CC]