Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/DataWrangling/inpainting.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@ function propagate_horizontally!(inpainting::NearestNeighborInpainting, field, m
iter += 1
end

launch!(arch, grid, size(field), _fill_nans!, field)
# Fill any remaining NaN values with the mean of valid data.
# Using 0 would be catastrophic for fields like salinity (~34 psu).
valid_sum = sum(x -> ifelse(isnan(x), zero(x), x), field; condition=interior(mask))
valid_count = sum(x -> !isnan(x), field; condition=interior(mask))
fill_value = convert(eltype(field), valid_sum / valid_count)
launch!(arch, grid, size(field), _fill_nans!, field, fill_value)
fill_halo_regions!(field)

return field
Expand Down Expand Up @@ -80,7 +85,7 @@ end
end

FT_NaN = convert(FT, NaN)
@inbounds substituting_field[i, j, k] = ifelse(value == 0, FT_NaN, value / donors)
@inbounds substituting_field[i, j, k] = ifelse(donors == 0, FT_NaN, value / donors)
end

@kernel function _substitute_values!(field, substituting_field)
Expand All @@ -97,9 +102,9 @@ end
@inbounds field[i, j, k] = ifelse(mask[i, j, k], FT_NaN, field[i, j, k])
end

@kernel function _fill_nans!(field)
@kernel function _fill_nans!(field, fill_value)
i, j, k = @index(Global, NTuple)
@inbounds field[i, j, k] *= !isnan(field[i, j, k])
@inbounds field[i, j, k] = ifelse(isnan(field[i, j, k]), fill_value, field[i, j, k])
end

"""
Expand Down
3 changes: 2 additions & 1 deletion test/runtests_setup.jl
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ function test_inpainting_algorithm(arch, dataset, start_date, inpainting;
partially_inpainted_interior = on_architecture(CPU(), interior(partially_inpainted_field))

@test all(fully_inpainted_interior .!= 0)
@test any(partially_inpainted_interior .== 0)
# Partially inpainted data should have no NaN (remaining NaN is filled with the field mean)
@test !any(isnan.(partially_inpainted_interior))
end
return nothing
end
Loading