Define zero on some MatrixField types #2140
Merged
+23
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/MatrixFields/field_name_dict.jl
Outdated
Comment on lines
185
to
193
| function Base.zero(dict::FieldMatrix) | ||
| entries = unrolled_map(values(dict)) do entry | ||
| entry isa UniformScaling ? entry : zero(entry) | ||
| end | ||
| return FieldNameDict(keys(dict), entries) | ||
| end | ||
|
|
||
| Base.zero(dict::FieldNameDict) = | ||
| FieldNameDict(keys(dict), map(zero, values(dict))) |
There was a problem hiding this comment.
Suggested change
| function Base.zero(dict::FieldMatrix) | |
| entries = unrolled_map(values(dict)) do entry | |
| entry isa UniformScaling ? entry : zero(entry) | |
| end | |
| return FieldNameDict(keys(dict), entries) | |
| end | |
| Base.zero(dict::FieldNameDict) = | |
| FieldNameDict(keys(dict), map(zero, values(dict))) | |
| function Base.zero(dict::FieldNameDict) | |
| entries = unrolled_map(values(dict)) do entry | |
| entry isa UniformScaling ? entry : zero(entry) | |
| end # TODO: Replace UniformScaling with mutable Ref to make this consistent | |
| return FieldNameDict(keys(dict), entries) | |
| end |
There was a problem hiding this comment.
It looks like the matrix-field method was needed after all: https://buildkite.com/clima/climaatmos-ci/builds/22412#01949b97-4f3c-477b-8ea5-b0a0e49491d7
There was a problem hiding this comment.
Oh, wait, that build shows that it's not using the latest ClimaCore.
charleskawczynski
force-pushed
the
ck/define_zero
branch
2 times, most recently
from
4eefa45 to
e11d2fd
Compare
Define zero for some MatrixField structs
charleskawczynski
force-pushed
the
ck/define_zero
branch
from
e11d2fd to
a32ab63
Compare
|
Thanks for the suggestions, @dennisYatunin! It looks like these changes worked in ClimaTimesteppers CI 🙂 |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should allow us to use
zeroin ClimaTimesteppers, resulting in safer initialization. xref.Does this need exercised anywhere else? I think this should work since it's recursive. I'm able to run CTS unit tests with this.