Updates ocn_comp_mct following upper level changes #703
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
The type forcing has been splitted into forcing and mech_forcing (see MOM_forcing_type.F90). This PR modifies ocn_comp_mct.F90 following this change.
Merge dev/master candidate (2017-11-19)
See following PR: NOAA-GFDL#664 Some of the code in ocn_comp_mct was copied from MOM_surface_forcing. Therefore this bug also affects dev/ncar. Since dev/ncar does not use MOM_surface_forcing, this fix should also be applied in ocn_comp_mct.
Adds bug fix in net_FW reported by travissluka
fix startup time for branch runs
To print the time stats at the end of the run, I've added a call to MOM_infra_end before calling MOM_end. Time stats are now printed in the cesm.log.* file.
Print clock stats at the end of the run
fix monthly mean outputs
|
This PR is being evaluated against the GFDL test suite with pipeline https://gitlab.gfdl.noaa.gov/ogrp/MOM6/pipelines/3188 @gustavo-marques, this PR is from dev/ncar onto dev/gfdl. I am happy to do this PR, but was it your intention that this PR should have been onto dev/master instead, in the interests of more formally treating dev/ncar and dev/gfdl as co-equal contributors to the MOM6 project? |
|
@Hallberg-NOAA, sorry I choose the wrong branch. I will close this PR and send a new one to dev/master. |
marshallward
pushed a commit
to ElizabethYankovsky/MOM6
that referenced
this pull request
Aug 23, 2024
* Directional linear wave drag This commit allows the linear wave drag to be applied to the u and v components of the barotropic velocity separately.
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.
Following a conversation with @Hallberg-NOAA, the intent of this PR is to bring dev/ncar into dev/master to facilitate future changes that will make MOM_control_struct opaque, see NOAA-GFDL#701
With exception to a call to MOM_mech_forcing_chksum in MOM.F90 (for debugging purposes), all the changes applied here are in ocn_comp_mct.F90. Therefore, this PR should not change answers in MOM6-examples.
Once dev/master incorporates this PR (i.e., after passing all tests), merging dev/master into the branch where MOM_control_struct is made opaque will minimize the amount of work needed to adapt ocn_comp_mct.F90 to those changes.