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 change circ pump] Enabled pressure setpoint for return and flow junction #630

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

[Feature change circ pump] Enabled pressure setpoint for return and flow junction #630

wants to merge 17 commits into from

Commits on May 15, 2024

  1. -first changes for circ_pump_pressure

    @EPrade
    EPrade committed May 15, 2024
    Configuration menu
    Copy the full SHA
    b404f53 View commit details
    Browse the repository at this point in the history

  2. -circ_pump_pressure working; added set_fixed_node_entries_circ_pump()… 

    … so that pressure can be set at return flow junction while temperature is set at flow junction
    @EPrade
    EPrade committed May 15, 2024
    Configuration menu
    Copy the full SHA
    111133a View commit details
    Browse the repository at this point in the history

  3. -circ_pump_pressure tests working;

    @EPrade
    EPrade committed May 15, 2024
    Configuration menu
    Copy the full SHA
    4a41762 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. -changed circ_pump_mass;

    @EPrade
    EPrade committed May 17, 2024
    Configuration menu
    Copy the full SHA
    01b0836 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. -changed format version, test and convert_format;

    @EPrade
    EPrade committed May 21, 2024
    Configuration menu
    Copy the full SHA
    8abf3d9 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.rst

    @EPrade
    EPrade committed May 21, 2024
    Configuration menu
    Copy the full SHA
    8bf32d7 View commit details
    Browse the repository at this point in the history

  3. Update __init__.py 

    changed version
    @EPrade
    EPrade committed May 21, 2024
    Configuration menu
    Copy the full SHA
    8f998fb View commit details
    Browse the repository at this point in the history

  4. -adapted docstring;

    @EPrade
    EPrade committed May 21, 2024
    Configuration menu
    Copy the full SHA
    b9f66ad View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature_change_circ_pump' of https://github.com/EPrade/… 

    …pandapipes into feature_change_circ_pump
    @EPrade
    EPrade committed May 21, 2024
    Configuration menu
    Copy the full SHA
    02ab060 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/develop' into feature_change_cir… 

    …c_pump

# Conflicts:
#	src/pandapipes/plotting/pipeflow_results.py
    @EPrade
    EPrade committed May 21, 2024
    Configuration menu
    Copy the full SHA
    7bd5fd4 View commit details
    Browse the repository at this point in the history

  7. Update circular_flow_in_a_district_heating_grid.ipynb 

    -Updated tutorial
    @EPrade
    EPrade committed May 21, 2024
    Configuration menu
    Copy the full SHA
    4b1b90e View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. -changed circ_pump to enable multiple circ_pumps calculation and adde… 

    …d tests
    @EPrade
    EPrade committed May 22, 2024
    Configuration menu
    Copy the full SHA
    d619f86 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. old_cols = ["from_junction", "to_junction", "mdot_kg_per_s", "p_bar",… 

    …"p_flow_bar", "t_k"]

new_cols = list(comp.from_to_node_cols()) + ["mdot_flow_kg_per_s","p_setpoint_bar","p_setpoint_bar","t_flow_k"]
    @ocapron22024
    ocapron22024 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    92647ea View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature_change_circ_pump' of https://github.com/EPrade/… 

    …pandapipes into feature_change_circ_pump
    @ocapron22024
    ocapron22024 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    b713115 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. -enabled usage of old implementation and added deprecation warning

    @EPrade
    EPrade committed May 28, 2024
    Configuration menu
    Copy the full SHA
    daee1d0 View commit details
    Browse the repository at this point in the history

  2. -removed unused import

    @EPrade
    EPrade committed May 28, 2024
    Configuration menu
    Copy the full SHA
    b837e80 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. -changed circ_pump p_set_point from loop to mask indexing; adapted tests

    @EPrade
    EPrade committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    f65d042 View commit details
    Browse the repository at this point in the history