update schemas

NREL · Feb 9, 2024 · 96b2b21 · 96b2b21
1 parent 8525e61
commit 96b2b21
Show file tree

Hide file tree

Showing 19 changed files with 221 additions and 194 deletions.
diff --git a/openoa/schema/base_electrical_losses_schema.json b/openoa/schema/base_electrical_losses_schema.json
@@ -6,15 +6,16 @@
       "units": "kWh"
     },
     "frequency": [
-      "min",
-      "ms",
-      "W",
       "us",
+      "ns",
+      "ME",
+      "W",
       "D",
       "s",
-      "ns",
+      "MS",
       "h",
-      "MS"
+      "ms",
+      "min"
     ]
   },
   "scada": {
@@ -29,13 +30,13 @@
       "units": null
     },
     "frequency": [
-      "min",
-      "ms",
       "us",
+      "ns",
       "D",
       "s",
-      "ns",
-      "h"
+      "h",
+      "ms",
+      "min"
     ]
   }
 }
diff --git a/openoa/schema/base_electrical_losses_schema.yml b/openoa/schema/base_electrical_losses_schema.yml
@@ -8,25 +8,26 @@ scada:
     dtype: float
     units: kW
   frequency:
-  - min
-  - ms
   - us
+  - ns
   - D
   - s
-  - ns
   - h
+  - ms
+  - min
 meter:
   MMTR_SupWh:
     name: MMTR_SupWh
     dtype: float
     units: kWh
   frequency:
-  - min
-  - ms
-  - W
   - us
+  - ns
+  - ME
+  - W
   - D
   - s
-  - ns
-  - h
   - MS
+  - h
+  - ms
+  - min
diff --git a/openoa/schema/base_monte_carlo_aep_schema.json b/openoa/schema/base_monte_carlo_aep_schema.json
@@ -11,15 +11,16 @@
       "units": "kWh"
     },
     "frequency": [
-      "min",
-      "ms",
-      "W",
       "us",
+      "ns",
+      "ME",
+      "W",
       "D",
       "s",
-      "ns",
+      "MS",
       "h",
-      "MS"
+      "ms",
+      "min"
     ]
   },
   "meter": {
@@ -29,15 +30,16 @@
       "units": "kWh"
     },
     "frequency": [
-      "min",
-      "ms",
-      "W",
       "us",
+      "ns",
+      "ME",
+      "W",
       "D",
       "s",
-      "ns",
+      "MS",
       "h",
-      "MS"
+      "ms",
+      "min"
     ]
   },
   "reanalysis": {
@@ -52,15 +54,16 @@
       "units": "m/s"
     },
     "frequency": [
-      "min",
-      "ms",
-      "W",
       "us",
+      "ns",
+      "ME",
+      "W",
       "D",
       "s",
-      "ns",
+      "MS",
       "h",
-      "MS"
+      "ms",
+      "min"
     ]
   }
 }
diff --git a/openoa/schema/base_monte_carlo_aep_schema.yml b/openoa/schema/base_monte_carlo_aep_schema.yml
@@ -4,15 +4,16 @@ meter:
     dtype: float
     units: kWh
   frequency:
-  - min
-  - ms
-  - W
   - us
+  - ns
+  - ME
+  - W
   - D
   - s
-  - ns
-  - h
   - MS
+  - h
+  - ms
+  - min
 curtail:
   IAVL_ExtPwrDnWh:
     name: IAVL_ExtPwrDnWh
@@ -23,15 +24,16 @@ curtail:
     dtype: float
     units: kWh
   frequency:
-  - min
-  - ms
-  - W
   - us
+  - ns
+  - ME
+  - W
   - D
   - s
-  - ns
-  - h
   - MS
+  - h
+  - ms
+  - min
 reanalysis:
   WMETR_HorWdSpd:
     name: WMETR_HorWdSpd
@@ -42,12 +44,13 @@ reanalysis:
     dtype: float
     units: kg/m^3
   frequency:
-  - min
-  - ms
-  - W
   - us
+  - ns
+  - ME
+  - W
   - D
   - s
-  - ns
-  - h
   - MS
+  - h
+  - ms
+  - min
diff --git a/openoa/schema/base_tie_schema.json b/openoa/schema/base_tie_schema.json
@@ -16,13 +16,13 @@
       "units": "m/s"
     },
     "frequency": [
-      "min",
-      "ms",
       "us",
+      "ns",
       "D",
       "s",
-      "ns",
-      "h"
+      "h",
+      "ms",
+      "min"
     ]
   },
   "scada": {
@@ -42,13 +42,13 @@
       "units": null
     },
     "frequency": [
-      "min",
-      "ms",
       "us",
+      "ns",
       "D",
       "s",
-      "ns",
-      "h"
+      "h",
+      "ms",
+      "min"
     ]
   }
 }
diff --git a/openoa/schema/base_tie_schema.yml b/openoa/schema/base_tie_schema.yml
@@ -12,13 +12,13 @@ scada:
     dtype: float
     units: m/s
   frequency:
-  - min
-  - ms
   - us
+  - ns
   - D
   - s
-  - ns
   - h
+  - ms
+  - min
 reanalysis:
   WMETR_HorWdSpd:
     name: WMETR_HorWdSpd
@@ -33,10 +33,10 @@ reanalysis:
     dtype: float
     units: kg/m^3
   frequency:
-  - min
-  - ms
   - us
+  - ns
   - D
   - s
-  - ns
   - h
+  - ms
+  - min
diff --git a/openoa/schema/base_yaw_misalignmental_losses_schema.json b/openoa/schema/base_yaw_misalignmental_losses_schema.json
@@ -33,12 +33,12 @@
       "units": null
     },
     "frequency": [
-      "min",
-      "ms",
       "us",
-      "s",
       "ns",
-      "h"
+      "s",
+      "h",
+      "ms",
+      "min"
     ]
   }
 }
diff --git a/openoa/schema/base_yaw_misalignmental_losses_schema.yml b/openoa/schema/base_yaw_misalignmental_losses_schema.yml
@@ -20,12 +20,12 @@ scada:
     dtype: float
     units: deg
   frequency:
-  - min
-  - ms
   - us
-  - s
   - ns
+  - s
   - h
+  - ms
+  - min
 asset:
   rated_power:
     name: rated_power

diff --git a/openoa/schema/metadata.py b/openoa/schema/metadata.py
@@ -191,7 +191,8 @@ def convert_frequency(offset: str) -> str:
             "min", "s", "ms", "us", "ns", "M", "H", "T", "S", "L", "U", or "N".
     """
     # Separate leading digits and the offset code
-    offset_digits, *_ = re.findall(r"\d+", offset)
+    offset_digits = re.findall(r"\d+", offset)
+    offset_digits = "" if offset_digits == [] else offset_digits[0]
     offset_str = offset.translate(remove_digits)
 
     # Check the code is a valid format

diff --git a/openoa/schema/scada_wake_losses_schema.json b/openoa/schema/scada_wake_losses_schema.json
@@ -28,12 +28,12 @@
       "units": "m/s"
     },
     "frequency": [
-      "min",
-      "ms",
       "us",
-      "s",
       "ns",
-      "h"
+      "s",
+      "h",
+      "ms",
+      "min"
     ]
   },
   "scada": {
@@ -58,12 +58,12 @@
       "units": null
     },
     "frequency": [
-      "min",
-      "ms",
       "us",
-      "s",
       "ns",
-      "h"
+      "s",
+      "h",
+      "ms",
+      "min"
     ]
   }
 }
diff --git a/openoa/schema/scada_wake_losses_schema.yml b/openoa/schema/scada_wake_losses_schema.yml
@@ -16,12 +16,12 @@ scada:
     dtype: float
     units: deg
   frequency:
-  - min
-  - ms
   - us
-  - s
   - ns
+  - s
   - h
+  - ms
+  - min
 asset:
   latitude:
     name: latitude
@@ -45,9 +45,9 @@ reanalysis:
     dtype: float
     units: deg
   frequency:
-  - min
-  - ms
   - us
-  - s
   - ns
+  - s
   - h
+  - ms
+  - min