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

New subroutines for rheology calc for CD grid #9

Closed
wants to merge 4 commits into from

Conversation

JFLemieux73
Copy link
Collaborator

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:
    New subroutines: stress_T, deformations_T and viscous_coeff_and_rep_pressure_T
  • Developer(s):
    @JFLemieux73
  • 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.
    compiles, smoke test works fine.
  • 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 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
  • Please provide any additional information or relevant details below:

@apcraig
Copy link
Owner

apcraig commented Nov 16, 2021

Please check diffs to make sure they look OK. It seems that viscous_coeffs_and_rep_pressure_T is being added again. Maybe you added the same code to your branch as @phil-blain PRed and maybe the merge will be fine, but we don't want to end up with two of the same methods in the same file. The PR says it can be merged without conflict. Thoughts?

@apcraig
Copy link
Owner

apcraig commented Nov 16, 2021

github actions is failing because there is an extra viscous_coeffs_and_rep_pressure_T.

@JFLemieux73
Copy link
Collaborator Author

I can't connect to zoom...it says the meeting has not started. Could you please check what's wrong?

@dabail10
Copy link
Collaborator

Just reconnected.

@phil-blain
Copy link
Collaborator

we'll close this one and JF will open a new one.

@phil-blain phil-blain closed this Nov 16, 2021
@phil-blain phil-blain mentioned this pull request Nov 16, 2021
16 tasks
@phil-blain
Copy link
Collaborator

superseded by #10

@JFLemieux73 JFLemieux73 deleted the cdgrid_rheology branch November 18, 2021 16:32
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