Skip to content

Conversation

@SimonRubenDrauz
Copy link
Collaborator

No description provided.

sdrauz added 30 commits January 18, 2022 15:06
…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 and others added 29 commits May 9, 2022 17:28
…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
…ntroller

# Conflicts:
#	pandapipes/component_models/pump_component.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants