Skip to content

Conversation

@xylar
Copy link
Collaborator

@xylar xylar commented Apr 2, 2020

One more fix not picked up in #502

@xylar
Copy link
Collaborator Author

xylar commented Apr 2, 2020

@mark-petersen, okay my testing is far enough that I'm reasonably sure this is working and can be merged now. (I'm in day 15 of a 20-day spin-up of EC60to30wISC.)

@mark-petersen
Copy link
Contributor

I'll test in a fresh directory this time - that's what caused my last 'false positive'. I'll copy over the base_mesh and culled_mesh to save time.

@xylar
Copy link
Collaborator Author

xylar commented Apr 2, 2020

No need to test spin-up like I did but make sure ssh_adjustment gets through at least one iteration.

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.

merged locally, merge commit 433cce8. Passes nightly regression suite with gnu/opt and intel/debug. Also tested 64-layer with QU240wISC.

@xylar, I ran EC60to30wISC through ssh adjustment and spin-up. Verified that pits are gone.

@mark-petersen
Copy link
Contributor

On merge commit 433cce8, here is the 60 layer EC60to30wISC:
initial_state_EC60to30wISC_60layer
@xylar I ran it all the way through spin-up here:

/lustre/scratch4/turquoise/mpeterse/runs/200402_EC60to30wISC/ocean/global_ocean/EC60to30wISC

Feel free to use that or redo it.

@mark-petersen mark-petersen merged commit 8646894 into MPAS-Dev:ocean/develop Apr 2, 2020
@xylar xylar deleted the fix_EC60to30wISC_60_levels branch April 7, 2020 06:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants