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

Fix for rare instability in (probabilistic) seabed stress #810

Merged
merged 2 commits into from
Jan 19, 2023

Conversation

JFLemieux73
Copy link
Contributor

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

PR checklist

  • Short (1 sentence) summary of your PR:
    Fix rare instability in probabilistic seabed stress (log of negative number).
  • Developer(s):
    K. Hedstrom, E. Hunke
  • Suggest PR reviewers from list in the column to the right.
    @eclare108213
  • Please copy the PR test results link or provide a summary of testing completed below.
    262 measured results of 262 total results
    262 of 262 tests PASSED
    0 of 262 tests PENDING
    0 of 262 tests MISSING data
    0 of 262 tests FAILED

All tests are BFB including the ones with probabilistic seabed stress. The old code had v_i = v_i - m_i2 and the new one has v_i = max((v_i - m_i2), puny). It looks like v_i - m_i**2 is always larger than puny in the tests of the base suite. Longer simulations could lead to small differences.

  • How much do the PR code changes differ from the unmodified code?
    • bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on Icepack or any other models?
    • Yes
    • No
  • Does this PR update the Icepack submodule? If so, the Icepack submodule must point to a hash on Icepack's main branch.
    • Yes
    • No
  • Does this PR add any new test cases?
    • Yes
    • No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/. A test build of the technical docs will be performed as part of the PR testing.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
        The only thing that was modified is the reference for the Dupont et al. paper which has been published.
  • Please provide any additional information or relevant details below:
    This PR replaces PR Fix for rare instabilities in basal stress. #808.

@phil-blain
Copy link
Member

Developer(s):
K. Hedstrom, E. Hunke

my personal preference would be to credit Kate and Elizabeth in the commit authorship, or at least using a Co-authored-by: trailer in the commit message :)

@eclare108213 eclare108213 self-requested a review January 19, 2023 16:55
@eclare108213
Copy link
Contributor

readthedocs failed but it seems to be on the clone, not necessarily a problem with the changes. Can this be relaunched somehow?

Copy link
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

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

These changes look good to me. @kshedstrom, can you check whether this fixes the failure in your run?

@phil-blain
Copy link
Member

Can this be relaunched somehow?

Yes, CI can easily be relaunched by pushing a modified version of the branch. The easiest way to do that is to change the timestamp of the tip commit:

git commit --amend --no-edit
git push --force

but this will also re-run the GitHub actions. There is no way for us (non admins and non developers) to only relaunch specific checks (as far as I know).

@eclare108213
Copy link
Contributor

I see how to rerun GHActions but not readthedocs. Might have to re-commit and push as @phil-blain suggests.

@apcraig
Copy link
Contributor

apcraig commented Jan 19, 2023

I also don't see how to restart the readthedocs manually, will google later, but feel free to force push an update to the branch. thanks.

@kshedstrom
Copy link

Yes, this version works for me.

@JFLemieux73
Copy link
Contributor Author

I am not sure I follow this...should I just do what Philippe proposes?

git commit --amend --no-edit
git push --force

@eclare108213
Copy link
Contributor

Yes, give it a shot and see if it makes the readthedocs check work correctly.

Copy link
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@eclare108213 eclare108213 merged commit 28fdbeb into CICE-Consortium:main Jan 19, 2023
@JFLemieux73 JFLemieux73 deleted the Fix_basalstress branch December 21, 2023 15:49
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.

5 participants