Skip to content

Allows DatasetRestoring to act on fields by different name #199

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

Open
jagoosw wants to merge 4 commits into
base: main
Choose a base branch
from
+3 −6
Open

Allows DatasetRestoring to act on fields by different name #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d38e1d
Allows `DatasetRestoring` to act on fields by different name
jagoosw Apr 30, 2026
6797f94
Update src/DataWrangling/restoring.jl
jagoosw May 1, 2026
da6b05e
Merge branch 'main' into jsw/restore-different-name
jagoosw May 1, 2026
d3dcbc3
Adds fallback for ECCO locaitons
jagoosw May 2, 2026
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
2 changes: 1 addition & 1 deletion src/DataWrangling/ECCO/ECCO.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ end
dataset_variable_name(data::Metadata{<:ECCO2Daily}) = ECCO2_dataset_variable_names[data.name]
dataset_variable_name(data::Metadata{<:ECCO2Monthly}) = ECCO2_dataset_variable_names[data.name]
dataset_variable_name(data::Metadata{<:ECCO4Monthly}) = ECCO4_dataset_variable_names[data.name]
dataset_location(::ECCODataset, name) = ECCO_location[name]
dataset_location(::ECCODataset, name) = name in keys(ECCO_location) ? ECCO_location[name] : (Center, Center, Center)

is_three_dimensional(data::ECCOMetadata) =
data.name == :temperature ||
Expand Down
7 changes: 2 additions & 5 deletions src/DataWrangling/restoring.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ function DatasetRestoring(metadata::Metadata,
time_indices_in_memory = default_time_indices_in_memory(metadata),
time_indexing = Cyclical(),
inpainting = NearestNeighborInpainting(Inf),
cache_inpainted_data = true)
cache_inpainted_data = true,
field_name = oceananigans_fieldnames[metadata.name])

download_dataset(metadata)

Expand All @@ -210,10 +211,6 @@ function DatasetRestoring(metadata::Metadata,
arch = architecture(fts)
mask = on_architecture(arch, mask)

# Grab the correct Oceananigans field to restore
variable_name = metadata.name
field_name = oceananigans_fieldnames[variable_name]

# If we pass the grid we do not need to interpolate
# so we can save parameter space by setting the native grid to nothing
on_native_grid = arch_or_grid isa AbstractArchitecture
Expand Down
Loading