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.

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

Desaggregate heat pumps #905

Merged
merged 126 commits into from
Feb 2, 2023
Merged

Desaggregate heat pumps #905

merged 126 commits into from
Feb 2, 2023

Conversation

nailend
Copy link
Contributor

@nailend nailend commented Sep 5, 2022

Fixes #903 .

Necessary branches/ merged to dev yet:

  • features/#962-final-buildings-mapping
  • fixes/#985-create-unique-ids-on-generated-tasks
  • features/#684-distribute-pv-rooftop-buildings-3
  • fixes/#1031-fix-weather-cells-mapping
  • fixes/#989-mismatch-cts-bus-id
  • features/#987-add-distribution-rural-heatpumps

TODO:

  • module docstring @birgits
  • is it ok that SH run is not possible to be run on a local computer RAM < 64gb
  • check DE run results @birgits

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.

@nailend nailend added the 🏗️ integration Integrating a data processing step label Sep 5, 2022
@nailend nailend self-assigned this Sep 5, 2022
@nailend nailend marked this pull request as draft September 12, 2022 08:07
@nailend nailend marked this pull request as ready for review September 12, 2022 10:27
@nailend nailend marked this pull request as draft September 12, 2022 10:27
@@ -1092,6 +1092,9 @@ emobility_mit:
export_results_to_csv: True
parallel_tasks: 10

demand_timeseries_mvgd:
parallel_tasks: 10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We experienced more stable runs with only 5 tasks - change for now until #1034 is solved @birgits ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I can change it!

@ClaraBuettner
Copy link
Contributor

Hi @nailend,
I need to add a dependency from the new task that you have added here to one of my tasks on another feature-branch. I talked to @birgits and she said that I can push this into this branch.
I tried to do so, but already before my changes I can not start airflow on this branch:

Traceback (most recent call last):
  File "/home/clara/test-egon-data/venv/lib/python3.8/site-packages/airflow/models/dagbag.py", line 256, in process_file
    m = imp.load_source(mod_name, filepath)
  File "/usr/lib/python3.8/imp.py", line 171, in load_source
    module = _load(spec)
  File "<frozen importlib._bootstrap>", line 702, in _load
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 848, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/home/clara/test-egon-data/eGon-data/src/egon/data/airflow/dags/pipeline.py", line 51, in <module>
    from egon.data.datasets.heat_supply import HeatSupply
  File "/home/clara/test-egon-data/eGon-data/src/egon/data/datasets/heat_supply/__init__.py", line 12, in <module>
    from egon.data.datasets.heat_supply.individual_heating import (
  File "/home/clara/test-egon-data/eGon-data/src/egon/data/datasets/heat_supply/individual_heating.py", line 204, in <module>
    from egon.data.datasets.electricity_demand_timeseries.mapping import (
ModuleNotFoundError: No module named 'egon.data.datasets.electricity_demand_timeseries.mapping'

Do you already know about this problem?

@birgits
Copy link
Contributor

birgits commented Nov 30, 2022

@ClaraBuettner that is because you also need another branch. I usually merge this branch into the current CI that contains all other branches you need and test it then.

@nesnoj
Copy link
Member

nesnoj commented Dec 12, 2022

@birgits I've set the no of parallel connections back to 10 in 7b7aeb1 by reverting 3111d68.

PS: A merge of dev into this branch would do it good :)

@nesnoj
Copy link
Member

nesnoj commented Dec 23, 2022

[ ] check DE run results @birgits

Have you done this @birgits?

I started to merge dev into this branch but gave up at cts_buildings.py as it was too freaky o_O ....I think you gotta do this

@birgits
Copy link
Contributor

birgits commented Jan 5, 2023

Yup, I checked the DE results and they look good!

@nailend
Copy link
Contributor Author

nailend commented Jan 10, 2023

I started to merge dev into this branch but gave up at cts_buildings.py as it was too freaky o_O ....I think you gotta do this

Will take care today!

@nailend
Copy link
Contributor Author

nailend commented Jan 10, 2023

@nesnoj @birgits conflicts are solved. But #986 is still missing in the dev... @gnn are you done with it? from 5e5946f I assume, it might already have passed it final test?!

@birgits
Copy link
Contributor

birgits commented Jan 23, 2023

@gnn merged his stuff. @nailend do you need to merge the dev again or can @nesnoj start his review?

@nailend
Copy link
Contributor Author

nailend commented Jan 23, 2023

@gnn merged his stuff.

Are you sure ? The PR #986 is still open...

@birgits
Copy link
Contributor

birgits commented Jan 23, 2023

No, sorry, I haven't checked it, it's just what @gnn told me... @gnn can you please check if #986 still needs to be merged/closed whatever?!

@nesnoj
Copy link
Member

nesnoj commented Jan 26, 2023

No, sorry, I haven't checked it, it's just what @gnn told me... @gnn can you please check if #986 still needs to be merged/closed whatever?!

That one has been merged, thanks @gnn .

@nesnoj
Copy link
Member

nesnoj commented Jan 26, 2023

@gnn merged his stuff. @nailend do you need to merge the dev again or can @nesnoj start his review?

I'm afraid that I do not have the time for a decent review of the HP disaggregation :(

@ClaraBuettner
Copy link
Contributor

ClaraBuettner commented Jan 31, 2023

I have a PR that needs the changes of this branch (#1027) and I would like to merge it. Do you have an idea when this PR will be merged @nesnoj ?

@nesnoj
Copy link
Member

nesnoj commented Feb 1, 2023

I have a PR that needs the changes of this branch (#1027) and I would like to merge it. Do you have an idea when this PR will be merged @nesnoj ?

No, but @birgits @nailend ?

@nailend nailend merged commit d021716 into dev Feb 2, 2023
@nailend nailend deleted the features/#903-desaggregate-heat-pumps branch February 2, 2023 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏗️ integration Integrating a data processing step
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Heat pump desaggregation to buildings
4 participants