Gas mixture simon #550
Open
Gas mixture simon #550
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fixes for stanet converter
- stanet_nr is now -999 instead of NA (if applicable) - remove xfails and unused imports - fail safe if no layers available - fail safe if slider diameter = 0
fix minor errors in stanet converter
remove redundant entry about flow control
Update CHANGELOG.rst
extended stanet converter documentation
added a test with two ext grids for flow control
- added "components" dict of arrays to pit - every component can create its own internal array if needed (create_component_array in base_component.py) - moved PRESSURE_RATIO and STD_TYPE from branch_idx.py to internal arrays of pumps and compressors, as they are only needed right there
- rename internal to only_active
- made component_type interchangeable ("brach" / "node")
internal component arrays
readthedocs.yml deprecation
Biomethane (bis)
# Conflicts: # pandapipes/__init__.py # 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/abstract_models/node_models.py # pandapipes/component_models/circulation_pump_mass_component.py # pandapipes/component_models/circulation_pump_pressure_component.py # pandapipes/component_models/component_toolbox.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/idx_branch.py # pandapipes/idx_node.py # pandapipes/io/convert_format.py # pandapipes/io/io_utils.py # pandapipes/multinet/control/controller/multinet_control.py # pandapipes/multinet/control/run_control_multinet.py # pandapipes/multinet/create_multinet.py # pandapipes/multinet/multinet.py # pandapipes/multinet/timeseries/run_time_series_multinet.py # pandapipes/networks/simple_gas_networks.py # pandapipes/networks/simple_heat_transfer_networks.py # pandapipes/networks/simple_water_networks.py # pandapipes/pandapipes_net.py # pandapipes/pf/pipeflow_setup.py # pandapipes/pf/result_extraction.py # pandapipes/pipeflow.py # pandapipes/plotting/collections.py # pandapipes/plotting/generic_geodata.py # pandapipes/plotting/simple_plot.py # pandapipes/properties/fluids.py # pandapipes/std_types/std_types.py # pandapipes/test/api/release_cycle/release_control_test_network.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/openmodelica_comparison/test_heat_transfer_openmodelica.py # pandapipes/test/openmodelica_comparison/test_water_openmodelica.py # pandapipes/test/pipeflow_internals/test_inservice.py # pandapipes/test/pipeflow_internals/test_time_series.py # pandapipes/test/pipeflow_internals/test_update_matrix.py # pandapipes/test/properties/test_fluid_specials.py # pandapipes/test/run_tests.py # pandapipes/test/stanet_comparison/pipeflow_stanet_comparison.py # pandapipes/test/stanet_comparison/test_gas_stanet.py # pandapipes/test/stanet_comparison/test_water_stanet.py # pandapipes/timeseries/run_time_series.py # pandapipes/toolbox.py # pandapipes/topology/create_graph.py # setup.py
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## gas_mixture #550 +/- ##
===============================================
- Coverage 87.07% 83.55% -3.53%
===============================================
Files 79 93 +14
Lines 4681 7277 +2596
===============================================
+ Hits 4076 6080 +2004
- Misses 605 1197 +592 ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR rectifies the gas mixture compressiblity calculation and merges the changes from the master branch in the kbensafta:gas_mixture_simon branch to make the latter pass the tests.
The SRK method has been implemented for the compressibility calculation (see G. Soave, Equilibrium constants from a modified Redlich-Kwong equation of state). The new function is
calculate_mixture_compressibility_factinproperties_toolbox.py. Among other changes, the gas mixture compressibility takes now the temperature into account. A test has been added (test_compressibilityinpandapipes/test/api/test_special_networks.py) to compare the results of the calculation with CoolProp results.Minor changes:
calculate_molar_fraction_from_mass_fractionfunction (also inproperties_toolbox.py)Note: The folder tests_gas_mix is not necessary and have to be ignored during the final PR to the develop branch.
SRK_TEST.ipynbcontains the script that produces the CoolProp results for the compressiblity. This could/should be saved somewhere outside of the pandapipes repository.