Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates ocn_comp_mct following upper level changes #704

Merged
merged 15 commits into from
Feb 1, 2018

Conversation

gustavo-marques
Copy link
Collaborator

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 #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.

gustavo-marques and others added 15 commits November 21, 2017 07:41
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.
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
@Hallberg-NOAA
Copy link
Collaborator

I have tested these changes against the GFDL test suite, and inspected the proposed changes. We at GFDL support the proposal to merge these changes onto the dev/master branch of MOM6.

@kshedstrom
Copy link
Collaborator

All is go from ESMG.

@Hallberg-NOAA Hallberg-NOAA merged commit 524b78c into mom-ocean:dev/master Feb 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants