Skip to content

update from cice main#18

Merged
TillRasmussen merged 2 commits into
TillRasmussen:mainfrom
CICE-Consortium:main
Oct 3, 2021
Merged

update from cice main#18
TillRasmussen merged 2 commits into
TillRasmussen:mainfrom
CICE-Consortium:main

Conversation

@TillRasmussen
Copy link
Copy Markdown
Owner

@TillRasmussen TillRasmussen commented Oct 3, 2021

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:
    ENTER INFORMATION HERE
  • Developer(s):
    ENTER INFORMATION HERE
  • 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.
    ENTER INFORMATION HERE
  • 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:

TillRasmussen and others added 2 commits September 15, 2021 00:58
@TillRasmussen
initialized all eap history variables to zero on land (#632)
8c63ea0
@mhrib
sensible+latent heatfluxes using linear bulk formula (#633)
6c4160e 
* 'heatflux_linear' flag: sensible+latent heatfluxes using traditional linear bulk formula

* Add option atmbndy='mixed' boundary layer condition

* New options for 'atmbndy'

* For backward compability, rename "atmbndy" = default to similarity

* Change wording for text related to atmbndy

* Change wording for text related to atmbndy

* Change wording for text related to atmbndy

* Spelling error etc.

* Update Icepack with required atmbndy changes

* Added test for atmbndy={constant,mixed}

* Add test for atmbndy={constant,mixed}

* Test for atmbndy={constant,mixed}

* clean up. Renamed without underscores
TillRasmussen
TillRasmussen commented Oct 3, 2021
View reviewed changes
Copy link
Copy Markdown
Owner Author

@TillRasmussen TillRasmussen left a comment

Choose a reason for hiding this comment

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

ok

@TillRasmussen TillRasmussen merged commit d95694c into TillRasmussen:main Oct 3, 2021
TillRasmussen pushed a commit that referenced this pull request Nov 19, 2021
@JFLemieux73
New div_stress subroutine (#18)
0aeee2c 
* Initial coding for strain_rates_U

* Initial coding of div_stress subroutine

* finished div_stress subroutine...compiles and runs

* Modified if to case select followin comments from Phil
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@TillRasmussen @mhrib