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

Release/oedatamodel v1.0.0 #28

Merged
merged 5 commits into from
Sep 28, 2020
Merged

Release/oedatamodel v1.0.0 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5fadc80
fix wrong column name and PK
jh-RLI Sep 28, 2020
da0e70a
update field description
jh-RLI Sep 28, 2020
4bfd2c2
fix wrong data type, add field description
jh-RLI Sep 28, 2020
5955fab
update ERM
jh-RLI Sep 28, 2020
74c379b
Merge pull request #27 from OpenEnergyPlatform/hotfix/release_v1.0.0
jh-RLI Sep 28, 2020
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
Binary file modified oedatamodel/latest/v100/OEDataModel-concrete.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified oedatamodel/latest/v100/OEDataModel-normalization.pdf
View file
Open in desktop
Binary file not shown.
30 changes: 15 additions & 15 deletions ...t/v100/datapackage/OEDataModel-concrete-datapackage/OEDataModel-concrete-datapackage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"resources": [
{"profile": "tabular-data-resource",
"name": "model_draft.oed_concrete_scenario",
"path": "oedatamodel-concrete_scenario.csv",
"path": "OEDataModel-concrete_scenario.csv",
"format": "csv",
"encoding" : "UTF-8",
"schema": {
Expand All @@ -79,19 +79,19 @@

{"profile": "tabular-data-resource",
"name": "model_draft.oed_concrete_scalar",
"path": "oedatamodel-concrete_scalar.csv",
"path": "OEDataModel-concrete_scalar.csv",
"format": "csv",
"encoding" : "UTF-8",
"schema": {
"fields": [
{"name": "scalar_id", "description": "Unique identifier", "type": "bigint", "unit": null},
{"name": "scenario_id", "description": "Scenario name", "type": "bigint", "unit": null},
{"name": "region", "description": "Country or region", "type": "text array", "unit": null},
{"name": "input_energy_vector", "description": "", "type": "integer", "unit": null},
{"name": "output_energy_vector", "description": "", "type": "text", "unit": null},
{"name": "parameter_name", "description": "", "type": "text", "unit": null},
{"name": "technology", "description": "", "type": "text", "unit": null},
{"name": "technology_type", "description": "", "type": "text", "unit": null},
{"name": "input_energy_vector", "description": "It describes any type of energy or energy carrier (e.g. electricity, heat, solar radiation, natural gas, ...) that enters a technology.", "type": "text", "unit": null},
{"name": "output_energy_vector", "description": "It describes any type of energy or energy carrier (e.g. electricity, heat, hydrogen, LNG, CO2, ...) that exits a technology.", "type": "text", "unit": null},
{"name": "parameter_name", "description": "It describes a considered property of an element in the energy system.", "type": "text", "unit": null},
{"name": "technology", "description": "It describes an element of the modelled energy system that processes an energy vector.", "type": "text", "unit": null},
{"name": "technology_type", "description": "The specification can be technological, or freely user-defined, based on the requirements of the model.", "type": "text", "unit": null},
{"name": "value", "description": "Parameter value", "type": "decimal", "unit": "kW"},
{"name": "unit", "description": "Parameter unit", "type": "text", "unit": null},
{"name": "tags", "description": "Free classification with key-value pairs", "type": "json", "unit": null},
Expand All @@ -109,19 +109,19 @@
"decimalSeparator": "."} },
{"profile": "tabular-data-resource",
"name": "model_draft.oed_concrete_timeseries",
"path": "oedatamodel-concrete_timeseries.csv",
"path": "OEDataModel-concrete_timeseries.csv",
"format": "csv",
"encoding" : "UTF-8",
"schema": {
"fields": [
{"name": "scalar_id", "description": "Unique identifier", "type": "bigint", "unit": null},
{"name": "timeseries_id", "description": "Unique identifier", "type": "bigint", "unit": null},
{"name": "scenario_id", "description": "Scenario name", "type": "bigint", "unit": null},
{"name": "region", "description": "Country or region", "type": "text array", "unit": null},
{"name": "input_energy_vector", "description": "", "type": "integer", "unit": null},
{"name": "output_energy_vector", "description": "", "type": "text", "unit": null},
{"name": "parameter_name", "description": "", "type": "text", "unit": null},
{"name": "technology", "description": "", "type": "text", "unit": null},
{"name": "technology_type", "description": "", "type": "text", "unit": null},
{"name": "input_energy_vector", "description": "It describes any type of energy or energy carrier (e.g. electricity, heat, solar radiation, natural gas, ...) that enters a technology.", "type": "text", "unit": null},
{"name": "output_energy_vector", "description": "It describes any type of energy or energy carrier (e.g. electricity, heat, hydrogen, LNG, CO2, ...) that exits a technology.", "type": "text", "unit": null},
{"name": "parameter_name", "description": "It describes a considered property of an element in the energy system.", "type": "text", "unit": null},
{"name": "technology", "description": "It describes an element of the modelled energy system that processes an energy vector.", "type": "text", "unit": null},
{"name": "technology_type", "description": "The specification can be technological, or freely user-defined, based on the requirements of the model.", "type": "text", "unit": null},
{"name": "timeindex_start", "description": "Start timestemp", "type": "timestamp", "unit": null},
{"name": "timeindex_stop", "description": "Stop timestemp", "type": "timestamp", "unit": null},
{"name": "timeindex_resolution", "description": "Timesteps", "type": "interval", "unit": null},
Expand All @@ -131,7 +131,7 @@
{"name": "method", "description": "Method type (sum, mean, median)", "type": "json", "unit": null},
{"name": "source", "description": "Source", "type": "text", "unit": null},
{"name": "comment", "description": "Comment", "type": "text", "unit": null} ],
"primaryKey": ["scalar_id"],
"primaryKey": ["timeseries_id"],
"foreignKeys": [{
"fields": ["scenario_id"],
"reference": {
Expand Down
10 changes: 5 additions & 5 deletions ...apackage/OEDataModel-normalization-datapackage/OEDataModel-normalization-datapackage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
{"name": "data_id", "description": "Unique identifier", "type": "bigint", "unit": null},
{"name": "scenario_id", "description": "Scenario name", "type": "bigint", "unit": null},
{"name": "region", "description": "Country or region", "type": "text array", "unit": null},
{"name": "input_energy_vector", "description": "", "type": "integer", "unit": null},
{"name": "output_energy_vector", "description": "", "type": "text", "unit": null},
{"name": "parameter_name", "description": "", "type": "text", "unit": null},
{"name": "technology", "description": "", "type": "text", "unit": null},
{"name": "technology_type", "description": "", "type": "text", "unit": null},
{"name": "input_energy_vector", "description": "It describes any type of energy or energy carrier (e.g. electricity, heat, solar radiation, natural gas, ...) that enters a technology.", "type": "text", "unit": null},
{"name": "output_energy_vector", "description": "It describes any type of energy or energy carrier (e.g. electricity, heat, hydrogen, LNG, CO2, ...) that exits a technology.", "type": "text", "unit": null},
{"name": "parameter_name", "description": "It describes a considered property of an element in the energy system.", "type": "text", "unit": null},
{"name": "technology", "description": "It describes an element of the modelled energy system that processes an energy vector.", "type": "text", "unit": null},
{"name": "technology_type", "description": "The specification can be technological, or freely user-defined, based on the requirements of the model.", "type": "text", "unit": null},
{"name": "type", "description": "value: scalar or timeseries indicate the related table", "type": "text", "unit": null},
{"name": "unit", "description": "Parameter unit", "type": "text", "unit": null},
{"name": "tags", "description": "Free classification with key-value pairs", "type": "json", "unit": null},
Expand Down