Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update mpas-source: GM/Redi and surface buoyancy fixes #3825

Merged
merged 2 commits into from
Sep 15, 2020
Merged

Update mpas-source: GM/Redi and surface buoyancy fixes #3825

merged 2 commits into from
Sep 15, 2020

Conversation

mark-petersen
Copy link
Contributor

Three changes to improve ocean heat uptake:

[non-BFB]
[NML]

@mark-petersen
Copy link
Contributor Author

This has one new flag, config_cvmix_use_kpp_buoyancyForcing_fix. @vanroekel I think that should be default true. The false setting is just for backwards compatibility - do you agree?

Testing now...

@mark-petersen
Copy link
Contributor Author

passes

SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-haswell_intel
SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-haswell_gnu
SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_gnu
PET_Ln9.T62_oEC60to30v3wLI.GMPAS-DIB-IAF-ISMF.cori-knl_gnu
PEM_Ld5_P512.T62_oEC60to30v3wLI.GMPAS-DIB-IAF-ISMF.cori-knl_intel
PET_Ln9_P1024.ne30_oECv3_ICG.A_WCYCL1850S.cori-haswell_intel

@vanroekel
Copy link
Contributor

@mark-petersen yes I think true by default for that parameter

@mark-petersen
Copy link
Contributor Author

rebased just now on today's master. I merged the three MPAS PRs, so this PR is in final form except for the namelist script for that one flag.

jonbob
jonbob approved these changes Sep 11, 2020
View reviewed changes
Copy link
Contributor

@jonbob jonbob left a 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 sanity testing

vanroekel
vanroekel approved these changes Sep 12, 2020
View reviewed changes
Copy link
Contributor

@vanroekel vanroekel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested in B and G-cases. Results look good.

jonbob added a commit that referenced this pull request Sep 14, 2020
@jonbob
Merge branch 'mark-petersen/update_mpas_200910' into next (PR #3825)
a3040ae 
This PR brings in a new mpas-source submodule with changes only to the
ocean core, plus scripts updates corresponding to Registry changes in
the ocean. It includes three changes to improve ocean heat uptake:
* Fixes limiting on redi k33 (MPAS-Dev/MPAS-Model/pull/684);
* Fixes surface buoyancy forcing calculation
  (MPAS-Dev/MPAS-Model/pull/690); and
* Revert GM buoyancy gradient calculation to v1 form
  (MPAS-Dev/MPAS-Model/pull/687).

[NML]
[non-BFB]
@jonbob
Copy link
Contributor

jonbob commented Sep 14, 2020

merged to next

@jonbob jonbob merged commit 3daf2b4 into master Sep 15, 2020
@jonbob
Copy link
Contributor

jonbob commented Sep 15, 2020

merged to master and expected DIFFs blessed

@jonbob jonbob deleted the mark-petersen/update_mpas_200910 branch September 15, 2020 15:47
@rljacob rljacob added the non-BFB PR makes roundoff changes to answers. label Oct 14, 2020
@jonbob jonbob mentioned this pull request Nov 24, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vanroekel vanroekel vanroekel approved these changes

@jonbob jonbob jonbob approved these changes

Assignees

@jonbob jonbob

Labels
mpas-ocean non-BFB PR makes roundoff changes to answers.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mark-petersen @vanroekel @jonbob @rljacob