Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix longitude_name call in apply_latlon_mask #195

Merged
merged 1 commit into from
Feb 13, 2025
Merged

fix longitude_name call in apply_latlon_mask #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Var.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1782,8 +1782,8 @@ function make_lonlat_mask(
# Reshape data for broadcasting
lon_idx = input_var.dim2index[longitude_name(input_var)]
lat_idx = input_var.dim2index[latitude_name(input_var)]
lon_length = input_var.dims[longitude_name(mask_var)] |> length
lat_length = input_var.dims[latitude_name(mask_var)] |> length
lon_length = input_var.dims[longitude_name(input_var)] |> length
lat_length = input_var.dims[latitude_name(input_var)] |> length
if lon_idx > lat_idx
mask_arr = transpose(mask_arr)
end
Expand Down
13 changes: 12 additions & 1 deletion test/test_Var.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ end
@test xy_avg.attributes["long_name"] ==
"hi averaged horizontally over x (0.0 to 180.0km) and y (0.0 to 90.0km)"

# Setup to test average_lat and average_lon
# Setup to test average_lat and average_lon
long = 0.0:180.0 |> collect
lat = 0.0:90.0 |> collect
time = 0.0:10.0 |> collect
Expand Down Expand Up @@ -1837,6 +1837,17 @@ end
var1 = mask_fn(ones_var)
@test var1.data[1] == 0.0

# Check with a different longitude name
ones_var = ClimaAnalysis.remake(
ones_var,
dims = OrderedDict(["latitude" => lat, "longitude" => lon]),
dim_attributes = OrderedDict(["longitude" => Dict("units" => "deg")]),
)
# ones_var.dims = OrderedDict(["latitude" => lat, "longitude" => lon])
# ones_var.dim_attributes = OrderedDict(["longitude" => Dict("units" => "deg")])
var1 = mask_fn(ones_var)
@test var1.data[1] == 0.0

# Error handling
lat = collect(range(-89.5, 89.5, 180))
data = ones(length(lat))
Expand Down
Loading