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

Feature/circ pump branch model #635

Open
wants to merge 57 commits into
base: develop
Choose a base branch
from
Open

Feature/circ pump branch model #635

wants to merge 57 commits into from

Commits on Jan 31, 2023

  1. enable multiple creation of heat exchanger

    sdrauz authored and sdrauz committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    7acdd48 View commit details
    Browse the repository at this point in the history

  2. Merge pull request e2nIEE#1 from senergyNets/workshop 

    enable multiple creation of heat exchanger
    @SimonRubenDrauz
    SimonRubenDrauz authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    b5deb90 View commit details
    Browse the repository at this point in the history

  3. adapted changelog and added doc for multiple heat exchanger

    sdrauz authored and sdrauz committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    d7cc21d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into develop

    @SimonRubenDrauz
    SimonRubenDrauz authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    4efccce View commit details
    Browse the repository at this point in the history

  5. not heat pumps, but heat exchanger

    sdrauz authored and sdrauz committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    fed9fc7 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into workshop

    @SimonRubenDrauz
    SimonRubenDrauz authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    61b54e0 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/workshop' into workshop 

    # Conflicts:
#	CHANGELOG.rst
    sdrauz authored and sdrauz committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    b393069 View commit details
    Browse the repository at this point in the history

  8. workshop material

    sdrauz authored and sdrauz committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    a06532e View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. workshop material

    sdrauz authored and sdrauz committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    9c954dc View commit details
    Browse the repository at this point in the history

  2. create a mutlinet simulation

    sdrauz authored and sdrauz committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    95e8aef View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into workshop

    sdrauz authored and sdrauz committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    fa26dbb View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'senergy/bugfix/multiple_pumps' into dev… 

    …elop
    sdrauz authored and sdrauz committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    5664c1f View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'senergy/bugfix/multiple_pumps' into wor… 

    …kshop
    sdrauz authored and sdrauz committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    430cab1 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. workshop preparation

    sdrauz authored and sdrauz committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    9b8ecef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github:e2niee/pandapipes into develop

    sdrauz authored and sdrauz committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    938625c View commit details
    Browse the repository at this point in the history

  3. further workshop updates

    sdrauz authored and sdrauz committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    b7041d2 View commit details
    Browse the repository at this point in the history

  4. starting multinet

    sdrauz authored and sdrauz committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    2b1ebfc View commit details
    Browse the repository at this point in the history

  5. multinet finalization

    sdrauz authored and sdrauz committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    dcc730f View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Merge remote-tracking branch 'origin/develop' into workshop

    sdrauz authored and sdrauz committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    2caccd3 View commit details
    Browse the repository at this point in the history

  2. adding projects from scratch

    sdrauz authored and sdrauz committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    283face View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. adapting circulation pumps to be full branch components and cleaning … 

    …up build system matrix
    sdrauz authored and sdrauz committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    a77342a View commit details
    Browse the repository at this point in the history

  2. bugfix in retrieving qext_w

    sdrauz authored and sdrauz committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    af9a336 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. - removing cp in the equations as it makes NR instable 

    - fixing slack equation position
- adding a new relevant idx branch to identify circ pumps
    sdrauz authored and sdrauz committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    35928c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2023

  1. Merge remote-tracking branch 'senergy/workshop' into feature/circ_pum… 

    …p_branch_model
    sdrauz authored and sdrauz committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    fbcd13b View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. removing workshop files

    sdrauz authored and sdrauz committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    c8b5f81 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/circ_pump_branch_model

    @SimonRubenDrauz
    SimonRubenDrauz authored Jun 9, 2023
    Configuration menu
    Copy the full SHA
    6e8f003 View commit details
    Browse the repository at this point in the history

  3. resetting setup.py

    sdrauz authored and sdrauz committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    64f7712 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. commenting build system matrix

    sdrauz authored and sdrauz committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    ef85aad View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Merge remote-tracking branch 'origin/develop' into feature/circ_pump_… 

    …branch_model

# Conflicts:
#	pandapipes/component_models/abstract_models/branch_models.py
#	pandapipes/idx_branch.py
#	src/pandapipes/component_models/abstract_models/circulation_pump.py
#	src/pandapipes/component_models/circulation_pump_pressure_component.py
#	src/pandapipes/component_models/junction_component.py
#	src/pandapipes/idx_node.py
#	src/pandapipes/pf/build_system_matrix.py
#	src/pandapipes/toolbox.py
    @SimonRubenDrauz
    SimonRubenDrauz committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    580593a View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. merge develop and further adaptions

    @SimonRubenDrauz
    SimonRubenDrauz committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    840c2f8 View commit details
    Browse the repository at this point in the history

  2. bugfix

    @SimonRubenDrauz
    SimonRubenDrauz committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    4fbe9cb View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge remote-tracking branch 'pp_fork/develop' into feature/circ_pump… 

    …_branch_model

# Conflicts:
#	src/pandapipes/pipeflow.py
#	src/pandapipes/test/api/test_components/test_circ_pump_mass.py
    @SimonRubenDrauz
    SimonRubenDrauz committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    8a8d94f View commit details
    Browse the repository at this point in the history

  2. required test adaption to ensure test passing

    @SimonRubenDrauz
    SimonRubenDrauz committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    feb302e View commit details
    Browse the repository at this point in the history

  3. - no mass creation in circ pumps 

    - required test adaption to ensure test passing
    @SimonRubenDrauz
    SimonRubenDrauz committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    f195ece View commit details
    Browse the repository at this point in the history

  4. - mass at slack as one variable 

    - no mass creation in circ pumps
- required test adaption to ensure test passing
    @SimonRubenDrauz
    SimonRubenDrauz committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    96da8d4 View commit details
    Browse the repository at this point in the history

  5. pandapower release fail

    @SimonRubenDrauz
    SimonRubenDrauz committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    adc00fc View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Merge remote-tracking branch 'origin/develop' into feature/circ_pump_… 

    …branch_model

# Conflicts:
#	setup.py
#	src/pandapipes/component_models/component_toolbox.py
#	src/pandapipes/pipeflow.py
    @SimonRubenDrauz
    SimonRubenDrauz committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    f711d95 View commit details
    Browse the repository at this point in the history

  2. update test heat consumer

    @SimonRubenDrauz
    SimonRubenDrauz committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    e905d23 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge branch 'develop' into feature/circ_pump_branch_model

    @dlohmeier
    dlohmeier authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    afb55d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge remote-tracking branch 'origin/develop' into feature/circ_pump_… 

    …branch_model

# Conflicts:
#	src/pandapipes/component_models/component_toolbox.py
    @SimonRubenDrauz
    SimonRubenDrauz committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    cb63793 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/circ_pump_branch_model' of https://github.com/r… 

    …etoflow/pandapipes into feature/circ_pump_branch_model
    @SimonRubenDrauz
    SimonRubenDrauz committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    1991278 View commit details
    Browse the repository at this point in the history

  3. convergence problems with new circ pump implementation --> increase o… 

    …f 2 iterations!
    @SimonRubenDrauz
    SimonRubenDrauz committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    9d6d465 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. use numpy setdiff instead of set in derivative calculation

    @dlohmeier
    dlohmeier committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    862cbab View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. further adaptions for code improvement

    @SimonRubenDrauz
    SimonRubenDrauz committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    ac3b77d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/circ_pump_branch_model' of https://github.com/r… 

    …etoflow/pandapipes into feature/circ_pump_branch_model

# Conflicts:
#	src/pandapipes/component_models/component_toolbox.py
#	src/pandapipes/pf/derivative_calculation.py
    @SimonRubenDrauz
    SimonRubenDrauz committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    7b09270 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. Merge remote-tracking branch 'origin/develop' into feature/circ_pump_… 

    …branch_model

# Conflicts:
#	src/pandapipes/idx_branch.py
#	src/pandapipes/pf/build_system_matrix.py
#	src/pandapipes/pf/derivative_calculation.py
#	src/pandapipes/pipeflow.py
#	src/pandapipes/test/api/test_components/test_circ_pump_mass.py
#	src/pandapipes/test/pipeflow_internals/test_pipeflow_analytic_comparison.py
    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    a6f9d6e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'pp_fork/feature/circ_pump_branch_model'… 

    … into feature/circ_pump_branch_model2

# Conflicts:
#	setup.py
#	src/pandapipes/component_models/component_toolbox.py
#	src/pandapipes/pf/build_system_matrix.py
#	src/pandapipes/pipeflow.py
    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    8fcb2fb View commit details
    Browse the repository at this point in the history

  3. bugfix

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    628105d View commit details
    Browse the repository at this point in the history

  4. changes in pandas

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    68c109f View commit details
    Browse the repository at this point in the history

  5. bug correction

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    b746540 View commit details
    Browse the repository at this point in the history

  6. bug correction

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    9aefeac View commit details
    Browse the repository at this point in the history

  7. bug correction

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    c15ce2a View commit details
    Browse the repository at this point in the history

  8. bug correction

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    e756949 View commit details
    Browse the repository at this point in the history

  9. bug correction

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    ee3d138 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge remote-tracking branch 'senergy/feature/circ_pump_branch_model'… 

    … into feature/circ_pump_branch_model3

# Conflicts:
#	src/pandapipes/component_models/abstract_models/circulation_pump.py
#	src/pandapipes/component_models/component_toolbox.py
#	src/pandapipes/idx_branch.py
#	src/pandapipes/idx_node.py
#	src/pandapipes/pf/build_system_matrix.py
#	src/pandapipes/pf/derivative_calculation.py
#	src/pandapipes/pipeflow.py
#	src/pandapipes/test/api/test_components/test_heat_consumer.py
    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    82f23c3 View commit details
    Browse the repository at this point in the history

  2. bug correction

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    26e033b View commit details
    Browse the repository at this point in the history

  3. init adaptions

    @SimonRubenDrauz
    SimonRubenDrauz committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    365c113 View commit details
    Browse the repository at this point in the history