Skip to content

Support for Fields in multiple files without a time dimension #1835

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

Merged
erikvansebille merged 4 commits into from
Feb 10, 2025
Merged

Support for Fields in multiple files without a time dimension #1835

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19185aa
Support for Fields in multiple files without a `time` dimension
erikvansebille Jan 29, 2025
6fdafcd
Merge branch 'main' into fix_croco_multifiles_csw
erikvansebille Feb 4, 2025
4fd16ec
Fixing case where timestamps explicitly given
erikvansebille Feb 4, 2025
16c249c
Merge branch 'fix_croco_multifiles_csw' of https://github.com/OceanPa…
erikvansebille Feb 4, 2025
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
17 changes: 11 additions & 6 deletions parcels/field.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,12 +691,17 @@
if grid is None:
# Concatenate time variable to determine overall dimension
# across multiple files
time, time_origin, timeslices, dataFiles = cls._collect_timeslices(
timestamps, data_filenames, _grid_fb_class, dimensions, indices, netcdf_engine
)
grid = Grid.create_grid(lon, lat, depth, time, time_origin=time_origin, mesh=mesh)
grid.timeslices = timeslices
kwargs["dataFiles"] = dataFiles
if "time" in dimensions or timestamps is not None:
time, time_origin, timeslices, dataFiles = cls._collect_timeslices(
timestamps, data_filenames, _grid_fb_class, dimensions, indices, netcdf_engine

Check warning on line 696 in parcels/field.py

View check run for this annotation

Codecov / codecov/patch

parcels/field.py#L696 

Added line #L696 was not covered by tests
)
grid = Grid.create_grid(lon, lat, depth, time, time_origin=time_origin, mesh=mesh)
grid.timeslices = timeslices
kwargs["dataFiles"] = dataFiles
else: # e.g. for the CROCO CS_w field, see https://github.com/OceanParcels/Parcels/issues/1831
grid = Grid.create_grid(lon, lat, depth, np.array([0.0]), time_origin=TimeConverter(0.0), mesh=mesh)
grid.timeslices = [[0]]
data_filenames = [data_filenames[0]]
elif grid is not None and ("dataFiles" not in kwargs or kwargs["dataFiles"] is None):
# ==== means: the field has a shared grid, but may have different data files, so we need to collect the
# ==== correct file time series again.
Expand Down
Loading