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

Gas mixture #493

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

Gas mixture #493

wants to merge 67 commits into from

Commits on Jan 18, 2022

  1. fluids are defined for sources and ext_grids not for networks

    sdrauz authored and sdrauz committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    1861d86 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2022

  1. additional properties

    sdrauz authored and sdrauz committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    38b8e0b View commit details
    Browse the repository at this point in the history

  2. changes as result of mixture considerations

    sdrauz authored and sdrauz committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    2133d55 View commit details
    Browse the repository at this point in the history

  3. mark xfailing test

    sdrauz authored and sdrauz committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    26f1297 View commit details
    Browse the repository at this point in the history

  4. bug in create_individual_fluid

    sdrauz authored and sdrauz committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    57d03d1 View commit details
    Browse the repository at this point in the history

  5. InvalidIndexError added

    sdrauz authored and sdrauz committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    351c476 View commit details
    Browse the repository at this point in the history

  6. InvalidIndexError added

    sdrauz authored and sdrauz committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    70431fd View commit details
    Browse the repository at this point in the history

  7. InvalidIndexError added

    sdrauz authored and sdrauz committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    cc76a19 View commit details
    Browse the repository at this point in the history

  8. Changes in pandas considered

    sdrauz authored and sdrauz committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    4c834c8 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. deprecating warning fix

    sdrauz authored and sdrauz committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    096294e View commit details
    Browse the repository at this point in the history

  2. mixture implementations

    sdrauz authored and sdrauz committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    64388bb View commit details
    Browse the repository at this point in the history

  3. new controller

    sdrauz authored and sdrauz committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    fe6f59f View commit details
    Browse the repository at this point in the history

  4. test adaption and new tests for mixtures

    sdrauz authored and sdrauz committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    fa4fde7 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. remove damping factor

    sdrauz authored and sdrauz committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    093d5b2 View commit details
    Browse the repository at this point in the history

  2. adapting mixture tests

    sdrauz authored and sdrauz committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    da1c957 View commit details
    Browse the repository at this point in the history

  3. improving system matrix entries

    sdrauz authored and sdrauz committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    a6d8469 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2022

  1. adapting pplog

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    cc63242 View commit details
    Browse the repository at this point in the history

  2. bugfixes mixture calculation

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    8e2ee76 View commit details
    Browse the repository at this point in the history

  3. cleanup

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    5570b18 View commit details
    Browse the repository at this point in the history

  4. colebrook bugfix

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    a48a573 View commit details
    Browse the repository at this point in the history

  5. changes in write_to_net considered

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    ed207aa View commit details
    Browse the repository at this point in the history

  6. progress bar changes considered

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    b531995 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/develop' into feature/mixture_co… 

    …ntroller

# Conflicts:
#	compressor_component.py
#	pandapipes/__init__.py
#	pandapipes/component_models/abstract_models/branch_w_internals_models.py
#	pandapipes/component_models/auxiliaries/component_toolbox.py
#	pandapipes/component_models/pipe_component.py
#	pandapipes/component_models/pump_component.py
#	pandapipes/create.py
#	pandapipes/pandapipes_net.py
#	pandapipes/pipeflow_setup.py
#	pandapipes/std_types/std_type.py
#	pandapipes/test/stanet_comparison/pipeflow_stanet_comparison.py
#	setup.py
    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    d173762 View commit details
    Browse the repository at this point in the history

  8. moving add new component to different toolbox

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    e15d21a View commit details
    Browse the repository at this point in the history

  9. adapting pplog

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    b381067 View commit details
    Browse the repository at this point in the history

  10. moving add new component to different toolbox

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    5a93689 View commit details
    Browse the repository at this point in the history

  11. bugfix in pipe_component

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    1a4746b View commit details
    Browse the repository at this point in the history

  12. removing std_type

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    3a2761e View commit details
    Browse the repository at this point in the history

  13. sign change in circ pump

    sdrauz authored and sdrauz committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    2bca476 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2022

  1. implementation error in multinet controller

    sdrauz authored and sdrauz committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    2e7874f View commit details
    Browse the repository at this point in the history

  2. compressibility factor considered for p not T

    sdrauz authored and sdrauz committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    c0575cf View commit details
    Browse the repository at this point in the history

  3. removing slacklike

    sdrauz authored and sdrauz committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    0f11699 View commit details
    Browse the repository at this point in the history

  4. considering fluid in sources

    sdrauz authored and sdrauz committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    f35b53a View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. error of 10**-7 can be accepted

    sdrauz authored and sdrauz committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    930f9b4 View commit details
    Browse the repository at this point in the history

  2. bugfix in multinet controller

    sdrauz authored and sdrauz committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    3c77c15 View commit details
    Browse the repository at this point in the history

  3. further cleanup

    sdrauz authored and sdrauz committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    1afce01 View commit details
    Browse the repository at this point in the history

  4. further cleanup

    sdrauz authored and sdrauz committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    dcb92a0 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2022

  1. small bugfixes

    sdrauz authored and sdrauz committed May 3, 2022
    Configuration menu
    Copy the full SHA
    554fca9 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2022

  1. rounding results junction

    sdrauz authored and sdrauz committed May 9, 2022
    Configuration menu
    Copy the full SHA
    6234f5d View commit details
    Browse the repository at this point in the history

Commits on May 16, 2022

  1. bugfix of a multiple sink/source net

    sdrauz authored and sdrauz committed May 16, 2022
    Configuration menu
    Copy the full SHA
    8f5568e View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. start of an example tutorial

    sdrauz authored and sdrauz committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    de62d72 View commit details
    Browse the repository at this point in the history

  2. mass dummy increased due to inconsistencies

    sdrauz authored and sdrauz committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    155ef34 View commit details
    Browse the repository at this point in the history

  3. bugfix in file_io in case of multinets

    sdrauz authored and sdrauz committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    c280d75 View commit details
    Browse the repository at this point in the history

  4. adding tolerances of mass and w in internal results

    sdrauz authored and sdrauz committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    ff8dcc7 View commit details
    Browse the repository at this point in the history

  5. remove additional sinks in mixture example

    sdrauz authored and sdrauz committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    eb79067 View commit details
    Browse the repository at this point in the history

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

    …ntroller
    sdrauz authored and sdrauz committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    776c4d5 View commit details
    Browse the repository at this point in the history

  7. certain bugfixes

    sdrauz authored and sdrauz committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    4d90fed View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. pump component changes due to problems with fluids not having a molar… 

    … mass defined
    sdrauz authored and sdrauz committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    6a822d8 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

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

    …ntroller

# Conflicts:
#	pandapipes/component_models/abstract_models/base_component.py
#	pandapipes/component_models/abstract_models/branch_models.py
#	pandapipes/component_models/abstract_models/branch_w_internals_models.py
#	pandapipes/component_models/abstract_models/branch_wo_internals_models.py
#	pandapipes/component_models/abstract_models/branch_wzerolength_models.py
#	pandapipes/component_models/abstract_models/circulation_pump.py
#	pandapipes/component_models/abstract_models/const_flow_models.py
#	pandapipes/component_models/abstract_models/node_element_models.py
#	pandapipes/component_models/auxiliaries/derivative_toolbox.py
#	pandapipes/component_models/circulation_pump_mass_component.py
#	pandapipes/component_models/circulation_pump_pressure_component.py
#	pandapipes/component_models/compressor_component.py
#	pandapipes/component_models/ext_grid_component.py
#	pandapipes/component_models/heat_exchanger_component.py
#	pandapipes/component_models/junction_component.py
#	pandapipes/component_models/pipe_component.py
#	pandapipes/component_models/pressure_control_component.py
#	pandapipes/component_models/pump_component.py
#	pandapipes/component_models/sink_component.py
#	pandapipes/component_models/source_component.py
#	pandapipes/component_models/valve_component.py
#	pandapipes/create.py
#	pandapipes/multinet/control/controller/multinet_control.py
#	pandapipes/pandapipes_net.py
#	pandapipes/pf/build_system_matrix.py
#	pandapipes/pf/create_toolbox.py
#	pandapipes/pf/pipeflow_setup.py
#	pandapipes/pipeflow.py
#	pandapipes/plotting/generic_geodata.py
#	pandapipes/properties/fluids.py
#	pandapipes/test/api/test_aux_function.py
#	pandapipes/test/api/test_components/test_ext_grid.py
#	pandapipes/test/api/test_special_networks.py
#	pandapipes/test/multinet/test_control_multinet.py
#	pandapipes/test/openmodelica_comparison/pipeflow_openmodelica_comparison.py
#	pandapipes/test/pipeflow_internals/test_pipeflow_analytic_comparison.py
#	pandapipes/test/pipeflow_internals/test_pipeflow_modes.py
#	pandapipes/test/plotting/test_simple_collections.py
#	pandapipes/test/stanet_comparison/test_gas_stanet.py
#	pandapipes/test/test_toolbox.py
#	pandapipes/toolbox.py
    sdrauz authored and sdrauz committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    1538780 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. problems not solved during merging

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    8238abd View commit details
    Browse the repository at this point in the history

  2. further improvements

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    25a42fa View commit details
    Browse the repository at this point in the history

  3. further bug corrections

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    46206c5 View commit details
    Browse the repository at this point in the history

  4. further bugfixes

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    3f02b33 View commit details
    Browse the repository at this point in the history

  5. integration of numba

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    d748efc View commit details
    Browse the repository at this point in the history

  6. last bugfixes in numba integration

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    a9e1ac4 View commit details
    Browse the repository at this point in the history

  7. possible solution for type error

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    be56ace View commit details
    Browse the repository at this point in the history

  8. possible solution for type error

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    4ec1fc7 View commit details
    Browse the repository at this point in the history

  9. bugfix

    sdrauz authored and sdrauz committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    3b885fa View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. Merge branch 'develop' into feature/mixture_controller

    @SimonRubenDrauz
    SimonRubenDrauz committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    da3aa5d View commit details
    Browse the repository at this point in the history

  2. small bugfix in calculate temperature lift in case of pumps

    sdrauz authored and sdrauz committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    509b60f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/mixture_controller' of https://github.com/Simon… 

    …RubenDrauz/pandapipes into feature/mixture_controller
    sdrauz authored and sdrauz committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    b1c1309 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. additional network which is currently not working and needs to be sol… 

    …ved.
    sdrauz authored and sdrauz committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    7f26ecc View commit details
    Browse the repository at this point in the history

  2. additional network which is currently not working and needs tutorial … 

    …for mixture calculations
    sdrauz authored and sdrauz committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    7ac3081 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. test adaption and mixture tutorial

    sdrauz authored and sdrauz committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    e9cbfc7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into feature/mixture_co… 

    …ntroller

# Conflicts:
#	pandapipes/component_models/pump_component.py
    sdrauz authored and sdrauz committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    82df652 View commit details
    Browse the repository at this point in the history

  3. moving create_property_pit_branch/node_entries to adaption_before_der… 

    …ivatives_hydraulic
    sdrauz authored and sdrauz committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    4a9f911 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. move density derviative calculations to pf

    sdrauz authored and sdrauz committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    695ca77 View commit details
    Browse the repository at this point in the history