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

merge of changes in clm-Nor-dev and clm5.0.14 nor #16

Merged
merged 13 commits into from
Apr 30, 2021

Conversation

MichaelSchulzMETNO
Copy link

Description of changes

Non answer changing changes are in both branches and should be harmonised

Specific notes

Contributors other than yourself, if any:
see contributors to four file changes

Are answers expected to change (and if so in what way)?
not expected

DirkOlivie and others added 13 commits April 6, 2021 10:45
Update with high resolution BLOM settings
Update according to issue #11 , non answer changing, split 'and' statement, so that code is not crashing.
Fix apply_use_init_interp() use in branch run, as suggested in  ESCOMP#786
Co-authored-by: Michael Schulz <michael.schulz@met.no>
Co-authored-by: Michael Schulz <michael.schulz@met.no>
Co-authored-by: Michael Schulz <michael.schulz@met.no>
Co-authored-by: Michael Schulz <michael.schulz@met.no>
Co-authored-by: Michael Schulz <michael.schulz@met.no>
adding information about the branches in NorESMhub/CTSM repository
Copy link
Collaborator

@DirkOlivie DirkOlivie left a comment

Choose a reason for hiding this comment

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

Ok for me.

@MichaelSchulzMETNO MichaelSchulzMETNO merged commit 5d50e1c into clm-Nor-dev Apr 30, 2021
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.

None yet

3 participants