Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add ERA5 ensemble with spread aggregations and ECMWF IFS models #118

Merged
merged 1 commit into from
Jul 24, 2024
Merged

feat: Add ERA5 ensemble with spread aggregations and ECMWF IFS models #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions csharp/openmeteo_sdk/Aggregation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public enum Aggregation : byte
p90 = 8,
dominant = 9,
sum = 10,
spread = 11,
};


Expand Down
4 changes: 4 additions & 0 deletions csharp/openmeteo_sdk/Model.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};


Expand Down
9 changes: 7 additions & 2 deletions flatbuffers/weather_api.fbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -257,7 +261,8 @@ enum Aggregation: ubyte {
p75,
p90,
dominant,
sum
sum,
spread
}

table VariableWithValues {
Expand Down
3 changes: 2 additions & 1 deletion java/com/openmeteo/sdk/Aggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]; }
}
Expand Down
6 changes: 5 additions & 1 deletion java/com/openmeteo/sdk/Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]; }
}
Expand Down
1 change: 1 addition & 0 deletions kotlin/com/openmeteo/sdk/Aggregation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
4 changes: 4 additions & 0 deletions kotlin/com/openmeteo/sdk/Model.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
1 change: 1 addition & 0 deletions python/openmeteo_sdk/Aggregation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ class Aggregation(object):
p90 = 8
dominant = 9
sum = 10
spread = 11
4 changes: 4 additions & 0 deletions python/openmeteo_sdk/Model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions swift/Sources/OpenMeteoSdk/weather_api_generated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}

Expand Down Expand Up @@ -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_ }
}

Expand Down
3 changes: 2 additions & 1 deletion ts/aggregation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ export enum Aggregation {
p75 = 7,
p90 = 8,
dominant = 9,
sum = 10
sum = 10,
spread = 11
}
6 changes: 5 additions & 1 deletion ts/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Loading