Add interpolation routine to make Var.resampled_as faster
#183
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #183 +/- ##
==========================================
+ Coverage 98.35% 98.45% +0.10%
==========================================
Files 11 11
Lines 1215 1297 +82
==========================================
+ Hits 1195 1277 +82
Misses 20 20 ☔ View full report in Codecov by Sentry. |
ph-kev
force-pushed
the
kp/new-intp
branch
5 times, most recently
from
5e3c3be to
d4e432a
Compare
This commit adds an interpolation routine for use in ClimaAnalysis, which seeks to replace Interpolations.jl in Var.jl. The interpolation routine supports N-dimensional linear interpolation on a grid with throw, flat, or periodic boundary conditions. Compared against Interpolations.jl, the interpolation routine does not make a struct and does not allocate anything on the heap when interpolating a point.
This commit removes Interpolations.jl from Var.jl. To do this, the function `_make_interpolant` was removed. Three new functions are added which are `_check_interpolant`, `interpolate_point`, and `interpolate_points`, where the latter two functions replace the functionality of `_make_interpolant`. Furthermore, the function `_find_extp_bound_cond` was refactored to `_find_extp_bound_conds` which find multiple extrapolation condtions using `_find_extp_bound_cond` which is refactored to find the extrapolation condition for a single point. All functions that use an interpolant are updated to use the new interpolation routine. The test for computing the bias in Atmos changes to check approximately close to 0.0, due to floating point errors. The tests that check for errors when interpolating out of bounds now check for ErrorException instead of BoundsError.
Merged
4 tasks
Sbozzolo
reviewed
Dec 12, 2024
Comment on lines
+230
to
+258
| function linear_interpolate( | ||
| point::Number, | ||
| axes, | ||
| data::AbstractArray{FT2, N}, | ||
| extp_conds, | ||
| ) where {N, FT2} | ||
| point = Tuple(point...) | ||
| return linear_interpolate(point, axes, data, extp_conds) | ||
| end | ||
|
|
||
| function linear_interpolate( | ||
| point::AbstractVector, | ||
| axes, | ||
| data::AbstractArray{FT2, N}, | ||
| extp_conds, | ||
| ) where {N, FT2} | ||
| point = Tuple(coord for coord in point) | ||
| return linear_interpolate(point, axes, data, extp_conds) | ||
| end | ||
|
|
||
| function linear_interpolate( | ||
| point::Tuple, | ||
| axes, | ||
| data::AbstractArray{FT2, N}, | ||
| extp_conds, | ||
| ) where {N, FT2} | ||
| point = promote(point...) | ||
| return linear_interpolate(point, axes, data, extp_conds) | ||
| end |
There was a problem hiding this comment.
Can you add comments to explain what these methods are accomplishing?
Sbozzolo
reviewed
Dec 12, 2024
| Given a tuple consisting of 2-tuple, return a tuple of one element from each tuple according to bits. | ||
| """ | ||
| function get_indices(indices::NTuple{N}, bits) where {N} | ||
| return ntuple(dim -> if (bits & (1 << (dim - 1)) != 0) |
There was a problem hiding this comment.
Can you add a link to where you found this bit manipulation?
Sbozzolo
reviewed
Dec 12, 2024
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.
closes #182 - This commit adds an interpolation routine that makes
resampled_asand any other functions that use interpolations faster.Checklist
OutputVars (see issue on ClimaCoupler)Benchmarks from
@timeThe image below is from the current postprocessing pipeline using the latest commit on main.
The image below is from the current postprocessing pipeline using this PR.
