From f166b8d170575c55a961da5c9fd54897de643f17 Mon Sep 17 00:00:00 2001 From: patrick-zippenfenig Date: Tue, 11 Jun 2024 10:12:40 +0200 Subject: [PATCH] fix: register meteofrance wave and ocean currents models --- csharp/openmeteo_sdk/Model.cs | 2 ++ csharp/openmeteo_sdk/Variable.cs | 2 ++ flatbuffers/weather_api.fbs | 8 ++++++-- java/com/openmeteo/sdk/Model.java | 4 +++- java/com/openmeteo/sdk/Variable.java | 4 +++- kotlin/com/openmeteo/sdk/Model.kt | 2 ++ kotlin/com/openmeteo/sdk/Variable.kt | 2 ++ python/openmeteo_sdk/Model.py | 2 ++ python/openmeteo_sdk/Variable.py | 2 ++ swift/Sources/OpenMeteoSdk/weather_api_generated.swift | 8 ++++++-- ts/model.ts | 4 +++- ts/variable.ts | 4 +++- 12 files changed, 36 insertions(+), 8 deletions(-) diff --git a/csharp/openmeteo_sdk/Model.cs b/csharp/openmeteo_sdk/Model.cs index 33343f2..cd58622 100644 --- a/csharp/openmeteo_sdk/Model.cs +++ b/csharp/openmeteo_sdk/Model.cs @@ -72,6 +72,8 @@ public enum Model : byte gfs013 = 62, gfs_graphcast025 = 63, ecmwf_wam025 = 64, + meteofrance_wave = 65, + meteofrance_currents = 66, }; diff --git a/csharp/openmeteo_sdk/Variable.cs b/csharp/openmeteo_sdk/Variable.cs index f2525ee..6781773 100644 --- a/csharp/openmeteo_sdk/Variable.cs +++ b/csharp/openmeteo_sdk/Variable.cs @@ -115,6 +115,8 @@ public enum Variable : byte shortwave_radiation_clear_sky = 105, global_tilted_irradiance = 106, global_tilted_irradiance_instant = 107, + ocean_current_velocity = 108, + ocean_current_direction = 109, }; diff --git a/flatbuffers/weather_api.fbs b/flatbuffers/weather_api.fbs index 294050f..ed77b09 100644 --- a/flatbuffers/weather_api.fbs +++ b/flatbuffers/weather_api.fbs @@ -117,7 +117,9 @@ enum Model: ubyte { ecmwf_aifs025, gfs013, gfs_graphcast025, - ecmwf_wam025 + ecmwf_wam025, + meteofrance_wave, + meteofrance_currents } enum Variable: ubyte { @@ -228,7 +230,9 @@ enum Variable: ubyte { convective_inhibition, shortwave_radiation_clear_sky, global_tilted_irradiance, - global_tilted_irradiance_instant + global_tilted_irradiance_instant, + ocean_current_velocity, + ocean_current_direction } enum Aggregation: ubyte { diff --git a/java/com/openmeteo/sdk/Model.java b/java/com/openmeteo/sdk/Model.java index bee3c60..b7d9449 100644 --- a/java/com/openmeteo/sdk/Model.java +++ b/java/com/openmeteo/sdk/Model.java @@ -70,8 +70,10 @@ private Model() { } public static final int gfs013 = 62; public static final int gfs_graphcast025 = 63; public static final int ecmwf_wam025 = 64; + public static final int meteofrance_wave = 65; + public static final int meteofrance_currents = 66; - 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", }; + 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", }; public static String name(int e) { return names[e]; } } diff --git a/java/com/openmeteo/sdk/Variable.java b/java/com/openmeteo/sdk/Variable.java index 9cd8ca3..aece62b 100644 --- a/java/com/openmeteo/sdk/Variable.java +++ b/java/com/openmeteo/sdk/Variable.java @@ -113,8 +113,10 @@ private Variable() { } public static final int shortwave_radiation_clear_sky = 105; public static final int global_tilted_irradiance = 106; public static final int global_tilted_irradiance_instant = 107; + public static final int ocean_current_velocity = 108; + public static final int ocean_current_direction = 109; - public static final String[] names = { "undefined", "apparent_temperature", "cape", "cloud_cover", "cloud_cover_high", "cloud_cover_low", "cloud_cover_mid", "daylight_duration", "dew_point", "diffuse_radiation", "diffuse_radiation_instant", "direct_normal_irradiance", "direct_normal_irradiance_instant", "direct_radiation", "direct_radiation_instant", "et0_fao_evapotranspiration", "evapotranspiration", "freezing_level_height", "growing_degree_days", "is_day", "latent_heat_flux", "leaf_wetness_probability", "lifted_index", "lightning_potential", "precipitation", "precipitation_hours", "precipitation_probability", "pressure_msl", "rain", "relative_humidity", "runoff", "sensible_heat_flux", "shortwave_radiation", "shortwave_radiation_instant", "showers", "snow_depth", "snow_height", "snowfall", "snowfall_height", "snowfall_water_equivalent", "sunrise", "sunset", "soil_moisture", "soil_moisture_index", "soil_temperature", "surface_pressure", "surface_temperature", "temperature", "terrestrial_radiation", "terrestrial_radiation_instant", "total_column_integrated_water_vapour", "updraft", "uv_index", "uv_index_clear_sky", "vapour_pressure_deficit", "visibility", "weather_code", "wind_direction", "wind_gusts", "wind_speed", "vertical_velocity", "geopotential_height", "wet_bulb_temperature", "river_discharge", "wave_height", "wave_period", "wave_direction", "wind_wave_height", "wind_wave_period", "wind_wave_peak_period", "wind_wave_direction", "swell_wave_height", "swell_wave_period", "swell_wave_peak_period", "swell_wave_direction", "pm10", "pm2p5", "dust", "aerosol_optical_depth", "carbon_monoxide", "nitrogen_dioxide", "ammonia", "ozone", "sulphur_dioxide", "alder_pollen", "birch_pollen", "grass_pollen", "mugwort_pollen", "olive_pollen", "ragweed_pollen", "european_aqi", "european_aqi_pm2p5", "european_aqi_pm10", "european_aqi_nitrogen_dioxide", "european_aqi_ozone", "european_aqi_sulphur_dioxide", "us_aqi", "us_aqi_pm2p5", "us_aqi_pm10", "us_aqi_nitrogen_dioxide", "us_aqi_ozone", "us_aqi_sulphur_dioxide", "us_aqi_carbon_monoxide", "sunshine_duration", "convective_inhibition", "shortwave_radiation_clear_sky", "global_tilted_irradiance", "global_tilted_irradiance_instant", }; + public static final String[] names = { "undefined", "apparent_temperature", "cape", "cloud_cover", "cloud_cover_high", "cloud_cover_low", "cloud_cover_mid", "daylight_duration", "dew_point", "diffuse_radiation", "diffuse_radiation_instant", "direct_normal_irradiance", "direct_normal_irradiance_instant", "direct_radiation", "direct_radiation_instant", "et0_fao_evapotranspiration", "evapotranspiration", "freezing_level_height", "growing_degree_days", "is_day", "latent_heat_flux", "leaf_wetness_probability", "lifted_index", "lightning_potential", "precipitation", "precipitation_hours", "precipitation_probability", "pressure_msl", "rain", "relative_humidity", "runoff", "sensible_heat_flux", "shortwave_radiation", "shortwave_radiation_instant", "showers", "snow_depth", "snow_height", "snowfall", "snowfall_height", "snowfall_water_equivalent", "sunrise", "sunset", "soil_moisture", "soil_moisture_index", "soil_temperature", "surface_pressure", "surface_temperature", "temperature", "terrestrial_radiation", "terrestrial_radiation_instant", "total_column_integrated_water_vapour", "updraft", "uv_index", "uv_index_clear_sky", "vapour_pressure_deficit", "visibility", "weather_code", "wind_direction", "wind_gusts", "wind_speed", "vertical_velocity", "geopotential_height", "wet_bulb_temperature", "river_discharge", "wave_height", "wave_period", "wave_direction", "wind_wave_height", "wind_wave_period", "wind_wave_peak_period", "wind_wave_direction", "swell_wave_height", "swell_wave_period", "swell_wave_peak_period", "swell_wave_direction", "pm10", "pm2p5", "dust", "aerosol_optical_depth", "carbon_monoxide", "nitrogen_dioxide", "ammonia", "ozone", "sulphur_dioxide", "alder_pollen", "birch_pollen", "grass_pollen", "mugwort_pollen", "olive_pollen", "ragweed_pollen", "european_aqi", "european_aqi_pm2p5", "european_aqi_pm10", "european_aqi_nitrogen_dioxide", "european_aqi_ozone", "european_aqi_sulphur_dioxide", "us_aqi", "us_aqi_pm2p5", "us_aqi_pm10", "us_aqi_nitrogen_dioxide", "us_aqi_ozone", "us_aqi_sulphur_dioxide", "us_aqi_carbon_monoxide", "sunshine_duration", "convective_inhibition", "shortwave_radiation_clear_sky", "global_tilted_irradiance", "global_tilted_irradiance_instant", "ocean_current_velocity", "ocean_current_direction", }; public static String name(int e) { return names[e]; } } diff --git a/kotlin/com/openmeteo/sdk/Model.kt b/kotlin/com/openmeteo/sdk/Model.kt index 33f2bc6..46a7178 100644 --- a/kotlin/com/openmeteo/sdk/Model.kt +++ b/kotlin/com/openmeteo/sdk/Model.kt @@ -70,5 +70,7 @@ class Model private constructor() { const val gfs013: UByte = 62u const val gfs_graphcast025: UByte = 63u const val ecmwf_wam025: UByte = 64u + const val meteofrance_wave: UByte = 65u + const val meteofrance_currents: UByte = 66u } } diff --git a/kotlin/com/openmeteo/sdk/Variable.kt b/kotlin/com/openmeteo/sdk/Variable.kt index 0a40677..ac0dc3b 100644 --- a/kotlin/com/openmeteo/sdk/Variable.kt +++ b/kotlin/com/openmeteo/sdk/Variable.kt @@ -113,5 +113,7 @@ class Variable private constructor() { const val shortwave_radiation_clear_sky: UByte = 105u const val global_tilted_irradiance: UByte = 106u const val global_tilted_irradiance_instant: UByte = 107u + const val ocean_current_velocity: UByte = 108u + const val ocean_current_direction: UByte = 109u } } diff --git a/python/openmeteo_sdk/Model.py b/python/openmeteo_sdk/Model.py index cd965fd..cbd5e69 100644 --- a/python/openmeteo_sdk/Model.py +++ b/python/openmeteo_sdk/Model.py @@ -68,3 +68,5 @@ class Model(object): gfs013 = 62 gfs_graphcast025 = 63 ecmwf_wam025 = 64 + meteofrance_wave = 65 + meteofrance_currents = 66 diff --git a/python/openmeteo_sdk/Variable.py b/python/openmeteo_sdk/Variable.py index e750ce4..4545211 100644 --- a/python/openmeteo_sdk/Variable.py +++ b/python/openmeteo_sdk/Variable.py @@ -111,3 +111,5 @@ class Variable(object): shortwave_radiation_clear_sky = 105 global_tilted_irradiance = 106 global_tilted_irradiance_instant = 107 + ocean_current_velocity = 108 + ocean_current_direction = 109 diff --git a/swift/Sources/OpenMeteoSdk/weather_api_generated.swift b/swift/Sources/OpenMeteoSdk/weather_api_generated.swift index 25407d2..bc046a2 100644 --- a/swift/Sources/OpenMeteoSdk/weather_api_generated.swift +++ b/swift/Sources/OpenMeteoSdk/weather_api_generated.swift @@ -124,8 +124,10 @@ public enum openmeteo_sdk_Model: UInt8, Enum, Verifiable { case gfs013 = 62 case gfsGraphcast025 = 63 case ecmwfWam025 = 64 + case meteofranceWave = 65 + case meteofranceCurrents = 66 - public static var max: openmeteo_sdk_Model { return .ecmwfWam025 } + public static var max: openmeteo_sdk_Model { return .meteofranceCurrents } public static var min: openmeteo_sdk_Model { return .undefined } } @@ -242,8 +244,10 @@ public enum openmeteo_sdk_Variable: UInt8, Enum, Verifiable { case shortwaveRadiationClearSky = 105 case globalTiltedIrradiance = 106 case globalTiltedIrradianceInstant = 107 + case oceanCurrentVelocity = 108 + case oceanCurrentDirection = 109 - public static var max: openmeteo_sdk_Variable { return .globalTiltedIrradianceInstant } + public static var max: openmeteo_sdk_Variable { return .oceanCurrentDirection } public static var min: openmeteo_sdk_Variable { return .undefined } } diff --git a/ts/model.ts b/ts/model.ts index 82f06ee..400372a 100644 --- a/ts/model.ts +++ b/ts/model.ts @@ -67,5 +67,7 @@ export enum Model { ecmwf_aifs025 = 61, gfs013 = 62, gfs_graphcast025 = 63, - ecmwf_wam025 = 64 + ecmwf_wam025 = 64, + meteofrance_wave = 65, + meteofrance_currents = 66 } diff --git a/ts/variable.ts b/ts/variable.ts index 5add83c..8c7ef7b 100644 --- a/ts/variable.ts +++ b/ts/variable.ts @@ -110,5 +110,7 @@ export enum Variable { convective_inhibition = 104, shortwave_radiation_clear_sky = 105, global_tilted_irradiance = 106, - global_tilted_irradiance_instant = 107 + global_tilted_irradiance_instant = 107, + ocean_current_velocity = 108, + ocean_current_direction = 109 }