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

add Pstar and Cstar to namelist #475

Merged
merged 1 commit into from
Jun 27, 2020
Merged

add Pstar and Cstar to namelist #475

merged 1 commit into from
Jun 27, 2020

Conversation

phil-blain
Copy link
Member

PR checklist

  • Short (1 sentence) summary of your PR:
    Add Pstar and Cstar to namelist
  • 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.
    Tested that the new namelist values are correctly printed in the run log.
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit (I guesss... I've always wondered about single vs double precision in the namelist...)
    • 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:

eclare108213
eclare108213 reviewed Jun 26, 2020
View reviewed changes
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.

Won't Icepack need to be changed, too? It seems like Icepack needs the strength parameters for ridging.
e

@phil-blain
Copy link
Member Author

phil-blain commented Jun 26, 2020 •
edited
Loading

@eclare108213 ice_init::input_data calls icepack_init_parameters, so I think the values are correctly passed to Icepack. Whether to also add these to the Icepack namelist would need another PR.

@eclare108213
Copy link
Contributor

Great, thanks.

eclare108213
eclare108213 approved these changes Jun 26, 2020
View reviewed changes
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.

I think this just needs units for the Pstar entry in ug_case_settings, otherwise it looks good.

@phil-blain
add Pstar and Cstar to namelist
b2633ec 
Also, add a new format to ice_init for numbers
in exponential notation.

See CICE-Consortium#472
@phil-blain phil-blain force-pushed the add-p-and-c-star-to-namelist branch from 2120c82 to b2633ec Compare June 26, 2020 19:44
@phil-blain
Copy link
Member Author

thanks @eclare108213, I just added N/m for Pstar.

apcraig
apcraig reviewed Jun 26, 2020
View reviewed changes
Copy link
Contributor

@apcraig apcraig left a comment

Choose a reason for hiding this comment

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

This looks fine to me. I think I'll do some regression testing before merging though to make sure it's bit-for-bit. I expect it to be, but if not, it's good to know before the merge.

@apcraig
Copy link
Contributor

apcraig commented Jun 27, 2020

Regression testing looks fine, https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#b2633ec3ef470a332d4e63d9d4b3736c9eeee12c. I will merge

@apcraig apcraig merged commit c9cfebd into CICE-Consortium:master Jun 27, 2020
phil-blain added a commit to phil-blain/CICE that referenced this pull request Jun 29, 2020
@phil-blain
doc: correct 'Pstar' units
cdc54fb 
'Pstar' was added to the namelist in c9cfebd (add Pstar and Cstar to
namelist (CICE-Consortium#475), 2020-06-26), but the wrong units were added to the
documentation (N/m instead of N/m^2).

Fix that.
phil-blain added a commit to phil-blain/CICE that referenced this pull request Jun 29, 2020
@phil-blain
doc: correct 'Pstar' units
48e7b01 
'Pstar' was added to the namelist in c9cfebd (add Pstar and Cstar to
namelist (CICE-Consortium#475), 2020-06-26), but the wrong units were added to the
documentation (N/m instead of N/m^2).

Fix that.

Reported-by: Jean-François Lemieux <jean-francois.lemieux@canada.ca>
@phil-blain phil-blain mentioned this pull request Jun 29, 2020
Merged
16 tasks
phil-blain added a commit to phil-blain/CICE that referenced this pull request Jun 29, 2020
@phil-blain
doc: correct 'Pstar' units
41e3bd2 
'Pstar' was added to the namelist in c9cfebd (add Pstar and Cstar to
namelist (CICE-Consortium#475), 2020-06-26), but the wrong units were added to the
documentation (N/m instead of N/m^2).

Fix that.

While at it, fix the RST syntax for `k2`.

Reported-by: Jean-François Lemieux <jean-francois.lemieux@canada.ca>
phil-blain added a commit to phil-blain/CICE that referenced this pull request Jun 29, 2020
@phil-blain
doc: correct 'Pstar' units
51ceba4 
'Pstar' was added to the namelist in c9cfebd (add Pstar and Cstar to
namelist (CICE-Consortium#475), 2020-06-26), but the wrong units were added to the
documentation (N/m instead of N/m^2). Also, it already appeared in the
index with the same wrong units.

Fix that.

While at it, fix the RST syntax for `k2`.

Reported-by: Jean-François Lemieux <jean-francois.lemieux@canada.ca>
apcraig pushed a commit that referenced this pull request Jul 3, 2020
@phil-blain
doc: correct Pstar units (#477)
fcf8989 
* doc: correct 'Pstar' units

'Pstar' was added to the namelist in c9cfebd (add Pstar and Cstar to
namelist (#475), 2020-06-26), but the wrong units were added to the
documentation (N/m instead of N/m^2). Also, it already appeared in the
index with the same wrong units.

Fix that.

While at it, fix the RST syntax for `k2`.

Reported-by: Jean-François Lemieux <jean-francois.lemieux@canada.ca>

* icepack: update to b1e41d9
@phil-blain phil-blain deleted the add-p-and-c-star-to-namelist branch August 25, 2020 16:09
@apcraig apcraig mentioned this pull request Nov 12, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apcraig apcraig apcraig left review comments

@eclare108213 eclare108213 eclare108213 approved these changes

@JFLemieux73 JFLemieux73 Awaiting requested review from JFLemieux73

Assignees
No one assigned
Labels
IO Type: Feature
Projects
None yet
Milestone
No milestone
Development

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