From 7286960b2d0c87c2a0f4872a9cbeb4974910eba0 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Jan 2023 14:51:32 +0000 Subject: [PATCH 01/34] setup CHANGELOG for future comments --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59bd917..7873c8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ Given a version number MAJOR.MINOR.PATCH, increment the: Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format. +## [Unreleased 2.X.X-2023.XX] + +1. __ + ## [1.2.0-2023.01] The majority of the changes in this release are to expand the data model to include floating lidar sensors, measurement From 6f3bf7a011b130b640ce8d9d33bb9047a6b30622 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Jan 2023 14:52:13 +0000 Subject: [PATCH 02/34] add release procedure document --- release_procedure.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 release_procedure.md diff --git a/release_procedure.md b/release_procedure.md new file mode 100644 index 0000000..2e818ce --- /dev/null +++ b/release_procedure.md @@ -0,0 +1,26 @@ +# Release Procedure + +**This is a procedure for how to create a release of the WRA Data Model.** + +The release is from the master branch. Ideally all merges over the course of maintenance or development were merged into +the `dev` branch. Therefore, the `dev` branch will be cleaned up first. + +1. In the `dev` branch update the version number in: + 1. the actual JSON Schema file itself, + 2. all the relevant demo implementation files in the demo_data folder, + 3. the CHANGELOG file and + 4. the description of the SQL create table file. +2. Do a pull request to merge the `dev` branch into `master`. +3. The documentation is automatically generated when there is a merge into `master`. Make sure that this has completed successfully. +4. Go to 'Releases' on GitHub and 'Draft a new release'. +5. For the 'Choose a tag' create a new tag by typing in the name e.g. "v1.2.0-2023.01". Ensure you copy the format exactly + including the "v" as this will be included in the URL to find the assets that may be hardcoded in software. + 1. The target for the tag should be the `master` branch. However, a recent commit can be selected. Selecting a recent + commit would be more informative as the last commit is usually the 'Compile Documentation' commit which is not + informative. In this instance the commit for "update version number to 1.2.0-2023.01" is selected. +6. For the 'Release title' type in the same as the name for the tag but without the "v". E.g. "1.2.0-2023.01". The real + reason for this only to be consistent with previous releases. +7. In the 'Describe this release' box, copy and paste the contents from the CHANGELOG file that are relevant to this release. +8. Attach the JSON Schema file as an asset so this can be retrieved via code. Ensure that you are copying the most + up-to-date schema file which has the correct version number. +9. Publish release. From 92871ccb2daf12c1cd92708541cd249d8fc4fbab Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Jan 2023 14:57:18 +0000 Subject: [PATCH 03/34] reset to blank version number --- schema/iea43_wra_data_model.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 196d1ac..fd47388 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$version": "1.2.0-2023.01", + "$version": "X.X.0-2023.XX", "$id": "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json", "definitions": { "date_from": { From eeb3366fbda355897677351ae9876e698bf43fa5 Mon Sep 17 00:00:00 2001 From: NikoSimisiroglou <93332106+NikoSimisiroglou@users.noreply.github.com> Date: Thu, 6 Apr 2023 09:57:52 +0200 Subject: [PATCH 04/34] add obukhov length Changed the following files to include the obukhov length data model create sql CHANGELOG.md (note sure if it is correct but for this one I added the change under the ## [Unreleased 2.X.X-2023.XX]) I could not find anything I needed to change in the demo file. Thanks! --- CHANGELOG.md | 1 + schema/iea43_wra_data_model.schema.json | 2 ++ tools/iea43_wra_data_model_postgresql.sql | 1 + 3 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7873c8f..9df2138 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Additional labels for pre-release and build metadata are available as extensions ## [Unreleased 2.X.X-2023.XX] + 1. `obukhov_length` (Issue [#182] (https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182 )) 1. __ ## [1.2.0-2023.01] diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index fd47388..417393d 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -122,6 +122,7 @@ "water_level", "depth", "timestamp", + "obukhov_length", "other" ], "examples": [ @@ -192,6 +193,7 @@ "water_level (is the height of the sea surface above the sea floor. In CF Conventions this is equivalent, but opposite in respect of their point of reference, to 'sea_floor_depth_below_sea_surface'.)", "depth (the vertical distance below a particular reference e.g. sea level.)", "timestamp (the timestamp of when a measurement value was recorded)", + "obukhov_length (a parameter with a dimension of length which, when used to scale the height above ground, gives a dimensionless stability parameter.)", "other" ] }, diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index 5b08402..13a25aa 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -174,6 +174,7 @@ INSERT INTO measurement_type (id) VALUES ('water_level'), ('depth'), ('timestamp'), + ('obukhov_length'), ('other'); INSERT INTO height_reference (id) VALUES From c4a9a4e48f061e1184056b481db25a0801644ce3 Mon Sep 17 00:00:00 2001 From: stephenholleran Date: Thu, 6 Apr 2023 10:49:04 +0100 Subject: [PATCH 05/34] #182 refactor description in changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9df2138..a974359 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ Additional labels for pre-release and build metadata are available as extensions ## [Unreleased 2.X.X-2023.XX] - 1. `obukhov_length` (Issue [#182] (https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182 )) +1. To `measurement_type` add: + 1. `obukhov_length` (Issue [#182](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182)) 1. __ ## [1.2.0-2023.01] From 1ecbf5d42a9f2b9ede69ff460a2b69f47085c144 Mon Sep 17 00:00:00 2001 From: NikoSimisiroglou <93332106+NikoSimisiroglou@users.noreply.github.com> Date: Thu, 4 May 2023 12:48:42 +0200 Subject: [PATCH 06/34] first commit for TI30 --- CHANGELOG.md | 2 ++ demo_data/iea43_wra_data_model.json | 6 ++++++ schema/iea43_wra_data_model.schema.json | 4 ++++ tools/iea43_wra_data_model_postgresql.sql | 1 + 4 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a974359..9cce4d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ Additional labels for pre-release and build metadata are available as extensions 1. To `measurement_type` add: 1. `obukhov_length` (Issue [#182](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182)) +1. To `statistic_type_id` enum add: + 1. `ti30sec` (Issue [#218](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/218 )) 1. __ ## [1.2.0-2023.01] diff --git a/demo_data/iea43_wra_data_model.json b/demo_data/iea43_wra_data_model.json index 0e222b5..bac60cc 100644 --- a/demo_data/iea43_wra_data_model.json +++ b/demo_data/iea43_wra_data_model.json @@ -109,6 +109,12 @@ "is_ignored": false, "notes": "I can write anything I want here.", "update_at": "2020-04-18T18:13:00" + },{ + "column_name": "CH1Ti30sec", + "statistic_type_id": "ti30sec", + "is_ignored": false, + "notes": "I can write anything I want here.", + "update_at": "2020-04-18T18:13:00" }] },{ "slope": 0.04573, diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 417393d..7aba3c6 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1191,7 +1191,11 @@ "range", "gust", "ti", + "ti30sec", "text" + ], + "examples": [ + "ti30sec (the 10 minute average of the turbulence intensity calculated every 30 seconds within that 10 minute period.)" ] }, "is_ignored": { diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index 13a25aa..b3dd0f8 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -240,6 +240,7 @@ INSERT INTO statistic_type (id) VALUES ('range'), ('gust'), ('ti'), + ('ti30sec'), ('text'); INSERT INTO sensor_type (id) VALUES From fea1fb38c50bc6ee595f64f92a2b5737b8e20c6a Mon Sep 17 00:00:00 2001 From: Guillermo Tornero <66472009+GTornero@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:10:17 +0200 Subject: [PATCH 07/34] added wave_buoy & adcp measurement_station_types --- ...rement-point-measurement-point-properties-sensor-sensor.md | 1 + ...easurement-location-properties-measurement-station-type.md | 2 ++ ...el-properties-measurement-location-measurement-location.md | 4 +++- schema/iea43_wra_data_model.schema.json | 3 +++ tools/iea43_wra_data_model_postgresql.sql | 3 +++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-point-measurement-point-properties-sensor-sensor.md b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-point-measurement-point-properties-sensor-sensor.md index 8f9124b..ae65d34 100644 --- a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-point-measurement-point-properties-sensor-sensor.md +++ b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-point-measurement-point-properties-sensor-sensor.md @@ -151,6 +151,7 @@ The measurement sensor type e.g. anemometer. | `"solar_compass"` | | | `"inertial_measurement_unit"` | | | `"adcp"` | | +| `"altimeter"` | | | `"ctd"` | | | `"lidar"` | | | `"sodar"` | | diff --git a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-station-type.md b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-station-type.md index 73c4b05..ea7cda7 100644 --- a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-station-type.md +++ b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-station-type.md @@ -12,4 +12,6 @@ | `"lidar"` | | | `"sodar"` | | | `"floating_lidar"` | | +| `"wave_buoy"` | | +| `"adcp"` | | | `"solar"` | | diff --git a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md index b5de285..3ab1ece 100644 --- a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md +++ b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md @@ -103,7 +103,7 @@ Longitude coordinate in the Geographic Coordinate System using the WGS84 referen ## measurement\_station\_type\_id -The type of measurement station. This must be one of either met mast, lidar (a vertical profiler), sodar (also a vertical profiler) or floating lidar (floating vertical profiler lidar). +The type of measurement station. This must be one of either met mast, lidar (a vertical profiler), sodar (also a vertical profiler), floating lidar (floating vertical profiler lidar), wave buoy or ADCP. `measurement_station_type_id` @@ -129,6 +129,8 @@ The type of measurement station. This must be one of either met mast, lidar (a v | `"lidar"` | | | `"sodar"` | | | `"floating_lidar"` | | +| `"wave_buoy"` | | +| `"adcp"` | | | `"solar"` | | ## notes diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 7aba3c6..d436af8 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -340,6 +340,8 @@ "lidar", "sodar", "floating_lidar", + "wave_buoy", + "adcp", "solar" ] }, @@ -1306,6 +1308,7 @@ "solar_compass", "inertial_measurement_unit", "adcp", + "altimeter", "ctd", "lidar", "sodar", diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index b3dd0f8..0b68ebb 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -76,6 +76,8 @@ INSERT INTO measurement_station_type (id) VALUES ('lidar'), ('sodar'), ('floating_lidar'), + ('wave_buoy'), + ('adcp'), ('solar'); INSERT INTO mast_geometry (id) VALUES @@ -269,6 +271,7 @@ INSERT INTO sensor_type (id) VALUES ('solar_compass'), ('inertial_measurement_unit'), ('adcp'), + ('altimeter'), ('ctd'), ('lidar'), ('sodar'), From 962a4194141921dbe6f6ec0456019bf0847fb8da Mon Sep 17 00:00:00 2001 From: Guillermo Tornero <66472009+GTornero@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:20:16 +0200 Subject: [PATCH 08/34] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cce4d6..1e0e695 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,11 @@ Additional labels for pre-release and build metadata are available as extensions 1. `obukhov_length` (Issue [#182](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182)) 1. To `statistic_type_id` enum add: 1. `ti30sec` (Issue [#218](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/218 )) +1. To `measurement_station_type` enum add: + 1. `wave_buoy` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) + 1. `adcp` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) +1. To `sensor_type` enum add: + 1. `altimeter` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) 1. __ ## [1.2.0-2023.01] From 8d1e9d886e50a29ad2bab7cf23005e16b9970683 Mon Sep 17 00:00:00 2001 From: stephenholleran Date: Thu, 20 Jul 2023 15:53:04 +0100 Subject: [PATCH 09/34] #226 enhance description for meas type to include wave buoy and adcp --- schema/iea43_wra_data_model.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index d436af8..ba2ff6b 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -333,7 +333,7 @@ }, "measurement_station_type_id": { "title": "Measurement Station Type", - "description": "The type of measurement station. This must be one of either met mast, lidar (a vertical profiler), sodar (also a vertical profiler) or floating lidar (floating vertical profiler lidar).", + "description": "The type of measurement station. This must be one of either met mast, lidar (a vertical profiler), sodar (also a vertical profiler), floating lidar (floating vertical profiler lidar), wave buoy, ADCP (Acoustic Doppler Current Profiler) or a solar measurement station.", "type": "string", "enum": [ "mast", From 5ec6a23b88630195124626516a50a48186c76abf Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Aug 2023 15:05:58 +0100 Subject: [PATCH 10/34] iss #215 add null to height_reference enum --- CHANGELOG.md | 5 +++-- demo_data/iea43_wra_data_model.json | 2 +- schema/iea43_wra_data_model.schema.json | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cce4d6..45e58cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,10 @@ Additional labels for pre-release and build metadata are available as extensions 1. To `measurement_type` add: 1. `obukhov_length` (Issue [#182](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182)) -1. To `statistic_type_id` enum add: +2. To `statistic_type_id` enum add: 1. `ti30sec` (Issue [#218](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/218 )) -1. __ +3. Bug fixes: + 1. Add `null` to `height_reference` enum to match its type (Issue [#215](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/215)) ## [1.2.0-2023.01] diff --git a/demo_data/iea43_wra_data_model.json b/demo_data/iea43_wra_data_model.json index bac60cc..dcb4143 100644 --- a/demo_data/iea43_wra_data_model.json +++ b/demo_data/iea43_wra_data_model.json @@ -1746,7 +1746,7 @@ "name": "Logger_V", "measurement_type_id": "voltage", "height_m": null, - "height_reference_id": "ground_level", + "height_reference_id": null, "notes": "I can write anything I want here.", "update_at": "2020-04-18T18:13:00", "logger_measurement_config": [{ diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 7aba3c6..f0f3a38 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -224,7 +224,8 @@ "sea_level", "lowest_astronomical_tide", "sea_floor", - "other" + "other", + null ], "default": "ground_level" } From a8d56e87a227675a8c6a9f172356df2a59b6979f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Aug 2023 15:19:33 +0100 Subject: [PATCH 11/34] iss #217 remove double quotes around null in plant_type --- CHANGELOG.md | 2 +- schema/iea43_wra_data_model.schema.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cce4d6..dc3277c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Additional labels for pre-release and build metadata are available as extensions 1. `obukhov_length` (Issue [#182](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182)) 1. To `statistic_type_id` enum add: 1. `ti30sec` (Issue [#218](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/218 )) -1. __ +1. In `plant_type` enum, remove double quotes around the `null` (Issue [#217](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/217)). ## [1.2.0-2023.01] diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 7aba3c6..4ef92e9 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -289,10 +289,10 @@ "title": "Plant Type", "description": "The type of renewable generation plant it is.", "enum": [ - "null", "onshore_wind", "offshore_wind", - "solar" + "solar", + null ] }, "measurement_location": { From 66e35daaee9e509b519962bf537a2a9750a2ace0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Nov 2023 15:28:50 +0000 Subject: [PATCH 12/34] iss #225 add license at the top level --- CHANGELOG.md | 1 + demo_data/iea43_wra_data_model.json | 1 + schema/iea43_wra_data_model.schema.json | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 379281f..31212e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ Additional labels for pre-release and build metadata are available as extensions 1. `adcp` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) 1. To `sensor_type` enum add: 1. `altimeter` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) +1. At top level, add `license` (Issue [#225](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/225)) 1. Bug fixes: 1. Add `null` to `height_reference` enum to match its type (Issue [#215](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/215)) 1. In `plant_type` enum, remove double quotes around the `null` (Issue [#217](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/217)). diff --git a/demo_data/iea43_wra_data_model.json b/demo_data/iea43_wra_data_model.json index dcb4143..60c3faa 100644 --- a/demo_data/iea43_wra_data_model.json +++ b/demo_data/iea43_wra_data_model.json @@ -3,6 +3,7 @@ "organisation": "brightwind", "date": "2021-12-23", "version": "1.2.0-2023.01", + "license": "https://opensource.org/license/mit/", "plant_name": "A Name of the Wind Farm", "plant_type": "onshore_wind", "measurement_location": [{ diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 02327f5..05498bb 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -271,6 +271,15 @@ ], "pattern": "^([0-9]{1,2})[.]([0-9]{1,2})[.]([0-9]{1,2})-([0-9]{4})[.]([0-9]{2})$" }, + "license": { + "type": "string", + "title": "License", + "description": "Expected to be used as the Dublin Core Metadata Initiative intended. Link: http://purl.org/dc/terms/license Definition: A legal document giving official permission to do something with the resource. Comment: Recommended practice is to identify the license document with a URI. If this is not possible or feasible, a literal value that identifies the license may be provided.", + "examples": [ + "https://opensource.org/license/bsd-3-clause/", + "BSD-3-Clause" + ] + }, "plant_name": { "type": [ "string", From 4439cecbed969dc6400af50a8ce612f0cb195f70 Mon Sep 17 00:00:00 2001 From: christianj Date: Wed, 15 Nov 2023 10:03:19 +0100 Subject: [PATCH 13/34] Add 'uuid' field under 'measurement_location' in the JSON Schema and JSON example --- demo_data/iea43_wra_data_model.json | 1 + schema/iea43_wra_data_model.schema.json | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/demo_data/iea43_wra_data_model.json b/demo_data/iea43_wra_data_model.json index 0e222b5..19a17b4 100644 --- a/demo_data/iea43_wra_data_model.json +++ b/demo_data/iea43_wra_data_model.json @@ -6,6 +6,7 @@ "plant_name": "A Name of the Wind Farm", "plant_type": "onshore_wind", "measurement_location": [{ + "uuid": "6858cf5c-24e0-40d4-955b-8aecbccba391", "name": "Test_MM1", "latitude_ddeg": 53.5, "longitude_ddeg": -8, diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 196d1ac..07d156e 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -301,6 +301,18 @@ "type": "object", "title": "Measurement Location", "properties": { + "uuid": { + "type": [ + "string", + "null" + ], + "format": "uuid", + "title": "UUID", + "description": "The unique identifier of the measurement location in the UUID format.", + "examples": [ + "3d40f012-a525-4024-a626-5fcf954c59cf" + ] + }, "name": { "type": "string", "title": "Name", From 5e83bf55da386cf87ccb65f4e56b28a39b4606ed Mon Sep 17 00:00:00 2001 From: christianj Date: Wed, 15 Nov 2023 10:06:30 +0100 Subject: [PATCH 14/34] Expand description of the field 'name' under 'measurement_location' to recommend selecting names that are expered to remain unique --- schema/iea43_wra_data_model.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 07d156e..9e9c35b 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -316,7 +316,7 @@ "name": { "type": "string", "title": "Name", - "description": "The name given to the measurement location i.e. to the met mast or remote sensing device.", + "description": "The name given to the measurement location i.e. to the met mast or remote sensing device. It is recommended to use unique names, avoiding that any two locations that may be considered in the same context are given the same name.", "examples": [ "AName_MM1" ] From 7d4f15767f5a785e503b12394ccd176f26146fab Mon Sep 17 00:00:00 2001 From: christianj Date: Wed, 15 Nov 2023 10:10:00 +0100 Subject: [PATCH 15/34] Add 'uuid' field under 'measurement_location' to the two further JSON example files --- demo_data/E06_wraMetaData.json | 1 + demo_data/floating_lidar_demo_iea43_wra_data_model.json | 1 + 2 files changed, 2 insertions(+) diff --git a/demo_data/E06_wraMetaData.json b/demo_data/E06_wraMetaData.json index e768abb..fcf863d 100644 --- a/demo_data/E06_wraMetaData.json +++ b/demo_data/E06_wraMetaData.json @@ -8,6 +8,7 @@ "notes": "IEA Task 43 WRA Data Model. Campaign data available for download at https://oswbuoysny.resourcepanorama.dnv.com/", "measurement_location": [ { + "uuid": "e31117bd-6f58-4970-8045-337dd3c291fb", "name": "E06", "latitude_ddeg": 39.545, "longitude_ddeg": -73.4295, diff --git a/demo_data/floating_lidar_demo_iea43_wra_data_model.json b/demo_data/floating_lidar_demo_iea43_wra_data_model.json index 1a22345..653836d 100644 --- a/demo_data/floating_lidar_demo_iea43_wra_data_model.json +++ b/demo_data/floating_lidar_demo_iea43_wra_data_model.json @@ -6,6 +6,7 @@ "plant_name": "Irish Sea Wind Farm", "plant_type": "offshore_wind", "measurement_location": [{ + "uuid": "c5c1efe8-6daf-48e5-89c6-8098ea5a26f3", "name": "ISWF_FLS1", "latitude_ddeg": 53.35, "longitude_ddeg": -5.3, From d1bbc533f77d2ecb2727f127adf6f07e128546f3 Mon Sep 17 00:00:00 2001 From: christianj Date: Wed, 15 Nov 2023 10:19:44 +0100 Subject: [PATCH 16/34] Add 'uuid' field under 'measurement_location' in 'load_demo_schema.ipynb' --- tools/load_demo_schema.ipynb | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/load_demo_schema.ipynb b/tools/load_demo_schema.ipynb index c4c8261..916595f 100644 --- a/tools/load_demo_schema.ipynb +++ b/tools/load_demo_schema.ipynb @@ -94,6 +94,7 @@ "meas_locs = []\n", "for meas_loc in meta_data['measurement_location']:\n", " meas_locs.append({\n", + " 'UUID': meas_loc['uuid'],\n", " 'Name': meas_loc['name'],\n", " 'Latitude [Decimal Degrees]': meas_loc['latitude_ddeg'],\n", " 'Longitude [Decimal Degrees]': meas_loc['longitude_ddeg'],\n", From 85919cc61833332249d3ba4282f02e236c442525 Mon Sep 17 00:00:00 2001 From: christianj Date: Wed, 15 Nov 2023 10:26:30 +0100 Subject: [PATCH 17/34] Add documentation for the 'uuid' field under 'measurement_location' --- ...on-measurement-location-properties-uuid.md | 9 +++++++ ...asurement-location-measurement-location.md | 25 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md diff --git a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md new file mode 100644 index 0000000..d3cea58 --- /dev/null +++ b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md @@ -0,0 +1,9 @@ +## uuid Type + +`string` ([UUID](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md)) + +## uuid Examples + +```json +"3d40f012-a525-4024-a626-5fcf954c59cf" +``` diff --git a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md index b5de285..165d665 100644 --- a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md +++ b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md @@ -6,6 +6,7 @@ | Property | Type | Required | Nullable | Defined by | | :-------------------------------------------------------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| [uuid](#uuid) | `string` | Optional | can be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/uuid") | | [name](#name) | `string` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-name.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/name") | | [latitude\_ddeg](#latitude_ddeg) | `number` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-latitude-ddeg.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/latitude_ddeg") | | [longitude\_ddeg](#longitude_ddeg) | `number` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-longitude-ddeg.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/longitude_ddeg") | @@ -17,6 +18,30 @@ | [logger\_main\_config](#logger_main_config) | `array` | Optional | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-logger-configuration.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/logger_main_config") | | [measurement\_point](#measurement_point) | `array` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-point.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/measurement_point") | +## uuid + +The unique identifier of the measurement location in the UUID format. + +`uuid` + +* is optional + +* Type: `string` ([UUID](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md)) + +* can be null + +* defined in: [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/uuid") + +### uuid Type + +`string` ([UUID](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md)) + +### uuid Examples + +```json +"3d40f012-a525-4024-a626-5fcf954c59cf" +``` + ## name The name given to the measurement location i.e. to the met mast or remote sensing device. From be9211073ad4439de0b5fec6386a0942ab6b081f Mon Sep 17 00:00:00 2001 From: christianj Date: Wed, 15 Nov 2023 16:58:59 +0100 Subject: [PATCH 18/34] Remove additions to documentation since that is generated automatically --- ...on-measurement-location-properties-uuid.md | 9 ------- ...asurement-location-measurement-location.md | 27 +------------------ 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md diff --git a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md deleted file mode 100644 index d3cea58..0000000 --- a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md +++ /dev/null @@ -1,9 +0,0 @@ -## uuid Type - -`string` ([UUID](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md)) - -## uuid Examples - -```json -"3d40f012-a525-4024-a626-5fcf954c59cf" -``` diff --git a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md index efcd65c..784af0e 100644 --- a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md +++ b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md @@ -5,8 +5,7 @@ # items Properties | Property | Type | Required | Nullable | Defined by | -| :-------------------------------------------------------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| [uuid](#uuid) | `string` | Optional | can be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/uuid") | +| :-------------------------------------------------------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | | [name](#name) | `string` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-name.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/name") | | [latitude\_ddeg](#latitude_ddeg) | `number` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-latitude-ddeg.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/latitude_ddeg") | | [longitude\_ddeg](#longitude_ddeg) | `number` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-longitude-ddeg.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/longitude_ddeg") | @@ -18,30 +17,6 @@ | [logger\_main\_config](#logger_main_config) | `array` | Optional | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-logger-configuration.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/logger_main_config") | | [measurement\_point](#measurement_point) | `array` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-measurement-point.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/measurement_point") | -## uuid - -The unique identifier of the measurement location in the UUID format. - -`uuid` - -* is optional - -* Type: `string` ([UUID](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md)) - -* can be null - -* defined in: [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/uuid") - -### uuid Type - -`string` ([UUID](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-uuid.md)) - -### uuid Examples - -```json -"3d40f012-a525-4024-a626-5fcf954c59cf" -``` - ## name The name given to the measurement location i.e. to the met mast or remote sensing device. From 4ae1a572ef8d9ce814597c155ec83863c9c9897b Mon Sep 17 00:00:00 2001 From: christianj Date: Wed, 15 Nov 2023 17:02:33 +0100 Subject: [PATCH 19/34] Fix removal of additions to documentation --- ...odel-properties-measurement-location-measurement-location.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md index 784af0e..3ab1ece 100644 --- a/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md +++ b/docs/iea43_wra_data_model-properties-measurement-location-measurement-location.md @@ -5,7 +5,7 @@ # items Properties | Property | Type | Required | Nullable | Defined by | -| :-------------------------------------------------------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | +| :-------------------------------------------------------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | [name](#name) | `string` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-name.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/name") | | [latitude\_ddeg](#latitude_ddeg) | `number` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-latitude-ddeg.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/latitude_ddeg") | | [longitude\_ddeg](#longitude_ddeg) | `number` | Required | cannot be null | [IEA Wind Resource Assessment - Data Model](iea43_wra_data_model-properties-measurement-location-measurement-location-properties-longitude-ddeg.md "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json#/properties/measurement_location/items/properties/longitude_ddeg") | From 8a043aefe8d26425271b74e0820a68f45e0d088b Mon Sep 17 00:00:00 2001 From: christianj Date: Wed, 15 Nov 2023 17:07:55 +0100 Subject: [PATCH 20/34] Update 'CHANGELOG.md' with issue 232 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 379281f..dfeb337 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ Additional labels for pre-release and build metadata are available as extensions 1. `adcp` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) 1. To `sensor_type` enum add: 1. `altimeter` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) +1. To `measurement_location` add: + 1. `uuid` (Issue [#232](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/232)) 1. Bug fixes: 1. Add `null` to `height_reference` enum to match its type (Issue [#215](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/215)) 1. In `plant_type` enum, remove double quotes around the `null` (Issue [#217](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/217)). From ed2d2e80afc4d4d977753b7ff044f2be92235c92 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Nov 2023 18:08:48 +0000 Subject: [PATCH 21/34] iss #241 add cm/s as a measurement unit --- CHANGELOG.md | 4 +++- .../floating_lidar_demo_iea43_wra_data_model.json | 10 +++++----- schema/iea43_wra_data_model.schema.json | 1 + tools/iea43_wra_data_model_postgresql.sql | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 379281f..20856e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,9 @@ Additional labels for pre-release and build metadata are available as extensions 1. To `measurement_type` add: 1. `obukhov_length` (Issue [#182](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182)) 1. To `statistic_type_id` enum add: - 1. `ti30sec` (Issue [#218](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/218 )) + 1. `ti30sec` (Issue [#218](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/218)) +1. To `measurement_units_id` enum add: + 1. `cm/s` (Issue [#241](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/241)) 1. To `measurement_station_type` enum add: 1. `wave_buoy` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) 1. `adcp` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) diff --git a/demo_data/floating_lidar_demo_iea43_wra_data_model.json b/demo_data/floating_lidar_demo_iea43_wra_data_model.json index 1a22345..1d8f57c 100644 --- a/demo_data/floating_lidar_demo_iea43_wra_data_model.json +++ b/demo_data/floating_lidar_demo_iea43_wra_data_model.json @@ -498,7 +498,7 @@ "notes": "Vertical water speed at 5m.", "update_at": "2022-03-31T12:13:27", "logger_measurement_config": [{ - "measurement_units_id": "m/s", + "measurement_units_id": "cm/s", "height_m": 3.7, "date_from": "2022-03-01T12:10:00", "date_to": null, @@ -506,22 +506,22 @@ "update_at": "2022-03-31T12:13:27", "column_name": [ { - "column_name": "Vertical Water Speed (m/s) at 3.7m", + "column_name": "Vertical Water Speed (cm/s) at 3.7m", "statistic_type_id": "avg", "is_ignored": false, "update_at": "2022-03-31T12:13:27" },{ - "column_name": "Vertical Water Speed Std. Dev. (m/s) at 3.7m", + "column_name": "Vertical Water Speed Std. Dev. (cm/s) at 3.7m", "statistic_type_id": "sd", "is_ignored": false, "update_at": "2022-03-31T12:13:27" },{ - "column_name": "Vertical Water Speed Min (m/s) at 3.7m", + "column_name": "Vertical Water Speed Min (cm/s) at 3.7m", "statistic_type_id": "min", "is_ignored": false, "update_at": "2022-03-31T12:13:27" },{ - "column_name": "Vertical Water Speed Max (m/s) at 3.7m", + "column_name": "Vertical Water Speed Max (cm/s) at 3.7m", "statistic_type_id": "max", "is_ignored": false, "update_at": "2022-03-31T12:13:27" diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 02327f5..992dd86 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1075,6 +1075,7 @@ "description": "The measurement units of the values the sensor records.", "enum": [ "m/s", + "cm/s", "mph", "knots", "deg", diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index 0b68ebb..baf3933 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -190,6 +190,7 @@ INSERT INTO height_reference (id) VALUES INSERT INTO measurement_units (id) VALUES ('m/s'), ('mph'), + ('cm/s'), ('knots'), ('deg'), ('deg_C'), From 22c1e30edf12b42ffa430d4fc1fb309ba2a23f50 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Nov 2023 18:11:21 +0000 Subject: [PATCH 22/34] iss #241 add mm/s as a measurement unit --- CHANGELOG.md | 1 + schema/iea43_wra_data_model.schema.json | 1 + tools/iea43_wra_data_model_postgresql.sql | 1 + 3 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20856e3..e769b17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ Additional labels for pre-release and build metadata are available as extensions 1. `ti30sec` (Issue [#218](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/218)) 1. To `measurement_units_id` enum add: 1. `cm/s` (Issue [#241](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/241)) + 1. `mm/s` (Issue [#241](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/241)) 1. To `measurement_station_type` enum add: 1. `wave_buoy` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) 1. `adcp` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 992dd86..cc31c58 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1076,6 +1076,7 @@ "enum": [ "m/s", "cm/s", + "mm/s", "mph", "knots", "deg", diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index baf3933..be00ba1 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -191,6 +191,7 @@ INSERT INTO measurement_units (id) VALUES ('m/s'), ('mph'), ('cm/s'), + ('mm/s'), ('knots'), ('deg'), ('deg_C'), From cc587aeea1b5ec127477eaeaedb9e6475200a627 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 24 Nov 2023 14:46:37 +0000 Subject: [PATCH 23/34] iss #214 add virtual_met_mast and reanalysis --- CHANGELOG.md | 5 +- .../iea43_wra_data_model_reanalysis.json | 78 +++++++++++++++++++ schema/iea43_wra_data_model.schema.json | 4 +- tools/iea43_wra_data_model_postgresql.sql | 4 +- 4 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 demo_data/iea43_wra_data_model_reanalysis.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 379281f..cbaedb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,10 @@ Additional labels for pre-release and build metadata are available as extensions ## [Unreleased 2.X.X-2023.XX] -1. To `measurement_type` add: +1. To `measurement_station_type` enum add: + 1. `virtual_met_mast` (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) + 1. `reanalysis` (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) +1. To `measurement_type` enum add: 1. `obukhov_length` (Issue [#182](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182)) 1. To `statistic_type_id` enum add: 1. `ti30sec` (Issue [#218](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/218 )) diff --git a/demo_data/iea43_wra_data_model_reanalysis.json b/demo_data/iea43_wra_data_model_reanalysis.json new file mode 100644 index 0000000..d242448 --- /dev/null +++ b/demo_data/iea43_wra_data_model_reanalysis.json @@ -0,0 +1,78 @@ +{ + "author": "Stephen Holleran", + "organisation": "BrightWind", + "date": "2023-11-24", + "version": "1.2.0-2023.01", + "measurement_location": [{ + "name": "ERA5_53.536N_-6.3E", + "latitude_ddeg": 53.536, + "longitude_ddeg": -6.3, + "measurement_station_type_id": "reanalysis", + "notes": "I can write anything I want here.", + "update_at": "2020-04-18T18:13:00", + "logger_main_config": [{ + "logger_oem_id": "Other", + "logger_serial_number": "---", + "date_from": "2000-01-01T00:00:00", + "date_to": null, + "offset_from_utc_hrs": 0 + }], + "measurement_point": [{ + "name": "WS100m", + "measurement_type_id": "wind_speed", + "height_m": 100, + "height_reference_id": "ground_level", + "logger_measurement_config": [{ + "measurement_units_id": "m/s", + "date_from": "2000-01-01T00:00:00", + "date_to": null, + "column_name": [{ + "column_name": "Spd_100m_mps", + "statistic_type_id": "avg" + }] + }] + },{ + "name": "WD100m", + "measurement_type_id": "wind_direction", + "height_m": 100, + "logger_measurement_config": [{ + "measurement_units_id": "deg", + "date_from": "2000-01-01T00:00:00", + "date_to": null, + "column_name": [ + { + "column_name": "Dir_100m_deg", + "statistic_type_id": "avg" + }] + }] + },{ + "name": "Tmp2m", + "measurement_type_id": "air_temperature", + "height_m": 2, + "logger_measurement_config": [{ + "measurement_units_id": "deg_C", + "date_from": "2000-01-01T00:00:00", + "date_to": null, + "column_name": [ + { + "column_name": "Tmp_2m_degC", + "statistic_type_id": "avg" + }] + }] + },{ + "name": "Prs0m", + "measurement_type_id": "air_pressure", + "height_m": 0, + "logger_measurement_config": [{ + "measurement_units_id": "hPa", + "date_from": "2000-01-01T00:00:00", + "date_to": null, + "column_name": [ + { + "column_name": "Prs_0m_hPa", + "statistic_type_id": "avg" + }] + }] + }] + }] +} \ No newline at end of file diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 02327f5..7785561 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -343,7 +343,9 @@ "floating_lidar", "wave_buoy", "adcp", - "solar" + "solar", + "virtual_met_mast", + "reanalysis" ] }, "notes": { diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index 0b68ebb..26c017f 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -78,7 +78,9 @@ INSERT INTO measurement_station_type (id) VALUES ('floating_lidar'), ('wave_buoy'), ('adcp'), - ('solar'); + ('solar'), + ('virtual_met_mast'), + ('reanalysis'); INSERT INTO mast_geometry (id) VALUES ('lattice_triangle'), From 1f99750b5b25d69665a9656bfaa4f06206bb4a06 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 24 Nov 2023 15:59:37 +0000 Subject: [PATCH 24/34] iss #214 add sample example for a reanalysis dataset --- demo_data/iea43_wra_data_model_reanalysis.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/demo_data/iea43_wra_data_model_reanalysis.json b/demo_data/iea43_wra_data_model_reanalysis.json index d242448..63ba512 100644 --- a/demo_data/iea43_wra_data_model_reanalysis.json +++ b/demo_data/iea43_wra_data_model_reanalysis.json @@ -8,14 +8,19 @@ "latitude_ddeg": 53.536, "longitude_ddeg": -6.3, "measurement_station_type_id": "reanalysis", - "notes": "I can write anything I want here.", - "update_at": "2020-04-18T18:13:00", - "logger_main_config": [{ - "logger_oem_id": "Other", - "logger_serial_number": "---", + "notes": "This is an ERA5 reanalysis dataset produced by ECMWF.", + "update_at": "2023-11-24T18:13:00", + "main_config": [{ + "reanalysis_source": "era5", + "final_resolution_m": "11000", + "model_used": "ECMWF IFS", + "offset_from_utc_hrs": 0, + "averaging_period_minutes": 60, + "timestamp_is_end_of_period": false, "date_from": "2000-01-01T00:00:00", "date_to": null, - "offset_from_utc_hrs": 0 + "notes": "This is an ERA5 reanalysis dataset produced by ECMWF.", + "update_at": "2023-11-24T18:13:00" }], "measurement_point": [{ "name": "WS100m", From a7adca192a6dbbabee3ba21ea6ed2810400bb005 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Jan 2024 15:34:28 +0000 Subject: [PATCH 25/34] iss #214 update to model_config --- .../iea43_wra_data_model_reanalysis.json | 6 +- schema/iea43_wra_data_model.schema.json | 148 ++++++++++++++---- 2 files changed, 120 insertions(+), 34 deletions(-) diff --git a/demo_data/iea43_wra_data_model_reanalysis.json b/demo_data/iea43_wra_data_model_reanalysis.json index 63ba512..560c39c 100644 --- a/demo_data/iea43_wra_data_model_reanalysis.json +++ b/demo_data/iea43_wra_data_model_reanalysis.json @@ -10,9 +10,9 @@ "measurement_station_type_id": "reanalysis", "notes": "This is an ERA5 reanalysis dataset produced by ECMWF.", "update_at": "2023-11-24T18:13:00", - "main_config": [{ - "reanalysis_source": "era5", - "final_resolution_m": "11000", + "model_config": [{ + "reanalysis": "ERA5", + "final_resolution_m": 11000, "model_used": "ECMWF IFS", "offset_from_utc_hrs": 0, "averaging_period_minutes": 60, diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 7785561..eb961ef 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -48,6 +48,43 @@ "2020-07-28T20:49:13" ] }, + "offset_from_utc_hrs": { + "type": [ + "number", + "null" + ], + "title": "Offset From UTC [hr]", + "description": "The number of hours that the resulting timeseries dataset is offset from UTC. E.g. -5 for Eastern Standard Time.", + "examples": [ + "-5 (for Eastern Standard Time)", + "1 (for Central European Time)", + "5.5 (for India Standard Time)" + ] + }, + "averaging_period_minutes": { + "type": [ + "integer", + "null" + ], + "title": "Averaging Period [min]", + "description": "The number of minutes the model outputs the timeseries data at. Also known as 'time step' or 'averaging step'", + "examples": [ + "10", + "60" + ] + }, + "timestamp_is_end_of_period": { + "type": [ + "boolean", + "null" + ], + "title": "Timestamp at End of Period", + "description": "Does the timestamp represent the end of the averaging period. True is for timestamp to represent the end of the averaging period and false is for timestamp to represent the start of the averaging period.", + "examples": [ + "true (for timestamp to represent the end of the averaging period)", + "false (for timestamp to represent the start of the averaging period)" + ] + }, "measurement_type": { "type": "string", "title": "Measurement Type", @@ -851,17 +888,7 @@ ] }, "offset_from_utc_hrs": { - "type": [ - "number", - "null" - ], - "title": "Offset From UTC [hr]", - "description": "The number of hours that the logger clock is offset from UTC. E.g. -5 for Eastern Standard Time. This could also be used to capture an incorrect time programmed into the logger. E.g. a logger might be installed in upstate New York and have a UTC offset of -5. Unfortunately the mast installer programmed the incorrect time into the logger by +15 mins. Therefore the offset from UTC is -4.75.", - "examples": [ - "-5 (for Eastern Standard Time)", - "1 (for Central European Time)", - "5.5 (for India Standard Time)" - ] + "$ref": "#/definitions/offset_from_utc_hrs" }, "sampling_rate_sec": { "type": [ @@ -876,28 +903,10 @@ ] }, "averaging_period_minutes": { - "type": [ - "integer", - "null" - ], - "title": "Averaging Period [min]", - "description": "The number of minutes the logger aggregates the data over.", - "examples": [ - "10", - "60" - ] + "$ref": "#/definitions/averaging_period_minutes" }, "timestamp_is_end_of_period": { - "type": [ - "boolean", - "null" - ], - "title": "Timestamp at End of Period", - "description": "Does the timestamp represent the end of the averaging period. True is for timestamp to represent the end of the averaging period and false is for timestamp to represent the start of the averaging period.", - "examples": [ - "true (for timestamp to represent the end of the averaging period)", - "false (for timestamp to represent the start of the averaging period)" - ] + "$ref": "#/definitions/timestamp_is_end_of_period" }, "clock_is_auto_synced": { "type": [ @@ -1003,6 +1012,83 @@ "additionalItems": false, "uniqueItems": true }, + "model_config": { + "type": "array", + "title": "Model Configuration", + "description": "This represents how a simulation model or other model that produces a synthetic timeseries dataset is configured. This also includes reanalysis datasets.", + "items": { + "type": "object", + "title": "Model Configuration", + "properties": { + "reanalysis": { + "type": "string", + "title": "Reanalysis", + "description": "The name of the reanalysis dataset that is the source or the result of this model.", + "enum": [ + "CFSR", + "ERA-Interim", + "ERA5", + "JRA-55", + "MERRA-2", + "NCAR", + "Other" + ] + }, + "final_resolution_m": { + "type": [ + "integer", + "null" + ], + "title": "Final Horizontal Resolution [m]", + "description": "The final horizontal resolution, in meters, of the model used to create this dataset. If a reanalysis dataset this can be an approximation.", + "examples": [ + "11000", + "300" + ] + }, + "model_used": { + "type": [ + "string", + "null" + ], + "title": "Model Used", + "description": "The typical name of the model used to create this dataset. Further details can be added to the notes.", + "examples": [ + "ECMWF IFS" + ] + }, + "date_from": { + "$ref": "#/definitions/date_from" + }, + "date_to": { + "$ref": "#/definitions/date_to" + }, + "offset_from_utc_hrs": { + "$ref": "#/definitions/offset_from_utc_hrs" + }, + "averaging_period_minutes": { + "$ref": "#/definitions/averaging_period_minutes" + }, + "timestamp_is_end_of_period": { + "$ref": "#/definitions/timestamp_is_end_of_period" + }, + "notes": { + "$ref": "#/definitions/notes" + }, + "update_at": { + "$ref": "#/definitions/update_at" + } + }, + "additionalProperties": false, + "required": [ + "reanalysis_source", + "date_from", + "date_to" + ] + }, + "additionalItems": false, + "uniqueItems": true + }, "measurement_point": { "type": "array", "title": "Measurement Point", From 4770559a4a11c1e2d64d687415f94a5827f8fc76 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 1 Feb 2024 15:09:34 +0000 Subject: [PATCH 26/34] iss #214 updated based on comments --- CHANGELOG.md | 9 ++++++--- demo_data/iea43_wra_data_model_reanalysis.json | 2 +- schema/iea43_wra_data_model.schema.json | 12 +++++------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbaedb4..5e6e038 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,10 @@ Additional labels for pre-release and build metadata are available as extensions ## [Unreleased 2.X.X-2023.XX] -1. To `measurement_station_type` enum add: - 1. `virtual_met_mast` (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) - 1. `reanalysis` (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) +1. Adding a new table to capture details of modelled VMM and reanalysis datasets (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) + 1. This is called `model_config` which is at the same level as `logger_main_config` and contains similar information. + 1. Resulting duplicate properties `offset_from_utc_hrs`, `averaging_period_minutes` and `timestamp_is_end_of_period` were moved to Definitions. + 1. `reanalysis` and `virtual_met_mast` enums were added to `measurement_station_type` as outlined below. 1. To `measurement_type` enum add: 1. `obukhov_length` (Issue [#182](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/182)) 1. To `statistic_type_id` enum add: @@ -21,6 +22,8 @@ Additional labels for pre-release and build metadata are available as extensions 1. To `measurement_station_type` enum add: 1. `wave_buoy` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) 1. `adcp` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) + 1. `virtual_met_mast` (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) + 1. `reanalysis` (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) 1. To `sensor_type` enum add: 1. `altimeter` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) 1. Bug fixes: diff --git a/demo_data/iea43_wra_data_model_reanalysis.json b/demo_data/iea43_wra_data_model_reanalysis.json index 560c39c..cdaf853 100644 --- a/demo_data/iea43_wra_data_model_reanalysis.json +++ b/demo_data/iea43_wra_data_model_reanalysis.json @@ -12,7 +12,7 @@ "update_at": "2023-11-24T18:13:00", "model_config": [{ "reanalysis": "ERA5", - "final_resolution_m": 11000, + "horizontal_grid_resolution_m": 11000, "model_used": "ECMWF IFS", "offset_from_utc_hrs": 0, "averaging_period_minutes": 60, diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index eb961ef..7a0ec72 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1034,15 +1034,15 @@ "Other" ] }, - "final_resolution_m": { + "horizontal_grid_resolution_m": { "type": [ "integer", "null" ], - "title": "Final Horizontal Resolution [m]", - "description": "The final horizontal resolution, in meters, of the model used to create this dataset. If a reanalysis dataset this can be an approximation.", + "title": "Horizontal Grid Resolution [m]", + "description": "The final horizontal grid resolution, in meters, of the model used to create this dataset. If a reanalysis dataset, this can be an approximation e.g. '50000' for MERRA-2 as it is about 50 km in the latitudinal direction.", "examples": [ - "11000", + "50000", "300" ] }, @@ -1081,9 +1081,7 @@ }, "additionalProperties": false, "required": [ - "reanalysis_source", - "date_from", - "date_to" + "date_from" ] }, "additionalItems": false, From 9172dad9d38c2fa2f835cb891bb965dcdc4d923b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 1 Feb 2024 15:25:15 +0000 Subject: [PATCH 27/34] iss #214 update create table sql statements --- tools/iea43_wra_data_model_postgresql.sql | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index 26c017f..6b3f4c3 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -29,6 +29,10 @@ CREATE TABLE IF NOT EXISTS logger_oem ( id text PRIMARY KEY ); +CREATE TABLE IF NOT EXISTS reanalysis ( + id text PRIMARY KEY +); + CREATE TABLE IF NOT EXISTS measurement_type ( id text PRIMARY KEY ); @@ -108,6 +112,15 @@ INSERT INTO logger_oem (id) VALUES ('Aanderaa'), ('other'); +INSERT INTO reanalysis (id) VALUES + ('CFSR'), + ('ERA-Interim'), + ('ERA5'), + ('JRA-55'), + ('MERRA-2'), + ('NCAR'), + ('Other'); + INSERT INTO measurement_type (id) VALUES ('wind_speed'), ('wind_direction'), @@ -430,6 +443,24 @@ CREATE TABLE IF NOT EXISTS lidar_config( FOREIGN KEY (logger_main_config_uuid) REFERENCES logger_main_config (uuid) ); +CREATE TABLE IF NOT EXISTS model_config( + uuid UUID PRIMARY KEY DEFAULT uuid_generate_v4(), + measurement_location_uuid UUID NOT NULL, + reanalysis_id text, + horizontal_grid_resolution_m integer, + model_used text, + date_from timestamp WITHOUT TIME ZONE NOT NULL, + date_to timestamp WITHOUT TIME ZONE, + offset_from_utc_hrs decimal, + averaging_period_minutes integer, + timestamp_is_end_of_period boolean, + notes text, + update_at timestamp WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_by UUID, + FOREIGN KEY (measurement_location_uuid) REFERENCES measurement_location (uuid), + FOREIGN KEY (reanalysis_id) REFERENCES reanalysis (id) +); + CREATE TABLE IF NOT EXISTS measurement_point( uuid UUID PRIMARY KEY DEFAULT uuid_generate_v4(), measurement_location_uuid UUID NOT NULL, From a3d418ab6f8832d2c2884cab26d4dce6fa89e193 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 1 Feb 2024 15:27:47 +0000 Subject: [PATCH 28/34] iss #214 limit either 'logger_main_config' or 'model_config' to be valid --- schema/iea43_wra_data_model.schema.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 7a0ec72..aecbd04 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1916,6 +1916,16 @@ "longitude_ddeg", "measurement_station_type_id", "measurement_point" + ], + "allOf": [ + { + "if": { "required": ["logger_main_config"] }, + "then": { "not": { "required": ["model_config"] } } + }, + { + "if": { "required": ["model_config"] }, + "then": { "not": { "required": ["logger_main_config"] } } + } ] }, "additionalItems": false, From 6bb37f5f157c0c835cdc1616bfca0194351bc51c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 Feb 2024 13:03:07 +0000 Subject: [PATCH 29/34] iss #232 update descriptions --- schema/iea43_wra_data_model.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index fda3873..ae375a9 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -357,7 +357,7 @@ ], "format": "uuid", "title": "UUID", - "description": "The unique identifier of the measurement location in the UUID format.", + "description": "The unique identifier of the measurement location in the UUID format. A UUID can be generated here https://www.uuidgenerator.net/", "examples": [ "3d40f012-a525-4024-a626-5fcf954c59cf" ] @@ -365,7 +365,7 @@ "name": { "type": "string", "title": "Name", - "description": "The name given to the measurement location i.e. to the met mast or remote sensing device. It is recommended to use unique names, avoiding that any two locations that may be considered in the same context are given the same name.", + "description": "The name given to the measurement location i.e. to the met mast or remote sensing device. Unique names are recommended to avoid two locations in the same context being given the same name.", "examples": [ "AName_MM1" ] From f0d19dc0d609b91632108c725de7a825d2c97e3a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 Feb 2024 14:29:00 +0000 Subject: [PATCH 30/34] iss #232 add version to examples --- demo_data/E06_wraMetaData.json | 2 +- demo_data/floating_lidar_demo_iea43_wra_data_model.json | 2 +- demo_data/iea43_wra_data_model.json | 2 +- demo_data/iea43_wra_data_model_reanalysis.json | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/demo_data/E06_wraMetaData.json b/demo_data/E06_wraMetaData.json index fcf863d..986c984 100644 --- a/demo_data/E06_wraMetaData.json +++ b/demo_data/E06_wraMetaData.json @@ -2,7 +2,7 @@ "author": "Daniel Nuno", "organisation": "EOLOS Floating Lidar Solutions", "date": "2023-08-25", - "version": "1.2.0-2023.01", + "version": "1.3.0-2024.03", "plant_name": "NYS", "plant_type": "offshore_wind", "notes": "IEA Task 43 WRA Data Model. Campaign data available for download at https://oswbuoysny.resourcepanorama.dnv.com/", diff --git a/demo_data/floating_lidar_demo_iea43_wra_data_model.json b/demo_data/floating_lidar_demo_iea43_wra_data_model.json index 3e3442b..c738b8b 100644 --- a/demo_data/floating_lidar_demo_iea43_wra_data_model.json +++ b/demo_data/floating_lidar_demo_iea43_wra_data_model.json @@ -2,7 +2,7 @@ "author": "Stephen Holleran", "organisation": "brightwind", "date": "2022-03-31", - "version": "1.2.0-2023.01", + "version": "1.3.0-2024.03", "plant_name": "Irish Sea Wind Farm", "plant_type": "offshore_wind", "measurement_location": [{ diff --git a/demo_data/iea43_wra_data_model.json b/demo_data/iea43_wra_data_model.json index 4edc2e9..47aed85 100644 --- a/demo_data/iea43_wra_data_model.json +++ b/demo_data/iea43_wra_data_model.json @@ -2,7 +2,7 @@ "author": "Stephen Holleran", "organisation": "brightwind", "date": "2021-12-23", - "version": "1.2.0-2023.01", + "version": "1.3.0-2024.03", "license": "https://opensource.org/license/mit/", "plant_name": "A Name of the Wind Farm", "plant_type": "onshore_wind", diff --git a/demo_data/iea43_wra_data_model_reanalysis.json b/demo_data/iea43_wra_data_model_reanalysis.json index cdaf853..6a723cd 100644 --- a/demo_data/iea43_wra_data_model_reanalysis.json +++ b/demo_data/iea43_wra_data_model_reanalysis.json @@ -2,8 +2,9 @@ "author": "Stephen Holleran", "organisation": "BrightWind", "date": "2023-11-24", - "version": "1.2.0-2023.01", + "version": "1.3.0-2024.03", "measurement_location": [{ + "uuid": "282c5c44-17a2-426a-b10d-0826d0d868fc", "name": "ERA5_53.536N_-6.3E", "latitude_ddeg": 53.536, "longitude_ddeg": -6.3, From 7e983a1f281d94d136dcd9bde7d5882f3fc53a43 Mon Sep 17 00:00:00 2001 From: Gibson Date: Sun, 3 Mar 2024 14:00:07 -0600 Subject: [PATCH 31/34] iss-#247 iss-#247: Add PTH as sensor type. --- CHANGELOG.md | 1 + schema/iea43_wra_data_model.schema.json | 1 + tools/iea43_wra_data_model_postgresql.sql | 1 + 3 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 242f916..12d9da4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ Additional labels for pre-release and build metadata are available as extensions 1. `reanalysis` (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) 1. To `sensor_type` enum add: 1. `altimeter` (Issue [#226](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/226)) + 1. `PTH` (Issue [#247](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/247)) 1. To `measurement_location` add: 1. `uuid` (Issue [#232](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/232)) 1. At top level, add `license` (Issue [#225](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/225)) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index ae375a9..c3ac28b 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1423,6 +1423,7 @@ "lidar", "sodar", "other", + "PTH", null ] }, diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index 5149951..c0911e7 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -292,6 +292,7 @@ INSERT INTO sensor_type (id) VALUES ('ctd'), ('lidar'), ('sodar'), + ('PTH'), ('other'); INSERT INTO mounting_type (id) VALUES From 973037faa938f12d20031f40784e01dcb3483dcd Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Mar 2024 15:54:57 +0000 Subject: [PATCH 32/34] iss #247 change to lower case --- schema/iea43_wra_data_model.schema.json | 2 +- tools/iea43_wra_data_model_postgresql.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index c3ac28b..eb8b7bc 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1420,10 +1420,10 @@ "adcp", "altimeter", "ctd", + "pth", "lidar", "sodar", "other", - "PTH", null ] }, diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index c0911e7..ec3b797 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -290,9 +290,9 @@ INSERT INTO sensor_type (id) VALUES ('adcp'), ('altimeter'), ('ctd'), + ('pth'), ('lidar'), ('sodar'), - ('PTH'), ('other'); INSERT INTO mounting_type (id) VALUES From 51b60a7888c332dd5c7eed251d489e5eec597db6 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Mar 2024 15:58:28 +0000 Subject: [PATCH 33/34] iss #247 fix indents --- schema/iea43_wra_data_model.schema.json | 2 +- tools/iea43_wra_data_model_postgresql.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index eb8b7bc..282c44e 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1420,7 +1420,7 @@ "adcp", "altimeter", "ctd", - "pth", + "pth", "lidar", "sodar", "other", diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index ec3b797..3be5e33 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -290,7 +290,7 @@ INSERT INTO sensor_type (id) VALUES ('adcp'), ('altimeter'), ('ctd'), - ('pth'), + ('pth'), ('lidar'), ('sodar'), ('other'); From ccdf7b566716a401c2172f39f3df880aa82f544a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Mar 2024 14:19:30 +0000 Subject: [PATCH 34/34] update version number to 1.3.0-2024.03 --- CHANGELOG.md | 2 +- schema/iea43_wra_data_model.schema.json | 2 +- tools/iea43_wra_data_model_postgresql.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12d9da4..effb0f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ Given a version number MAJOR.MINOR.PATCH, increment the: Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format. -## [Unreleased 2.X.X-2023.XX] +## [1.3.0-2024.03] 1. Adding a new table to capture details of modelled VMM and reanalysis datasets (Issue [#214](https://github.com/IEA-Task-43/digital_wra_data_standard/issues/214)) 1. This is called `model_config` which is at the same level as `logger_main_config` and contains similar information. diff --git a/schema/iea43_wra_data_model.schema.json b/schema/iea43_wra_data_model.schema.json index 282c44e..38b8f40 100644 --- a/schema/iea43_wra_data_model.schema.json +++ b/schema/iea43_wra_data_model.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$version": "X.X.0-2023.XX", + "$version": "1.3.0-2024.03", "$id": "https://raw.githubusercontent.com/IEA-Task-43/digital_wra_data_standard/master/schema/iea43_wra_data_model.schema.json", "definitions": { "date_from": { diff --git a/tools/iea43_wra_data_model_postgresql.sql b/tools/iea43_wra_data_model_postgresql.sql index 3be5e33..43ee157 100644 --- a/tools/iea43_wra_data_model_postgresql.sql +++ b/tools/iea43_wra_data_model_postgresql.sql @@ -6,7 +6,7 @@ -- The SQL standard has tried to be used as much as possible. --- These statements match version 1.2.0-2023.01 +-- These statements match version 1.3.0-2024.03 -- ** load plugin that generates uuids **: