Skip to content

Commit

Permalink
Add regridded_snapshot!
Browse files Browse the repository at this point in the history
And reduce allocations in regridding by preallocting the target field
  • Loading branch information
Sbozzolo committed Jul 2, 2024
1 parent bcb6ce0 commit e75fa66
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 8 deletions.
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
ClimaUtilities.jl Release Notes
===============================

v0.2.0
------

- Reduced alloctions in regridding. Now method `regridded_snapshot`. PR
[#72](https://github.com/CliMA/ClimaUtilities.jl/pull/72)

v0.1.9
------

Expand Down
1 change: 1 addition & 0 deletions docs/src/datahandling.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,5 @@ ClimaUtilities.DataHandling.available_dates
ClimaUtilities.DataHandling.previous_time
ClimaUtilities.DataHandling.next_time
ClimaUtilities.DataHandling.regridded_snapshot
ClimaUtilities.DataHandling.regridded_snapshot!
```
7 changes: 5 additions & 2 deletions ext/DataHandlingExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,6 @@ The `time` has to be available in the `data_handler`.
`regridded_snapshot` potentially modifies the internal state of `data_handler` and it might be a very
expensive operation.
TODO: Add `regridded_snapshot!`
"""
function DataHandling.regridded_snapshot(
data_handler::DataHandler,
Expand Down Expand Up @@ -346,4 +344,9 @@ function DataHandling.regridded_snapshot(data_handler::DataHandler)
return DataHandling.regridded_snapshot(data_handler, Dates.DateTime(0))
end

function DataHandling.regridded_snapshot!(out, data_handler, time)
out .= DataHandling.regridded_snapshot!(data_handler, time)
return nothing
end

end
29 changes: 23 additions & 6 deletions ext/TimeVaryingInputsExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import ClimaUtilities.TimeVaryingInputs: NearestNeighbor, LinearInterpolation

import ClimaUtilities.DataHandling
import ClimaUtilities.DataHandling:
DataHandler, previous_time, next_time, regridded_snapshot, available_times
DataHandler, previous_time, next_time, regridded_snapshot!, available_times

# Ideally, we should be able to split off the analytic part in a different
# extension, but precompilation stops working when we do so
Expand Down Expand Up @@ -61,6 +61,7 @@ struct InterpolatingTimeVaryingInput23D{
M <: AbstractInterpolationMethod,
CC <: ClimaComms.AbstractCommsContext,
R <: Tuple,
RR,
} <: AbstractTimeVaryingInput
"""Object that has all the information on how to deal with files, data, and so on.
Having to deal with files, it lives on the CPU."""
Expand All @@ -75,6 +76,9 @@ struct InterpolatingTimeVaryingInput23D{
"""Range of times over which the interpolator is defined. range is always defined on the
CPU. Used by the in() function."""
range::R

"""Preallocated spaces where to do regridding"""
preallocated_regridded_fields::RR
end

"""
Expand All @@ -96,11 +100,20 @@ function TimeVaryingInputs.TimeVaryingInput(
error("DataHandler does not contain temporal data")
issorted(available_times) || error("Can only interpolate with sorted times")
range = (available_times[begin], available_times[end])

# TODO: Generalize the number of _regridded_fields depending on the interpolation
# stencil
preallocated_regridded_fields = (
zero(axes(data_handler.target_space)),
zero(axes(data_handler.target_space)),
)

return InterpolatingTimeVaryingInput23D(
data_handler,
method,
context,
range,
preallocated_regridded_fields,
)
end

Expand Down Expand Up @@ -154,9 +167,9 @@ function TimeVaryingInputs.evaluate!(

# The closest regridded_snapshot could be either the previous or the next one
if (time - t0) <= (t1 - time)
dest .= regridded_snapshot(itp.data_handler, t0)
regridded_snapshot!(dest, itp.data_handler, t0)
else
dest .= regridded_snapshot(itp.data_handler, t1)
regridded_snapshot!(dest, itp.data_handler, t1)
end
return nothing
end
Expand All @@ -179,9 +192,13 @@ function TimeVaryingInputs.evaluate!(
t0, t1 =
previous_time(itp.data_handler, time), next_time(itp.data_handler, time)
coeff = (time - t0) / (t1 - t0)
dest .=
(1 - coeff) .* regridded_snapshot(itp.data_handler, t0) .+
coeff .* regridded_snapshot(itp.data_handler, t1)

field_prev = itp.preallocated_regridded_fields[1]
field_next = itp.preallocated_regridded_fields[2]
regridded_snapshot!(field_prev, itp.data_handler, t0)
regridded_snapshot!(field_next, itp.data_handler, t1)

dest .= (1 - coeff) .* field_prev .+ coeff .* field_next
return nothing
end

Expand Down

0 comments on commit e75fa66

Please sign in to comment.