Main to dev gfdl#1497
Merged
Hallberg-NOAA merged 41 commits intoSep 15, 2021
Merged
Conversation
…ncar-2021-04-21 Merging the main candidate from GFDL 2021-03-26
…nthreads_nuopc Add isPresent and isSet when retrieving nthreads
These arrays were not being deallocated which was causing a memory leak problem.
De-allocate Kd_bkgnd and Kv_bkgnd
This commit fixes misplaced parentheses in the tridiagonal solvers used in subroutines tracer_vertdiff_Eulerian and tracer_vertdiff. This bug has been reported in https://github.com/NOAA-GFDL/MOM6/issues/1415 This commit also changes the mask condition used in these subroutines.
This commit adds a new module (MOM_CFC_cap) that can used to simulate chlorofluorocarbons (CFCs) tracers. It also includes the modifications needed to 1) allocate arrays in the fluxes and surface types, and 2) activate the MOM_CFC_cap module via NUOPC cap.
…mentation * Implements a module to simulate CFCs via NUOPC cap
Fix NUOPC import of fields required for the new CFC module
The export of ice fraction was previously added for the newly added CFC module.
In a previous commit, the expression tr(i,j,1) = (b1(i)*h_tr)*tr(i,j,1) + sfc_src(i,j) was change to tr(i,j,1) = b1(i)*(h_tr*tr(i,j,1) + sfc_src(i,j)) in 4 lines. This changed the order in which b1(i)*h_tr*tr(i,j,1) is evaluated, even if sfc_src(i,j) is 0.0. Because the CESM configurations use the passive tracer tridiagonal solver for T and S, the modification above changed answers in these configurations. To recover previous answers the expression must be tr(i,j,1) = (b1(i)*h_tr)*tr(i,j,1) + b1(i)*sfc_src(i,j)
Merge main from GFDL (210723)
…change_in_CFC_PR * Recover answer change from CFC PR
…solving conflicts
…uted and applied: (1) When available, pass the enhancement factor received from WW3. Otherwise, let CVmix compute the enhancement factor. (2) Instead of explicitly multiplying diffusivities and viscosities with the enhancement factor, let CVMix handle enhancement internally.
correct scale argument in get_param and chksum calls add dimension scaling terms to some expressions add some chksum calls
remove unused and unneeded local variables correct unit-related comments rework CFC_cap_fluxes to better align with Orr et al., GMD, 2017
…tionality of prescribed constant enhancement.
Introduce the legacy CESM WW3 coupling option (VR12-MA)
…fixes dimension rescaling fixes and CFC cleanup
…passage of lamult enhancement factor
Pr1491 fixes
…candidate-2021-08-30 Dev ncar main candidate 2021 08 31
Hallberg-NOAA
approved these changes
Sep 15, 2021
Collaborator
Hallberg-NOAA
left a comment
Hallberg-NOAA
left a comment
There was a problem hiding this comment.
These changes have been thoroughly vetted before they were migrated from dev/ncar to main.
There is an change in one of the TC regressions with this case due to the correction of an understood bug. Also, this PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/13588. However, there are some new runtime parameters, so there will have to be a follow-up PR updating MOM6-examples.
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
5 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.
No description provided.