From 1d38e1d0535a1a5fc927d3edd74dd28f8a860736 Mon Sep 17 00:00:00 2001 From: Jago Strong-Wright Date: Thu, 30 Apr 2026 14:10:43 +0100 Subject: [PATCH 1/3] Allows `DatasetRestoring` to act on fields by different name --- src/DataWrangling/restoring.jl | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/DataWrangling/restoring.jl b/src/DataWrangling/restoring.jl index 69e3cf18f..998dfedaf 100644 --- a/src/DataWrangling/restoring.jl +++ b/src/DataWrangling/restoring.jl @@ -197,7 +197,9 @@ 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, + variable_name = metadata.name, + field_name = oceananigans_fieldnames[variable_name]) download_dataset(metadata) @@ -210,10 +212,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 From 6797f94e0c6d2098e7aadd8165c66b8856a44875 Mon Sep 17 00:00:00 2001 From: Jago Strong-Wright Date: Fri, 1 May 2026 11:46:43 +0100 Subject: [PATCH 2/3] Update src/DataWrangling/restoring.jl Co-authored-by: Simone Silvestri --- src/DataWrangling/restoring.jl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DataWrangling/restoring.jl b/src/DataWrangling/restoring.jl index 998dfedaf..ceb8be818 100644 --- a/src/DataWrangling/restoring.jl +++ b/src/DataWrangling/restoring.jl @@ -198,8 +198,7 @@ function DatasetRestoring(metadata::Metadata, time_indexing = Cyclical(), inpainting = NearestNeighborInpainting(Inf), cache_inpainted_data = true, - variable_name = metadata.name, - field_name = oceananigans_fieldnames[variable_name]) + field_name = oceananigans_fieldnames[metadata.name]) download_dataset(metadata) From d3dcbc356993382e96a631d5438abd4073b290f1 Mon Sep 17 00:00:00 2001 From: Jago Strong-Wright Date: Sat, 2 May 2026 15:05:02 +0100 Subject: [PATCH 3/3] Adds fallback for ECCO locaitons Since 0.3.0 can't build FTS of ECCO Darwin variables as their location isn't in the ECCO_location dictionary --- src/DataWrangling/ECCO/ECCO.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DataWrangling/ECCO/ECCO.jl b/src/DataWrangling/ECCO/ECCO.jl index 576e81014..f41d811bc 100644 --- a/src/DataWrangling/ECCO/ECCO.jl +++ b/src/DataWrangling/ECCO/ECCO.jl @@ -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 ||