Merge pull request #17 from NIVANorge/sios-dataset-update

Update SIOS dataset
NIVANorge · Oct 24, 2024 · adcac0c · adcac0c
2 parents cf05422 + 7868d8e
commit adcac0c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/dscreator/datasets/timeseries/sios.py b/dscreator/datasets/timeseries/sios.py
@@ -19,25 +19,30 @@ def dataset_attributes(self, ds: xr.Dataset) -> DatasetAttrsDiscrete:
         For converting CF standard names erddap also contains a good converter for cf standard names.
         """
         return DatasetAttrsDiscrete(
-            title="SIOS sensor buoy in Adventfjorden",
-            summary="Summary",
-            title_no="SIOS sensor bøye i Adventfjorden",
-            summary_no="Oppsummering",
+            title="SIOS oceanographic observations in Adventfjorden",
+            summary="Long-term measurements of sea water properties collected by sensor buoy in Adventfjorden as part of the Svalbard Integrated Arctic Earth Observing System (SIOS).",
+            title_no="SIOS oseanografisk observasjoner i Adventfjorden",
+            summary_no="Langtidsmålinger av sjøvannsegenskaper samlet inn av sensor bøye i Adventfjorden som en del av Svalbard Integrated Arctic Earth Observing System (SIOS)",
             keywords=",".join(
                 [
+                    # GEMET & NORTHEMES
                     "GCMDSK:Earth Science > Oceans > Ocean Chemistry > Chlorophyll",
                     "GCMDSK:Earth Science > Oceans > Salinity/Density > Conductivity",
                     "GCMDSK:Earth Science > Oceans > Salinity/Density > Salinity",
                     "GCMDSK:Earth Science > Oceans > Ocean Temperature > Water Temperature",
                     "GCMDPLA:Water-based Platforms > Buoys > Moored > BUOYS",
                     "GCMDLOC:OCEAN > ATLANTIC OCEAN > NORTH ATLANTIC OCEAN > SVALBARD AND JAN MAYEN",
+                    "GEMET:Hydrography",
+                    "NORTHEMES:Marine activities",
                 ]
             ),
             keywords_vocabulary=",".join(
                 [
                     "GCMDSK:GCMD Science Keywords:https://gcmd.earthdata.nasa.gov/kms/concepts/concept_scheme/sciencekeywords",
                     "GCMDPLA:GCMD Platforms:https://gcmd.earthdata.nasa.gov/kms/concepts/concept_scheme/platforms",
                     "GCMDLOC:GCMD Locations:https://gcmd.earthdata.nasa.gov/kms/concepts/concept_scheme/locations",
+                    "GEMET:INSPIRE Themes:http://inspire.ec.europa.eu/theme",
+                    "NORTHEMES:GeoNorge Themes:https://register.geonorge.no/metadata-kodelister/nasjonal-temainndeling",
                 ]
             ),
             iso_topic_category="oceans",
@@ -50,9 +55,11 @@ def dataset_attributes(self, ds: xr.Dataset) -> DatasetAttrsDiscrete:
             geospatial_lat_max=float(ds.latitude.max()),
             geospatial_lon_min=float(ds.longitude.min()),
             geospatial_lon_max=float(ds.longitude.max()),
-            spatial_representation="point",
+            processing_level="Experimental",
+            spatial_representation="point"
         )
 
+
     def variable_attributes(self, variable_name) -> dict:
         """Match timeserie data to C&F
 
@@ -67,22 +74,20 @@ def variable_attributes(self, variable_name) -> dict:
                         standard_name="sea_water_temperature", long_name="Sea Water Temperature", units="degree_Celsius"
                     )
                 )
-            case "turbidity":
+            case "turbcalib":
                 return asdict(
                     CFVariableAttrs(standard_name="sea_water_turbidity", long_name="Sea Water Turbidity", units="NTU")
                 )
             case "salinity":
                 return asdict(
                     CFVariableAttrs(standard_name="sea_water_salinity", long_name="Sea Water Salinity", units="1e-3")
                 )
-            case "chlavalue":
-                return asdict(
-                    CFVariableAttrs(
+            case "chlacalib":
+               return asdict(CFVariableAttrs(
                         standard_name="mass_concentration_of_chlorophyll_a_in_sea_water",
                         long_name="Mass Concentration of Chlorophyll A in Sea Water",
                         units="µg/l",
-                    )
-                )
+                    ))
             case "condvalue":
                 return asdict(
                     CFVariableAttrs(
@@ -91,6 +96,14 @@ def variable_attributes(self, variable_name) -> dict:
                         units="S/m",
                     )
                 )
+            case "fDOMCalib":
+                return asdict(
+                    CFVariableAttrs(
+                        standard_name="concentration_of_colored_dissolved_organic_matter_in_sea_water_expressed_as_equivalent_mass_fraction_of_quinine_sulfate_dihydrate",
+                        long_name="Concentration of Fluorescent Dissolved Organic Matter in Sea Water",
+                        units="µg/l",
+                    )
+                )
             case _:
                 logging.warning(f"Array definition not found for: {variable_name}")
                 raise RuntimeError("Unknown variable code")
diff --git a/dscreator/main.py b/dscreator/main.py
@@ -104,14 +104,11 @@ def sios(max_time_slice: int = 24, stop_after_n_files: int = -1, acdd: bool = Fa
         sampling_feature_code="bbee7983-e91c-4282-9a5d-d0894a9b7cb0",
         variable_codes=[
             "Temp",
-            "Turbidity",
+            "TurbCalib",
             "Salinity",
-            "ChlaValue",
+            "ChlaCalib",
             "CondValue",
-            # "OxygenCon",
-            # "OxygenSat",
-            # "RawBackScattering",
-            # "fDOM",
+            "fDOMCalib",
         ],
     )
     dataset_builder = timeseries.sios.SiosBuilder(