Merge MOM6/main from 03 May 2022 #216
Merged
Conversation
This file contains 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
update with NOAA-EMC fork
update my fork
Update ocn_stoch branch with dev/emc
update with EMC's fork
remove conflict with dev/emc
further resolve conflict
merge dev/emc into ocean stochastic branch
put id_sppt_wts, etc back.
Merge with EMC fork
* remove white space and fix comment * Update MOM_oda_incupd.F90 remove unused index bounds, and fix sum_h2 loop. Co-authored-by: pjpegion <Philip.Pegion@noaa.gov> Co-authored-by: Marshall Ward <marshall.ward@noaa.gov>
…20210914 merge GFDL main 20210914 commit (hash # c09e199)
…L-20210914 update to gfdl 20210914
…into ocn_stoch_july2021
Ocean stochastic physics
…L-20211019 update to MOM6 main branch 20211019 commit
…_energetic_PBL.F90, add two new files: src/parameterizations/stochastic/MOM_stochastics.F90 and config_src/external/stochastic_physics/stochastic_physics.F90
…n external/stochastic_physics directory
…n-20211220 update MOM6 to its main branch commit 20211220
…20220217 this is corresponding to MOM6 main branch 20220217 commit (hash # 6f6d4d6), which originally based on GFDL-candidate-20220129
…n-20220217 update to main branch 20220217 commit
…lization To allow the ODA incremental counts (ncount) in the restart file, the restart registry is unlocked and then locked back again after the initialization of the ODA in MOM_state_initialization.
Add calls to restart_registry_lock when setting up ODA at initialization
…0220317 this is corresponding to MOM6 main 20220317 commit (hash # 399a7db)
…n-20220317 update to MOM6 main branch 20220317 commit
- This update is an alternate to PR#66 to fix the issues with passing read arguments to subroutines receiving class(*) - This tries to show that there are no inherent issues with passing a real and receiving it as class(*). Rather the root cause of the issues is some of these arguments are optional and are being passed to FMS even thought they are not present! Then they are trapped in FMS diag_manager inside a SELECT TYPE statement and the compiler is not smart enough to know that they are absent and bombs.
…_class_bugfix An alternate fix to class(*) issues with FMS 2022-01
…20220411 FMS mixed mode
alperaltuntas
approved these changes
May 18, 2022
|
This needs to be squashed and merged, right @marshallward ? |
|
We don't want to squash this one, a regular (no-ff) merge should be fine. These hashes are in mom-ocean:main, so we want them in NCAR:dev/ncar and the other group branches (dev/gfdl, dev/emc, etc). It's not a pretty set of commits, but once they go into main, we should try to preserve them. Hopefully this is just due to the resync caused by the previous squash-commits. |
|
Thanks! Glad I asked. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 merges the main branch as of 03 May 2022. The changes introduced came from https://github.com/jiandewang/MOM6/tree/EMC-FMS-mixed-mode-20220411, and are summarized in
mom-ocean#1566.
@alperaltuntas already evaluated and approved mom-ocean#1566. I've run mom_aux against the latest dev/ncar and confirmed that answers do not change.