Skip to content

Fix 60-layer initial state for EC60to30wISC #502

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.

Sign up for GitHub

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

Jump to bottom
Merged
mark-petersen merged 1 commit into from
Apr 2, 2020
Merged

Fix 60-layer initial state for EC60to30wISC #502

mark-petersen merged 1 commit into from
Apr 2, 2020

Conversation

@xylar
Copy link
Collaborator

@xylar xylar commented Apr 2, 2020

This step inadvertently got replaced with the non-ice-shelf-cavity version in #495.

@xylar xylar requested a review from mark-petersen April 2, 2020 12:47
@xylar xylar force-pushed the fix_EC60to30wISC_60_levels branch from 45213ee to 588f14f Compare April 2, 2020 12:48
@xylar
Copy link
Collaborator Author

xylar commented Apr 2, 2020

@mark-petersen, you removed the local version of config_initial_state.xml in EC60to30wISC and linked to the 60-layer version that's only appropriate for runs without ice-shelf cavities. That's not going to work, as I found out while doing a spin-up. I'll test with this branch but need you to merge this to ocean/develop so we can be sure I'm not spinning up from a branch that we will throw away or a commit that will get lost.

@mark-petersen
Copy link
Contributor

mark-petersen commented Apr 2, 2020

I woke up and saw the same thing on my test. Running this one quick...

mark-petersen
mark-petersen approved these changes Apr 2, 2020
View reviewed changes
Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this works.

@mark-petersen mark-petersen merged commit 7e278eb into MPAS-Dev:ocean/develop Apr 2, 2020
@xylar
Copy link
Collaborator Author

xylar commented Apr 2, 2020

@mark-petersen, you were a little too fast. It doesn't work and I'm going to have to do another PR.

@xylar xylar mentioned this pull request Apr 2, 2020
Merged
mark-petersen added a commit to mark-petersen/MPAS-Model that referenced this pull request Apr 2, 2020
@mark-petersen
Merge PR MPAS-Dev#503 'xylar/fix_EC60to30wISC_60_levels' into ocean/d…
8646894 
…evelop

One more fix not picked up in MPAS-Dev#502
@xylar xylar mentioned this pull request May 7, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mark-petersen mark-petersen mark-petersen approved these changes

Assignees

@mark-petersen mark-petersen

Labels

bug COMPASS Ocean

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@xylar @mark-petersen @matthewhoffman