Merge main 260408#417
Merged
Merged
Conversation
update MOM6 to its main repo. 20250818 updating (default parameter changes)
Move computation of tmp_h inside the if G%mask2dT test to avoid divide by zero error
…a given hourly output frequency Author: Denise Worthen This feature is required for UFS operational configurations and is used to determine when MOM6 output (diagnostics and restart) have been completed. The log files created by this feature can be queried by the Global Workflow to either trigger downstream jobs or to ensure that if a run fails and a restart is required, model output is available consistent with a given restart file.
…e forcing. * Adds the ability to read a CDEPS configuration file to provide in-line forcing. Currently this is set up to read a non-climatological lrunoff data stream only.
* adds calls to ufs tracing routines that will create a trace file which can then be visualized, which is found to be useful in identifying various performance issues.
update MOM6 to its main repo. 20260112 updating
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
gustavo-marques
approved these changes
Apr 9, 2026
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
7 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.
This PR brings in the latest changes from main and resolves a minor conflict in NOUPC cap.
No answer changes.