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.

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

doc: correct 'Pstar' units #325

Merged
merged 2 commits into from
Jun 30, 2020
Merged

doc: correct 'Pstar' units #325

merged 2 commits into from
Jun 30, 2020

Conversation

phil-blain
Copy link
Member

PR checklist

  • Short (1 sentence) summary of your PR:
    Correct units for Pstar in the documentation.
  • Developer(s):
    P. Blain
  • Suggest PR reviewers from list in the column to the right.
  • Please copy the PR test results link or provide a summary of testing completed below.
    Doc changes only; no tests (I tested the documentation build locally).
  • 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 CICE or any other models?
  • 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/.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please provide any additional information or relevant details below:
    Pstar was mentioned in the doc as being in N/m, but should be in N/m^2.

Also, add a .md extension to the PR template (this is the current GitHub recommendation, plus it seems that PR templates without the extension are not recognized by the gh command line tool (https://github.com/cli/cli/issues/1292)

@phil-blain
doc: correct 'Pstar' units
b39441e 
`Pstar` is really in N/m^2, but is incorrectly listed as being in N/m.

Fix that.
@phil-blain
.github: add '.md' extension to PULL_REQUEST_TEMPLATE
ea81b40 
The GitHub documentation implicitely suggests using a '.md' extension
for pull request template [1].

Let's follow that recommendation.

[1] https://help.github.com/en/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository
@phil-blain phil-blain mentioned this pull request Jun 29, 2020
Merged
16 tasks
@apcraig
Copy link
Contributor

apcraig commented Jun 30, 2020

As I understand, we want to merge this first, then update icepack in the CICE Pstar PR, correct? This looks fine to me. I will merge later today unless someone disagrees.

@phil-blain
Copy link
Member Author

@apcraig yes that's my plan. Thanks!

@apcraig apcraig merged commit b1e41d9 into CICE-Consortium:master Jun 30, 2020
lettie-roach pushed a commit to lettie-roach/Icepack that referenced this pull request Oct 18, 2022
@phil-blain @apcraig
Add maximum depth for grounding scheme (CICE-Consortium#325)
647aa1f 
* updated my machine files

* added max depth threshold for basal stress parameterization

* modified the doc for the change in the basal stress parameterization

* modified doc for grounding
@phil-blain phil-blain deleted the fix-pstar-units branch February 13, 2024 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apcraig apcraig apcraig approved these changes

@JFLemieux73 JFLemieux73 JFLemieux73 approved these changes

@eclare108213 eclare108213 Awaiting requested review from eclare108213

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@phil-blain @apcraig @JFLemieux73