-
Notifications
You must be signed in to change notification settings - Fork 63
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.
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
Gas mixture simon #550
base: gas_mixture
Are you sure you want to change the base?
Gas mixture simon #550
Conversation
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. |
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_fact
inproperties_toolbox.py
. Among other changes, the gas mixture compressibility takes now the temperature into account. A test has been added (test_compressibility
inpandapipes/test/api/test_special_networks.py
) to compare the results of the calculation with CoolProp results.Minor changes:
calculate_molar_fraction_from_mass_fraction
function (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.ipynb
contains the script that produces the CoolProp results for the compressiblity. This could/should be saved somewhere outside of the pandapipes repository.