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

Sync develop into main #1027

Merged
merged 11 commits into from
Nov 5, 2024
Merged

Sync develop into main #1027

merged 11 commits into from
Nov 5, 2024

Conversation

sdrabenh
Copy link
Collaborator

@sdrabenh sdrabenh commented Nov 5, 2024

No description provided.

dbarahon and others added 11 commits September 18, 2024 17:14
…F90)

An optional input argument ("conserve_ice10_tzero") was used in an if statement, but the optional input argument may not be provided by the calling routine. 
In the GCM, the optional argument is provided in both calls to StieglitzSnow_relayer().   In the LDAS, however, the optional argument is not always provided. 
The fix is to use the local variable ("conserve_ice10_tzero_tmp"), which always exists, in the if statement.
…_tzero

Bug fix for optional input arg "conserve_ice10_tzero" (StieglitzSnow.F90)
@sdrabenh sdrabenh added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Nov 5, 2024
@sdrabenh sdrabenh requested review from a team as code owners November 5, 2024 13:48
@sdrabenh sdrabenh merged commit f26a2d1 into main Nov 5, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants