feat: Add ERA5 ensemble with spread aggregations and ECMWF IFS long w…

…indow assimilation (#118)
open-meteo · Jul 24, 2024 · a06b92e · a06b92e
1 parent ed24c2d
commit a06b92e
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 8 deletions.
diff --git a/csharp/openmeteo_sdk/Aggregation.cs b/csharp/openmeteo_sdk/Aggregation.cs
@@ -18,6 +18,7 @@ public enum Aggregation : byte
   p90 = 8,
   dominant = 9,
   sum = 10,
+  spread = 11,
 };
 
 

diff --git a/csharp/openmeteo_sdk/Model.cs b/csharp/openmeteo_sdk/Model.cs
@@ -83,6 +83,10 @@ public enum Model : byte
   dmi_seamless = 73,
   dmi_harmonie_arome_europe = 74,
   metno_seamless = 75,
+  era5_ensemble = 76,
+  ecmwf_ifs_analysis = 77,
+  ecmwf_ifs_long_window = 78,
+  ecmwf_ifs_analysis_long_window = 79,
 };
 
 

diff --git a/flatbuffers/weather_api.fbs b/flatbuffers/weather_api.fbs
@@ -128,7 +128,11 @@ enum Model: ubyte {
   knmi_harmonie_arome_netherlands,
   dmi_seamless,
   dmi_harmonie_arome_europe,
-  metno_seamless
+  metno_seamless,
+  era5_ensemble,
+  ecmwf_ifs_analysis,
+  ecmwf_ifs_long_window,
+  ecmwf_ifs_analysis_long_window
 }
 
 enum Variable: ubyte {
@@ -257,7 +261,8 @@ enum Aggregation: ubyte {
   p75,
   p90,
   dominant,
-  sum
+  sum,
+  spread
 }
 
 table VariableWithValues {

diff --git a/java/com/openmeteo/sdk/Aggregation.java b/java/com/openmeteo/sdk/Aggregation.java
@@ -16,8 +16,9 @@ private Aggregation() { }
   public static final int p90 = 8;
   public static final int dominant = 9;
   public static final int sum = 10;
+  public static final int spread = 11;
 
-  public static final String[] names = { "none", "minimum", "maximum", "mean", "p10", "p25", "median", "p75", "p90", "dominant", "sum", };
+  public static final String[] names = { "none", "minimum", "maximum", "mean", "p10", "p25", "median", "p75", "p90", "dominant", "sum", "spread", };
 
   public static String name(int e) { return names[e]; }
 }

diff --git a/java/com/openmeteo/sdk/Model.java b/java/com/openmeteo/sdk/Model.java
@@ -81,8 +81,12 @@ private Model() { }
   public static final int dmi_seamless = 73;
   public static final int dmi_harmonie_arome_europe = 74;
   public static final int metno_seamless = 75;
+  public static final int era5_ensemble = 76;
+  public static final int ecmwf_ifs_analysis = 77;
+  public static final int ecmwf_ifs_long_window = 78;
+  public static final int ecmwf_ifs_analysis_long_window = 79;
 
-  public static final String[] names = { "undefined", "best_match", "gfs_seamless", "gfs_global", "gfs_hrrr", "meteofrance_seamless", "meteofrance_arpege_seamless", "meteofrance_arpege_world", "meteofrance_arpege_europe", "meteofrance_arome_seamless", "meteofrance_arome_france", "meteofrance_arome_france_hd", "jma_seamless", "jma_msm", "jms_gsm", "jma_gsm", "gem_seamless", "gem_global", "gem_regional", "gem_hrdps_continental", "icon_seamless", "icon_global", "icon_eu", "icon_d2", "ecmwf_ifs04", "metno_nordic", "era5_seamless", "era5", "cerra", "era5_land", "ecmwf_ifs", "gwam", "ewam", "glofas_seamless_v3", "glofas_forecast_v3", "glofas_consolidated_v3", "glofas_seamless_v4", "glofas_forecast_v4", "glofas_consolidated_v4", "gfs025", "gfs05", "CMCC_CM2_VHR4", "FGOALS_f3_H_highresSST", "FGOALS_f3_H", "HiRAM_SIT_HR", "MRI_AGCM3_2_S", "EC_Earth3P_HR", "MPI_ESM1_2_XR", "NICAM16_8S", "cams_europe", "cams_global", "cfsv2", "era5_ocean", "cma_grapes_global", "bom_access_global", "bom_access_global_ensemble", "arpae_cosmo_seamless", "arpae_cosmo_2i", "arpae_cosmo_2i_ruc", "arpae_cosmo_5m", "ecmwf_ifs025", "ecmwf_aifs025", "gfs013", "gfs_graphcast025", "ecmwf_wam025", "meteofrance_wave", "meteofrance_currents", "ecmwf_wam025_ensemble", "ncep_gfswave025", "ncep_gefswave025", "knmi_seamless", "knmi_harmonie_arome_europe", "knmi_harmonie_arome_netherlands", "dmi_seamless", "dmi_harmonie_arome_europe", "metno_seamless", };
+  public static final String[] names = { "undefined", "best_match", "gfs_seamless", "gfs_global", "gfs_hrrr", "meteofrance_seamless", "meteofrance_arpege_seamless", "meteofrance_arpege_world", "meteofrance_arpege_europe", "meteofrance_arome_seamless", "meteofrance_arome_france", "meteofrance_arome_france_hd", "jma_seamless", "jma_msm", "jms_gsm", "jma_gsm", "gem_seamless", "gem_global", "gem_regional", "gem_hrdps_continental", "icon_seamless", "icon_global", "icon_eu", "icon_d2", "ecmwf_ifs04", "metno_nordic", "era5_seamless", "era5", "cerra", "era5_land", "ecmwf_ifs", "gwam", "ewam", "glofas_seamless_v3", "glofas_forecast_v3", "glofas_consolidated_v3", "glofas_seamless_v4", "glofas_forecast_v4", "glofas_consolidated_v4", "gfs025", "gfs05", "CMCC_CM2_VHR4", "FGOALS_f3_H_highresSST", "FGOALS_f3_H", "HiRAM_SIT_HR", "MRI_AGCM3_2_S", "EC_Earth3P_HR", "MPI_ESM1_2_XR", "NICAM16_8S", "cams_europe", "cams_global", "cfsv2", "era5_ocean", "cma_grapes_global", "bom_access_global", "bom_access_global_ensemble", "arpae_cosmo_seamless", "arpae_cosmo_2i", "arpae_cosmo_2i_ruc", "arpae_cosmo_5m", "ecmwf_ifs025", "ecmwf_aifs025", "gfs013", "gfs_graphcast025", "ecmwf_wam025", "meteofrance_wave", "meteofrance_currents", "ecmwf_wam025_ensemble", "ncep_gfswave025", "ncep_gefswave025", "knmi_seamless", "knmi_harmonie_arome_europe", "knmi_harmonie_arome_netherlands", "dmi_seamless", "dmi_harmonie_arome_europe", "metno_seamless", "era5_ensemble", "ecmwf_ifs_analysis", "ecmwf_ifs_long_window", "ecmwf_ifs_analysis_long_window", };
 
   public static String name(int e) { return names[e]; }
 }

diff --git a/kotlin/com/openmeteo/sdk/Aggregation.kt b/kotlin/com/openmeteo/sdk/Aggregation.kt
@@ -16,5 +16,6 @@ class Aggregation private constructor() {
         const val p90: UByte = 8u
         const val dominant: UByte = 9u
         const val sum: UByte = 10u
+        const val spread: UByte = 11u
     }
 }
diff --git a/kotlin/com/openmeteo/sdk/Model.kt b/kotlin/com/openmeteo/sdk/Model.kt
@@ -81,5 +81,9 @@ class Model private constructor() {
         const val dmi_seamless: UByte = 73u
         const val dmi_harmonie_arome_europe: UByte = 74u
         const val metno_seamless: UByte = 75u
+        const val era5_ensemble: UByte = 76u
+        const val ecmwf_ifs_analysis: UByte = 77u
+        const val ecmwf_ifs_long_window: UByte = 78u
+        const val ecmwf_ifs_analysis_long_window: UByte = 79u
     }
 }
diff --git a/python/openmeteo_sdk/Aggregation.py b/python/openmeteo_sdk/Aggregation.py
@@ -14,3 +14,4 @@ class Aggregation(object):
     p90 = 8
     dominant = 9
     sum = 10
+    spread = 11
diff --git a/python/openmeteo_sdk/Model.py b/python/openmeteo_sdk/Model.py
@@ -79,3 +79,7 @@ class Model(object):
     dmi_seamless = 73
     dmi_harmonie_arome_europe = 74
     metno_seamless = 75
+    era5_ensemble = 76
+    ecmwf_ifs_analysis = 77
+    ecmwf_ifs_long_window = 78
+    ecmwf_ifs_analysis_long_window = 79
diff --git a/swift/Sources/OpenMeteoSdk/weather_api_generated.swift b/swift/Sources/OpenMeteoSdk/weather_api_generated.swift
@@ -135,8 +135,12 @@ public enum openmeteo_sdk_Model: UInt8, Enum, Verifiable {
   case dmiSeamless = 73
   case dmiHarmonieAromeEurope = 74
   case metnoSeamless = 75
+  case era5Ensemble = 76
+  case ecmwfIfsAnalysis = 77
+  case ecmwfIfsLongWindow = 78
+  case ecmwfIfsAnalysisLongWindow = 79
 
-  public static var max: openmeteo_sdk_Model { return .metnoSeamless }
+  public static var max: openmeteo_sdk_Model { return .ecmwfIfsAnalysisLongWindow }
   public static var min: openmeteo_sdk_Model { return .undefined }
 }
 
@@ -278,8 +282,9 @@ public enum openmeteo_sdk_Aggregation: UInt8, Enum, Verifiable {
   case p90 = 8
   case dominant = 9
   case sum = 10
+  case spread = 11
 
-  public static var max: openmeteo_sdk_Aggregation { return .sum }
+  public static var max: openmeteo_sdk_Aggregation { return .spread }
   public static var min: openmeteo_sdk_Aggregation { return .none_ }
 }
 

diff --git a/ts/aggregation.ts b/ts/aggregation.ts
@@ -13,5 +13,6 @@ export enum Aggregation {
   p75 = 7,
   p90 = 8,
   dominant = 9,
-  sum = 10
+  sum = 10,
+  spread = 11
 }
diff --git a/ts/model.ts b/ts/model.ts
@@ -78,5 +78,9 @@ export enum Model {
   knmi_harmonie_arome_netherlands = 72,
   dmi_seamless = 73,
   dmi_harmonie_arome_europe = 74,
-  metno_seamless = 75
+  metno_seamless = 75,
+  era5_ensemble = 76,
+  ecmwf_ifs_analysis = 77,
+  ecmwf_ifs_long_window = 78,
+  ecmwf_ifs_analysis_long_window = 79
 }