Bugfix in merge_gridded_data #1697
Merged
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
VascoSch92
reviewed
Mar 12, 2024
| @@ -1958,6 +1963,7 @@ def reproject_gridded_data_variable_to_grid(gdir, | |||
| if preserve_totals: | |||
| # only preserve for float variables | |||
| if not np.issubdtype(data, np.integer): | |||
| # do we want to do smoothing? | |||
There was a problem hiding this comment.
Suggested change
| # do we want to do smoothing? | |
| # TODO: do we want to do smoothing? |
because is an open question and not a comment ;-) (also it is also a comment)
|
Thanks @pat-schmitt ! From the doctext I'm not sure why smoothing can only be done when preserving totals is true? Otherwise looks good to me. |
|
I made this choice because the smoothing effect is quite strong. If we don't preserve totals, the resulting smoothed volume will deviate even further from the actual modeled value. However, I could also adjust the approach so that smoothing is applied without preserving totals. |
|
I don't mind too much - best is to keep it easy, so let's stick to this for now. Merge when you are ready! |
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 is a bugfix for the problem reported here #1694. The problem was a division through zero when we try to preserve totals but the glacier has completely disappeared (as described in the issue). I adapted one test and could reproduce and solve the problem. Thanks @bpelto for investigating!
Further, I included here an option for smoothing when merging simulated thickness. This is useful to make the ice thicknesses less pixelated for 3D visualisations. I will add this to the tutorials.
Closes #1694
whats-new.rst