Skip to content

Commit bcb2d7c

Browse files
authored
Merge pull request #238 from aodn/ZarrDatasets
Zarr datasets
2 parents 45a9132 + 56c7d78 commit bcb2d7c

File tree

40 files changed

+5480
-1486
lines changed

40 files changed

+5480
-1486
lines changed

aodn_cloud_optimised/bin/create_dataset_config.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,15 @@ def generate_template_value(schema):
132132
- dict: An OrderedDict with keys and template values based on the object properties' schema.
133133
- None: If the schema type is not recognized.
134134
"""
135+
# Handle anyOf / oneOf by picking the first subschema
136+
if "anyOf" in schema:
137+
return generate_template_value(schema["anyOf"][0])
138+
if "oneOf" in schema:
139+
return generate_template_value(schema["oneOf"][0])
140+
if "allOf" in schema:
141+
# merge all subschemas (simplest: just pick the first for now)
142+
return generate_template_value(schema["allOf"][0])
143+
135144
schema_type = schema["type"]
136145

137146
if schema_type == "string":
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
generic_launcher.py
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
generic_launcher.py
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
generic_launcher.py
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
generic_launcher.py
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
generic_launcher.py
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
generic_launcher.py

aodn_cloud_optimised/config/dataset/satellite_ghrsst_l3s_1day_daynighttime_multi_sensor_australia.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@
4747
"run_settings": {
4848
"coiled_cluster_options": {
4949
"n_workers": [
50-
60,
51-
180
50+
35,
51+
120
5252
],
53-
"scheduler_vm_types": "m7i.2xlarge",
54-
"worker_vm_types": "m7i.2xlarge",
53+
"scheduler_vm_types": "m7i-flex.large",
54+
"worker_vm_types": "m7i-flex.large",
5555
"allow_ingress_from": "me",
5656
"compute_purchase_option": "spot_with_fallback",
5757
"worker_options": {
58-
"nthreads": 8,
59-
"memory_limit": "32GB"
58+
"nthreads": 2,
59+
"memory_limit": "100GB"
6060
}
6161
},
62-
"batch_size": 100,
62+
"batch_size": 60,
6363
"cluster": {
6464
"mode": "coiled",
6565
"restart_every_path": true
@@ -70,7 +70,7 @@
7070
"filter": [],
7171
"year_range": [
7272
2012,
73-
2024
73+
2025
7474
]
7575
}
7676
],
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
"dataset_name": "satellite_ghrsst_l3s_1day_daytime_multi_sensor_australia",
3+
"logger_name": "satellite_ghrsst_l3s_1day_daytime_multi_sensor_australia",
4+
"parent_config": "satellite_ghrsst_main.json",
5+
"cloud_optimised_format": "zarr",
6+
"run_settings": {
7+
"paths": [
8+
{
9+
"type": "files",
10+
"s3_uri": "s3://imos-data/IMOS/SRS/SST/ghrsst/L3SM-1d/day/",
11+
"filter": [
12+
".*\\.nc$"
13+
],
14+
"year_range": [
15+
2012,
16+
2025
17+
]
18+
}
19+
],
20+
"cluster": {
21+
"mode": "coiled",
22+
"restart_every_path": true
23+
},
24+
"clear_existing_data": true,
25+
"raise_error": false,
26+
"coiled_cluster_options": {
27+
"n_workers": [
28+
35,
29+
100
30+
],
31+
"scheduler_vm_types": "m7i-flex.xlarge",
32+
"worker_vm_types": "m7i-flex.xlarge",
33+
"allow_ingress_from": "me",
34+
"compute_purchase_option": "spot_with_fallback",
35+
"worker_options": {
36+
"nthreads": 1,
37+
"memory_limit": "100GB"
38+
}
39+
},
40+
"batch_size": 60
41+
},
42+
"metadata_uuid": "52ad55a5-b537-4e10-8a81-22d9317c81f2",
43+
"aws_opendata_registry": {
44+
"Name": "Satellite - Sea surface temperature - Level 3 - Multi sensor - 1 day - Night time",
45+
"Description": "This is a multi-sensor SSTskin L3S product for a single day-time period, derived using sea surface temperature retrievals from the VIIRS sensor on the Suomi-NPP satellite and JPSS series of satellites, and AVHRR sensor on the NOAA and Metop series of Polar-orbiting satellites. The sensors and satellite platforms contributing to each file are listed in the sensor and platform global attributes in the file header. The Multi-sensor L3S product is provided as a 0.02deg x 0.02deg cylindrical equidistant projected map over the region 70E to 170W, 20N to 70S. The quality level for each pixel was remapped using the original ACSPO VIIRS and AVHRR L3U quality levels and Sensor Specific Error Statistics (SSES), as described in Griffin et al. (2017) Appendix at http://imos.org.au/facilities/srs/sstproducts/sstdata0/sstdata-references/, before compositing single swaths from the sensors. Each grid cell contains the 1 day average of all the highest available quality SSTs that overlap with that cell, weighted by the area of overlap. Refer to the IMOS SST products web page at http://imos.org.au/sstproducts.html for further information.",
46+
"Documentation": "https://catalogue-imos.aodn.org.au/geonetwork/srv/eng/catalog.search#/metadata/52ad55a5-b537-4e10-8a81-22d9317c81f2",
47+
"Contact": "info@aodn.org.au",
48+
"ManagedBy": "AODN",
49+
"UpdateFrequency": "As Needed",
50+
"Tags": [
51+
"oceans",
52+
"satellite imagery"
53+
],
54+
"License": "http://creativecommons.org/licenses/by/4.0/",
55+
"Resources": [
56+
{
57+
"Description": "Cloud Optimised AODN dataset of IMOS - Satellite Remote Sensing - SST - L3S - Multi Sensor - 1 day - day time - Australia",
58+
"ARN": "arn:aws:s3:::aodn-cloud-optimised/satellite_ghrsst_l3s_1day_daytime_multi_sensor_australia.zarr",
59+
"Region": "ap-southeast-2",
60+
"Type": "S3 Bucket"
61+
}
62+
],
63+
"DataAtWork": {
64+
"Tutorials": [
65+
{
66+
"Title": "Accessing IMOS - Satellite Remote Sensing - SST - L3S - Multi Sensor - 1 day - day time - Australia",
67+
"URL": "https://github.com/aodn/aodn_cloud_optimised/blob/main/notebooks/satellite_ghrsst_l3s_1day_daytime_multi_sensor_australia.ipynb",
68+
"NotebookURL": "https://githubtocolab.com/aodn/aodn_cloud_optimised/blob/main/notebooks/satellite_ghrsst_l3s_1day_daytime_multi_sensor_australia.ipynb",
69+
"AuthorName": "Laurent Besnard",
70+
"AuthorURL": "https://github.com/aodn/aodn_cloud_optimised"
71+
},
72+
{
73+
"Title": "Accessing and search for any AODN dataset",
74+
"URL": "https://github.com/aodn/aodn_cloud_optimised/blob/main/notebooks/GetAodnData.ipynb",
75+
"NotebookURL": "https://githubtocolab.com/aodn/aodn_cloud_optimised/blob/main/notebooks/GetAodnData.ipynb",
76+
"AuthorName": "Laurent Besnard",
77+
"AuthorURL": "https://github.com/aodn/aodn_cloud_optimised"
78+
}
79+
]
80+
},
81+
"Citation": "The citation in a list of references is: \"IMOS [year-of-data-download], [Title], [data-access-URL], accessed [date-of-access].\""
82+
}
83+
}
Binary file not shown.

0 commit comments

Comments
 (0)