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.

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

Iss332 #334

Merged
merged 4 commits into from
Mar 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- distributed
- bottleneck
- netCDF4
- xarray
- xarray < 2023.3
- cartopy
- esmpy
- intake-xarray
Expand Down
2 changes: 1 addition & 1 deletion ci/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- distributed
- bottleneck
- netCDF4
- xarray
- xarray < 2023.3
- cartopy
- intake-xarray
- geopy
Expand Down
134 changes: 133 additions & 1 deletion sciserver_catalogs/catalog_xarray.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ sources:
# ======================================================================
# ECCOv4r4 data
ECCO_v4r4:
description: ECCO version 4 release 4 dataset with fields necessary to close heat, salt and volume budgets
description: ECCO version 4 release 4 monthly mean dataset with fields necessary to close heat, salt and volume budgets
driver: zarr
model: MITGCM
args:
Expand Down Expand Up @@ -870,6 +870,138 @@ sources:
projection:
original_output: monthly mean

# ECCOv4r4 data
daily_ecco_grid:
description: ECCO version 4 release 4 grid
driver: netcdf
model: MITGCM
args:
urlpath: '/home/idies/workspace/poseidon/data03_02/daily_mean_ecco/ECCO-GRID.nc'
#drop_variables: ['k_u', 'k_p1', 'k_l', 'k']
metadata:
swap_dims:
k: Z
k_p1: Zp1
k_u: Zu
k_l: Zl
rename:
tile: face
i: X
j: Y
i_g: Xp1
j_g: Yp1
hFacC: HFacC
hFacS: HFacS
hFacW: HFacW
parameters:
rSphere: 6.371e+03
eq_state: jmd95
rho0: 1027
g: 9.81
eps_nh: 0
omega: 7.292123516990373e-05
c_p: 3.986e+03
tempFrz0: 9.01e-02
dTempFrz_dS: -5.75e-02
name: ECCO_v4r4
description: ECCO v4r4 3D dataset, ocean simulations on LLC90 grid
citation:
projection:
original_output: monthly mean

# ECCOv4r4 data daily
daily_ecco_snap:
description: ECCO version 4 release 4 daily mean dataset with fields necessary to close heat, salt and volume budgets
driver: zarr
model: MITGCM
args:
urlpath: '/home/idies/workspace/poseidon/data0*_02/daily_mean_ecco/zarr/snap*'
drop_variables: ['XC', 'YC']
xarray_kwargs:
engine: zarr
parallel: true
metadata:
name: ECCO_v4r4
description: ECCO v4r4 3D dataset, ocean simulations on LLC90 grid
citation:
projection:
original_output: daily snapshot

# ECCOv4r4 data daily
daily_ecco_mean:
description: ECCO version 4 release 4 daily mean dataset with fields necessary to close heat, salt and volume budgets
driver: zarr
model: MITGCM
args:
urlpath: '/home/idies/workspace/poseidon/data0*_02/daily_mean_ecco/zarr/mean*'
drop_variables: ['XC', 'YC', 'XG', 'YG', 'time_midp']
xarray_kwargs:
engine: zarr
parallel: true
metadata:
grid_coords:
add_midp: true
grid_coords:
Y:
Y:
Yp1: -0.5
X:
X:
Xp1: -0.5
Z:
Z:
Zp1: 0.5
Zu: 0.5
Zl: -0.5
time:
time: -0.5
face_connections: # topology
face_connections:
face:
0:
X: tuple(((12, 'Y', False), (3, 'X', False)))
Y: tuple((None,(1,'Y',False)))
1:
X: tuple(((11,'Y',False),(4,'X',False)))
Y: tuple(((0,'Y',False),(2,'Y',False)))
2:
X: tuple(((10,'Y',False),(5, 'X', False)))
Y: tuple(((1, 'Y', False), (6, 'X', False)))
3:
X: tuple(((0, 'X', False), (9, 'Y', False)))
Y: tuple((None, (4, 'Y', False)))
4:
X: tuple(((1, 'X', False), (8, 'Y', False)))
Y: tuple(((3, 'Y', False), (5, 'Y', False)))
5:
X: tuple(((2, 'X', False), (7, 'Y', False)))
Y: tuple(((4, 'Y', False), (6, 'Y', False)))
6:
X: tuple(((2, 'Y', False), (7, 'X', False)))
Y: tuple(((5, 'Y', False), (10, 'X', False)))
7:
X: tuple(((6, 'X', False), (8, 'X', False)))
Y: tuple(((5, 'X', False), (10, 'Y', False)))
8:
X: tuple(((7, 'X', False), (9, 'X', False)))
Y: tuple(((4, 'X', False), (11, 'Y', False)))
9:
X: tuple(((8, 'X', False), None))
Y: tuple(((3, 'X', False), (12, 'Y', False)))
10:
X: tuple(((6, 'Y', False), (11, 'X', False)))
Y: tuple(((7, 'Y', False), (2, 'X', False)))
11:
X: tuple(((10, 'X', False), (12, 'X', False)))
Y: tuple(((8, 'Y', False), (1, 'X', False)))
12:
X: tuple(((11, 'X', False), None))
Y: tuple(((9, 'Y', False), (0, 'X', False)))
name: ECCO_v4r4
description: ECCO v4r4 3D dataset, ocean simulations on LLC90 grid
citation:
projection:
original_output: daily mean

# ======================================================================
# HyCOM data test, interpolated onto lat-lon-depth coords
Expand Down
5 changes: 3 additions & 2 deletions sciserver_catalogs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ dependencies:
- distributed
- bottleneck
- netCDF4
- xarray
- libnetcdf <= 4.8.1
- xarray < 2023.3
- cartopy
- esmpy
- geopy
Expand Down Expand Up @@ -54,8 +55,8 @@ dependencies:
- imageio
- pre-commit
- xmitgcm
- intake-xarray
- pip:
- black-nb
- numbagg
- git+https://github.com/intake/intake-xarray.git
- git+https://github.com/hainegroup/oceanspy.git