update mom6 20260302#173
Merged
jiandewang merged 6 commits intoMar 10, 2026
Merged
Conversation
This patch updates the CVMix submodule to a more recent version that is licensed under the Apache 2.0 license. There are no code changes to CVMix relative to the current version.
This PR re-licenses the MOM6 source code from the Lesser GNU Public License, version 3 to Apache License, Version 2.0. This is done with the consent of all contributors to the source code. All source files are now tagged with the following disclaimer. ``` This file is part of MOM6, the Modular Ocean Model version 6. See the LICENSE file for licensing information. SPDX-License-Identifier: Apache-2.0 ``` All relevent source code, scripts, and macros are now explicitly identified as part of MOM6. Configuration files containing scripts, such as GitHub Actions, have also been tagged. Any other configurations, such as model inputs, have been excluded.
In mom_cap.F90 rename module variable 'mype' to 'localPet' Rename mom_ufs_trace_wrapper module to mom_cap_profiling Add docstrings
* indenting for mom_inline_mod and mom_cap_outputlog.F90 made consistent w/ MOM6 style * several docstrings added or moved; spurious whitespace and comments removed * two word end if and end do changed to one word
…0260128 dev/emc candidate 20260128
Relicense code to Apache License, Version 2.0
Collaborator
Author
|
@DeniseWorthen and @DusanJovic-NOAA: the huge amount of code changes in the PR are from Apache license PR, all of the modifications are in comment lines. |
DusanJovic-NOAA
approved these changes
Mar 3, 2026
DusanJovic-NOAA
left a comment
DusanJovic-NOAA
left a comment
There was a problem hiding this comment.
I'm not familiar with majority of the changes in this PR, but the ufs tracing changes look good.
32 tasks
|
Could we get a review on this PR so that we can process ufs-community/ufs-weather-model#3116 next (hopefully)? |
DeniseWorthen
approved these changes
Mar 5, 2026
Collaborator
DeniseWorthen
left a comment
DeniseWorthen
left a comment
There was a problem hiding this comment.
All the changes in the cap are from our side
|
Testing on #3123 is complete, please continue with merging, thank you. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
MOM6 main repository is updated on 20260302. This updating includes
(1) Denise and Dusan's code modification to address NCAR's comments (mom-ocean#1687)
(2) GFDL's MOM6 code Apache license PR (mom-ocean#1688)
no B/L change is expected.
note the original nuopc_cap/mom_ufs_trace_wrapper.F90 has been renamed to nuopc_cap/mom_cap_profiling.F90