Skip to content

Ensure consistent download_dataset for Copernicus data #522

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.

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
wants to merge 11 commits into
base: main
Choose a base branch
from
10 changes: 9 additions & 1 deletion src/DataWrangling/Copernicus/Copernicus.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using NCDatasets
using Printf

using Oceananigans.Fields: Center
using ClimaOcean.DataWrangling: Metadata, Metadatum, metadata_path
using ClimaOcean.DataWrangling: Metadata, Metadatum
using Dates: DateTime, Day, Month

import Oceananigans.Fields:
Expand All @@ -20,6 +20,7 @@ import ClimaOcean.DataWrangling:
latitude_interfaces,
z_interfaces,
metadata_filename,
metadata_path,
inpainted_metadata_path,
reversed_vertical_axis

Expand All @@ -44,6 +45,8 @@ dataset_name(::GLORYSStatic) = "GLORYSStatic"
dataset_name(::GLORYSDaily) = "GLORYSDaily"
dataset_name(::GLORYSMonthly) = "GLORYSMonthly"

Base.size(::CopernicusDataset, variable) = (4320, 2040, 50)

all_dates(::GLORYSStatic, var) = [nothing]
all_dates(::GLORYSDaily, var) = range(DateTime("1993-01-01"), stop=DateTime("2021-06-30"), step=Day(1))
all_dates(::GLORYSMonthly, var) = range(DateTime("1993-01-01"), stop=DateTime("2024-12-01"), step=Month(1))
Expand All @@ -60,6 +63,7 @@ CopernicusMetadata{D} = Metadata{<:CopernicusDataset, D}
CopernicusMetadatum = Metadatum{<:CopernicusDataset}

Base.size(::CopernicusMetadatum) = (4320, 2040, 50, 1)

reversed_vertical_axis(::CopernicusDataset) = true

copernicus_dataset_variable_names = Dict(
Expand Down Expand Up @@ -114,6 +118,10 @@ function metadata_filename(metadata::CopernicusMetadata)
return string(prefix, ".nc")
end

# Only one path, as the Dataset is one file for all dates
metadata_path(metadata::CopernicusMetadata) = joinpath(metadata.dir, metadata_filename(metadata))
metadata_path(metadata::CopernicusMetadatum) = joinpath(metadata.dir, metadata_filename(metadata))

function inpainted_metadata_path(metadata::CopernicusMetadata)
prefix = metadata_prefix(metadata)
return string(prefix, "_inpainted.jld2")
Expand Down
2 changes: 1 addition & 1 deletion src/DataWrangling/metadata_field.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function restrict(bbox_interfaces, interfaces, N)
end

function native_grid(metadata::Metadata, arch=CPU(); halo = (3, 3, 3))
Nx, Ny, Nz = size(metadata)
Nx, Ny, Nz, _ = size(metadata)
FT = eltype(metadata)

longitude = longitude_interfaces(metadata)
Expand Down
Loading