Skip to content

Commit

Permalink
Merge branch 'dev' into fixes/#538-change-sign-H2CH4-loads
Browse files Browse the repository at this point in the history
  • Loading branch information
AmeliaNadal authored Dec 14, 2021
2 parents a557b05 + ed99142 commit cd0d6ff
Show file tree
Hide file tree
Showing 33 changed files with 1,802 additions and 1,048 deletions.
11 changes: 11 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Fixes # .

## Before merging into `dev`-branch, please make sure that

- [ ] the `CHANGELOG.rst` was updated.
- [ ] new and adjusted code is formated using `black` and `isort`.
- [ ] the `Dataset`-version is updated when existing datasets are adjusted.
- [ ] the branch was merged into the `continuous-integration/run-everything-over-the-weekend`- branch.
- [ ] the workflow is running successful in `test mode`.
- [ ] the workflow is running successful in `Everything` mode.

16 changes: 16 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@ Added
`#392 <https://github.com/openego/eGon-data/issues/392>`_
* Fill egon-etrago-generators table
`#485 <https://github.com/openego/eGon-data/issues/485>`_
* Include time-dependent coefficient of performance for heat pumps
`#532 <https://github.com/openego/eGon-data/issues/532>`_
* Limit number of parallel processes per task
`#265 <https://github.com/openego/eGon-data/issues/265>`_
* Include biomass CHP plants to eTraGo tables
`#498 <https://github.com/openego/eGon-data/issues/498>`_
* Include feedin time series for wind offshore
`#531 <https://github.com/openego/eGon-data/issues/531>`_

.. _PR #159: https://github.com/openego/eGon-data/pull/159

Expand Down Expand Up @@ -242,8 +250,14 @@ Changed
`#484 <https://github.com/openego/eGon-data/issues/484>`_
* Migrate dlr script to datasets
`#508 <https://github.com/openego/eGon-data/issues/508>`_
* Migrate loadarea scripts to datasets
`#525 <https://github.com/openego/eGon-data/issues/525>`_
* Migrate plot.py to dataset of district heating areas
`#527 <https://github.com/openego/eGon-data/issues/527>`_
* Migrate substation scripts to datasets
`#304 <https://github.com/openego/eGon-data/issues/304>`_
* Migrate zensus scripts to datasets
`#422 <https://github.com/openego/eGon-data/issues/422>`_


Bug fixes
Expand Down Expand Up @@ -317,3 +331,5 @@ Bug fixes
`#516 <https://github.com/openego/eGon-data/issues/516>`_
* Add missing 'sign' for CH4 and H2 loads
`#516 <https://github.com/openego/eGon-data/issues/538>`_
* Delete only AC loads for eTraGo in electricity_demand_etrago
`#535 <https://github.com/openego/eGon-data/issues/535>`_
Loading

0 comments on commit cd0d6ff

Please sign in to comment.