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

Jump to bottom

Include open_MODEX project meeting feedback #37

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

Include open_MODEX project meeting feedback #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49ef85a
fix typo
jh-RLI Nov 4, 2020
b914283
change data types, update description
jh-RLI Nov 4, 2020
eb613b5
update changelog
jh-RLI Nov 4, 2020
5549fec
fix typo
jh-RLI Nov 4, 2020
bece04a
update erm and erm.pdf for concrete and normalization
jh-RLI Nov 4, 2020
f9522ad
fix whitespace in data type
jh-RLI Nov 4, 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
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ Here is a template for new release sections
### Added

### Changed

- include feedback from open_MODEX project meeting in [PR#37], this includes:
- changing scenarion.year type to postgis tstzrange and .region type to json
- timeseries fix typos in description fields
- scalar.region updating description field
- updated ERM´s

## [1.1.0]

Expand Down
4 changes: 2 additions & 2 deletions oedatamodel/latest/v110/OEDataModel-concrete.er
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[Scenario] {bgcolor: "#c1d6c1"}
*'id (bigint)'
'scenario (text)'
'region (array(text))'
'year (int)'
'region (json)'
'year (tstzrange )'
'source (text)'
'comment (text)'

Expand Down
Binary file modified oedatamodel/latest/v110/OEDataModel-concrete.pdf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions oedatamodel/latest/v110/OEDataModel-normalization.er
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[Scenario] {bgcolor: "#c1d6c1"}
*'id (bigint)'
'scenario (text)'
'region (array(text))'
'year (int)'
'region (json)'
'year (tstzrange )'
'source (text)'
'comment (text)'

Expand Down
Binary file modified oedatamodel/latest/v110/OEDataModel-normalization.pdf
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions ...t/v110/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 @@ -63,8 +63,8 @@
"fields": [
{"name": "id", "description": "Unique identifier", "type": "bigint", "unit": null},
{"name": "scenario", "description": "Scenario name", "type": "text", "unit": null},
{"name": "region", "description": "Country or region", "type": "text array", "unit": null},
{"name": "year", "description": "Year", "type": "integer", "unit": null},
{"name": "region", "description": "Country or region, you can add a upper region with sub regions using json syntax", "type": "json", "unit": null},
{"name": "year", "description": "Year, Range of timestamp with time zone", "type": "tstzrange", "unit": null},
{"name": "source", "description": "Source", "type": "text", "unit": null},
{"name": "comment", "description": "Comment", "type": "text", "unit": null} ],
"primaryKey": ["id"],
Expand All @@ -86,7 +86,7 @@
"fields": [
{"name": "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": "region", "description": "Country or region, add a flow from region a -> b: ['a', 'b']", "type": "text array", "unit": null},
{"name": "year", "description": "Year", "type": "integer", "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},
Expand Down Expand Up @@ -123,8 +123,8 @@
{"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_start", "description": "Start timestamp", "type": "timestamp", "unit": null},
{"name": "timeindex_stop", "description": "Stop timestamp", "type": "timestamp", "unit": null},
{"name": "timeindex_resolution", "description": "Timesteps", "type": "interval", "unit": null},
{"name": "series", "description": "Timesteps", "type": "float array", "unit": null},
{"name": "unit", "description": "Parameter unit", "type": "text", "unit": null},
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 @@ -63,8 +63,8 @@
"fields": [
{"name": "id", "description": "Unique identifier", "type": "bigint", "unit": null},
{"name": "scenario", "description": "Scenario name", "type": "text", "unit": null},
{"name": "region", "description": "Country or region", "type": "text array", "unit": null},
{"name": "year", "description": "Year", "type": "integer", "unit": null},
{"name": "region", "description": "Country or region, you can add a upper region with sub regions using json syntax", "type": "json", "unit": null},
{"name": "year", "description": "Year, Range of timestamp with time zone", "type": "tstzrange", "unit": null},
{"name": "source", "description": "Source", "type": "text", "unit": null},
{"name": "comment", "description": "Comment", "type": "text", "unit": null} ],
"primaryKey": ["id"],
Expand All @@ -86,7 +86,7 @@
"fields": [
{"name": "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": "region", "description": "Country or region, add a flow from region a -> b: ['a', 'b']", "type": "text array", "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},
Expand Down Expand Up @@ -137,8 +137,8 @@
"schema": {
"fields": [
{"name": "id", "description": "Unique identifier", "type": "bigint", "unit": null},
{"name": "timeindex_start", "description": "Start timestemp", "type": "timestamp", "unit": null},
{"name": "timeindex_stop", "description": "Stop timestemp", "type": "timestamp", "unit": null},
{"name": "timeindex_start", "description": "Start timestamp", "type": "timestamp", "unit": null},
{"name": "timeindex_stop", "description": "Stop timestamp", "type": "timestamp", "unit": null},
{"name": "timeindex_resolution", "description": "Timesteps", "type": "interval", "unit": null},
{"name": "series", "description": "Timesteps", "type": "float array", "unit": null} ],
"primaryKey": ["data_id"],
Expand Down