diff --git a/pandapipes/component_models/pipe_component.py b/pandapipes/component_models/pipe_component.py index af399f15c..2eeb4e86f 100644 --- a/pandapipes/component_models/pipe_component.py +++ b/pandapipes/component_models/pipe_component.py @@ -140,14 +140,18 @@ def create_pit_branch_entries(cls, net, branch_pit): internal_pipe_number, has_internals) set_entry_check_repeat( pipe_pit, K, net[tbl].k_mm.values / 1000, internal_pipe_number, has_internals) + set_entry_check_repeat( - pipe_pit, ALPHA, net[tbl].alpha_w_per_m2k.values, internal_pipe_number, has_internals) + pipe_pit, ALPHA, net[tbl].u_w_per_m2k.values, internal_pipe_number, has_internals) + set_entry_check_repeat( pipe_pit, QEXT, net[tbl].qext_w.values, internal_pipe_number, has_internals) set_entry_check_repeat( pipe_pit, TEXT, net[tbl].text_k.values, internal_pipe_number, has_internals) + set_entry_check_repeat( - pipe_pit, D, net[tbl].diameter_m.values, internal_pipe_number, has_internals) + pipe_pit, D, net[tbl].diameter_mm.values / 1000, internal_pipe_number, has_internals) + set_entry_check_repeat( pipe_pit, LC, net[tbl].loss_coefficient.values, internal_pipe_number, has_internals) @@ -307,10 +311,10 @@ def get_component_input(cls): ("to_junction", "u4"), ("std_type", dtype(object)), ("length_km", "f8"), - ("diameter_m", "f8"), + ("diameter_mm", "f8"), ("k_mm", "f8"), ("loss_coefficient", "f8"), - ("alpha_w_per_m2k", 'f8'), + ("u_w_per_m2k", 'f8'), ("text_k", 'f8'), ("qext_w", 'f8'), ("sections", "u4"), diff --git a/pandapipes/converter/stanet/table_creation.py b/pandapipes/converter/stanet/table_creation.py index 553a0c3f4..2892dd687 100644 --- a/pandapipes/converter/stanet/table_creation.py +++ b/pandapipes/converter/stanet/table_creation.py @@ -139,7 +139,7 @@ def create_valve_and_pipe(net, stored_data, index_mapping, net_params, stanet_li if stanet_like_valves: create_valve_pipe_from_parameters( net, node_mapping[from_stanet_nr], node_mapping[to_stanet_nr], - length_km=row.RORL / 1000, diameter_m=float(row.DM / 1000), k_mm=row.RAU, + length_km=row.RORL / 1000, diameter_mm=float(row.DM), k_mm=row.RAU, opened=row.AUF == 'J', loss_coefficient=row.ZETA, name="valve_pipe_%s_%s" % (row.ANFNAM, row.ENDNAM), in_service=bool(row.ISACTIVE), stanet_nr=int(row.RECNO), stanet_id=str(row.STANETID), v_stanet=row.VM, **add_info @@ -156,16 +156,15 @@ def create_valve_and_pipe(net, stored_data, index_mapping, net_params, stanet_li text_k = 293 if hasattr(row, "TU"): text_k = row.TU + 273.15 - pandapipes.create_pipe_from_parameters( - net, node_mapping[from_stanet_nr], j_aux, length_km=row.RORL / 1000, - diameter_m=float(row.DM / 1000), k_mm=row.RAU, loss_coefficient=row.ZETA, - name="pipe_%s_%s" % (str(row.ANFNAM), 'aux_' + str(row.ENDNAM)), - text_k=text_k, in_service=bool(row.ISACTIVE), stanet_nr=-999, - stanet_id='pipe_valve_' + str(row.STANETID), v_stanet=row.VM, - stanet_active=bool(row.ISACTIVE), stanet_valid=False, **add_info - ) + pandapipes.create_pipe_from_parameters(net, node_mapping[from_stanet_nr], j_aux, length_km=row.RORL / 1000, + diameter_mm=float(row.DM), k_mm=row.RAU, loss_coefficient=row.ZETA, + text_k=text_k, + name="pipe_%s_%s" % (str(row.ANFNAM), 'aux_' + str(row.ENDNAM)), + in_service=bool(row.ISACTIVE), stanet_nr=-999, + stanet_id='pipe_valve_' + str(row.STANETID), v_stanet=row.VM, + stanet_active=bool(row.ISACTIVE), stanet_valid=False, **add_info) pandapipes.create_valve( - net, j_aux, node_mapping[to_stanet_nr], diameter_m=float(row.DM / 1000), + net, j_aux, node_mapping[to_stanet_nr], diameter_mm=float(row.DM), opened=row.AUF == 'J', loss_coefficient=0, name="valve_%s_%s" % ('aux_' + str(row.ENDNAM), str(row.ENDNAM)), stanet_nr=int(row.RECNO), stanet_id=str(row.STANETID), v_stanet=np.NaN, @@ -222,7 +221,7 @@ def create_slider_valves(net, stored_data, index_mapping, add_layers): f"The diameter will be set to 1 m.") slider_valves.DM[slider_valves.DM == 0] = 1e3 pandapipes.create_valves( - net, from_junctions, to_junctions, slider_valves.DM.values / 1000, + net, from_junctions, to_junctions, slider_valves.DM.values, opened=slider_valves.TYP.astype(np.int32).replace(opened_types).values, loss_coefficient=slider_valves.ZETA.values, name=slider_valves.STANETID.values, type="slider_valve_" + valve_system, stanet_nr=slider_valves.RECNO.values.astype(np.int32), @@ -568,7 +567,7 @@ def create_geodata_sections(row): text_k = pipes.TU.values.astype(np.float64) + 273.15 pandapipes.create_pipes_from_parameters( net, pipe_sections.fj.values, pipe_sections.tj.values, pipe_sections.length.values / 1000, - pipes.DM.values / 1000, pipes.RAU.values, pipes.ZETA.values, type="main_pipe", + pipes.DM.values, pipes.RAU.values, pipes.ZETA.values, type="main_pipe", stanet_std_type=pipes.ROHRTYP.values, in_service=pipes.ISACTIVE.values, text_k=text_k, alpha_w_per_m2k=pipes.WDZAHL.values.astype(np.float64), name=["pipe_%s_%s_%s" % (nf, nt, sec) for nf, nt, sec in zip( @@ -631,7 +630,7 @@ def create_heat_exchangers_stanet(net, stored_data, index_mapping, add_layers, a # TODO: there is no qext given!!! pandapipes.create_heat_exchanger( net, node_mapping[from_stanet_nr], node_mapping[to_stanet_nr], qext_w=qext, - diameter_m=float(row.DM / 1000), loss_coefficient=row.ZETA, std_type=row.ROHRTYP, + diameter_mm=float(row.DM), loss_coefficient=row.ZETA, std_type=row.ROHRTYP, in_service=bool(row.ISACTIVE), name="heat_exchanger_%s_%s" % (row.ANFNAM, row.ENDNAM), stanet_nr=int(row.RECNO), stanet_id=str(row.STANETID), v_stanet=row.VM, stanet_active=bool(row.ISACTIVE), **add_info @@ -696,7 +695,7 @@ def create_pipes_from_remaining_pipe_table(net, stored_data, connection_table, i text_k = p_tbl.TU.values.astype(np.float64) + 273.15 pandapipes.create_pipes_from_parameters( net, from_junctions, to_junctions, length_km=p_tbl.RORL.values.astype(np.float64) / 1000, - type="main_pipe", diameter_m=p_tbl.DM.values.astype(np.float64) / 1000, + type="main_pipe", diameter_mm=p_tbl.DM.values.astype(np.float64), loss_coefficient=p_tbl.ZETA.values, stanet_std_type=p_tbl.ROHRTYP.values, k_mm=p_tbl.RAU.values, in_service=p_tbl.ISACTIVE.values.astype(np.bool_), alpha_w_per_m2k=p_tbl.WDZAHL.values.astype(np.float64), text_k=text_k, @@ -1011,7 +1010,7 @@ def create_geodata_sections(row): text_k = hp_data.TU.values.astype(np.float64) + 273.15 pandapipes.create_pipes_from_parameters( net, hp_data.fj.values, hp_data.tj.values, hp_data.length.values / 1000, - hp_data.DM.values / 1000, hp_data.RAU.values, hp_data.ZETA.values, type="house_pipe", + hp_data.DM.values, hp_data.RAU.values, hp_data.ZETA.values, type="house_pipe", stanet_std_type=hp_data.ROHRTYP.values, in_service=hp_data.ISACTIVE.values if houses_in_calculation else False, text_k=text_k, alpha_w_per_m2k=hp_data.WDZAHL.values.astype(np.float64), diff --git a/pandapipes/create.py b/pandapipes/create.py index dd3746ff5..3a1237749 100644 --- a/pandapipes/create.py +++ b/pandapipes/create.py @@ -1,6 +1,7 @@ # Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics # and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved. # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. +import warnings import numpy as np import pandas as pd @@ -19,6 +20,7 @@ from pandapipes.std_types.std_type_class import regression_function, PumpStdType from pandapipes.std_types.std_types import add_basic_std_types, create_pump_std_type, \ load_std_type +#from pandapipes.toolbox import calculate_alpha try: import pandaplan.core.pplog as logging @@ -377,7 +379,7 @@ def create_heat_exchanger(net, from_junction, to_junction, diameter_m, qext_w, l def create_pipe(net, from_junction, to_junction, std_type, length_km, k_mm=0.2, loss_coefficient=0, - sections=1, alpha_w_per_m2k=0., text_k=293, qext_w=0., name=None, index=None, + sections=1, text_k=293, qext_w=0., name=None, index=None, geodata=None, in_service=True, type="pipe", **kwargs): """ Creates a pipe element in net["pipe"] from pipe parameters. @@ -400,8 +402,6 @@ def create_pipe(net, from_junction, to_junction, std_type, length_km, k_mm=0.2, :param sections: The number of internal pipe sections. Important for gas and temperature\ calculations, where variables are dependent on pipe length. :type sections: int, default 1 - :param alpha_w_per_m2k: Heat transfer coefficient in [W/(m^2*K)] - :type alpha_w_per_m2k: float, default 0 :param text_k: Ambient temperature of pipe in [K] :type text_k: float, default 293 :param qext_w: External heat feed-in to the pipe in [W] @@ -436,10 +436,20 @@ def create_pipe(net, from_junction, to_junction, std_type, length_km, k_mm=0.2, _check_std_type(net, std_type, "pipe", "create_pipe") pipe_parameter = load_std_type(net, std_type, "pipe") + + # # Check if alpha parameter was declared (Alpha has been changed to U) + # if 'alpha_w_per_m2k' in kwargs: + # if pipe_parameter['u_w_per_m2k']: + # pipe_parameter['u_w_per_m2k'] = kwargs['alpha_w_per_m2k'] + # raise UserWarning('You have defined alpha and u by chosing a standard type, ' + # 'which both describe the heat transfer coefficient. ' + # 'Alpha will overwrite the u value of the std type.') + # raise DeprecationWarning('alpha_w_per_m2k will be renamed to u_w_per_m2k in the future.') + v = {"name": name, "from_junction": from_junction, "to_junction": to_junction, "std_type": std_type, "length_km": length_km, - "diameter_m": pipe_parameter["inner_diameter_mm"] / 1000, "k_mm": k_mm, - "loss_coefficient": loss_coefficient, "alpha_w_per_m2k": alpha_w_per_m2k, + "diameter_mm": pipe_parameter["inner_diameter_mm"] , "k_mm": k_mm, + "loss_coefficient": loss_coefficient, "u_w_per_m2k": pipe_parameter['u_w_per_m2k'], "sections": sections, "in_service": bool(in_service), "type": type, "qext_w": qext_w, "text_k": text_k} _set_entries(net, "pipe", index, **v, **kwargs) @@ -450,10 +460,9 @@ def create_pipe(net, from_junction, to_junction, std_type, length_km, k_mm=0.2, return index -def create_pipe_from_parameters(net, from_junction, to_junction, length_km, diameter_m, k_mm=0.2, - loss_coefficient=0, sections=1, alpha_w_per_m2k=0., text_k=293, - qext_w=0., name=None, index=None, geodata=None, in_service=True, - type="pipe", **kwargs): +def create_pipe_from_parameters(net, from_junction, to_junction, length_km, diameter_mm=0, k_mm=0.2, loss_coefficient=0, + sections=1, u_w_per_m2k=0., text_k=293, qext_w=0., name=None, index=None, geodata=None, + in_service=True, type="pipe", **kwargs): """ Creates a pipe element in net["pipe"] from pipe parameters. @@ -465,8 +474,8 @@ def create_pipe_from_parameters(net, from_junction, to_junction, length_km, diam :type to_junction: int :param length_km: Length of the pipe in [km] :type length_km: float - :param diameter_m: The pipe diameter in [m] - :type diameter_m: float + :param diameter_mm: The pipe diameter in [mm] + :type diameter_mm: float :param k_mm: Pipe roughness in [mm]. 0.2 mm is quite rough, usually betweeen 0.0015 (new pipes) and 0.3 (old steel pipelines) :type k_mm: float, default 0.2 @@ -475,8 +484,8 @@ def create_pipe_from_parameters(net, from_junction, to_junction, length_km, diam :param sections: The number of internal pipe sections. Important for gas and temperature\ calculations, where variables are dependent on pipe length. :type sections: int, default 1 - :param alpha_w_per_m2k: Heat transfer coefficient in [W/(m^2*K)] - :type alpha_w_per_m2k: float, default 0 + :param u_w_per_m2k: Heat transfer coefficient in [W/(m^2*K)] + :type u_w_per_m2k: float, default 0 :param qext_w: external heat feed-in to the pipe in [W] :type qext_w: float, default 0 :param text_k: Ambient temperature of pipe in [K] @@ -500,8 +509,7 @@ def create_pipe_from_parameters(net, from_junction, to_junction, length_km, diam :rtype: int :Example: - >>> create_pipe_from_parameters(net, from_junction=0, to_junction=1, - >>> length_km=1, diameter_m=40e-3) + >>> create_pipe_from_parameters(net, from_junction=0, to_junction=1, length_km=1, diameter_mm=40) """ add_new_component(net, Pipe) @@ -510,10 +518,33 @@ def create_pipe_from_parameters(net, from_junction, to_junction, length_km, diam _check_branch(net, "Pipe", index, from_junction, to_junction) v = {"name": name, "from_junction": from_junction, "to_junction": to_junction, - "std_type": None, "length_km": length_km, "diameter_m": diameter_m, "k_mm": k_mm, - "loss_coefficient": loss_coefficient, "alpha_w_per_m2k": alpha_w_per_m2k, + "std_type": None, "length_km": length_km, "diameter_mm": diameter_mm, "k_mm": k_mm, + "loss_coefficient": loss_coefficient, "u_w_per_m2k": u_w_per_m2k, "sections": sections, "in_service": bool(in_service), "type": type, "qext_w": qext_w, "text_k": text_k} + #Check if alpha parameter was declared (Alpha has been changed to U) + if 'alpha_w_per_m2k' in kwargs: + if u_w_per_m2k: + + raise UserWarning('you have defined u and alpha which represent both the heat transfer coefficient.' + ' In the future alpha will be renamed to u.' + ' Please define only one variable for the heat transfer coefficient. ' + 'u will be overwritten by alpha') + else: + raise DeprecationWarning('alpha_w_per_m2k will be renamed to u_w_per_m2k in the future.') + + # Check if diameter was declared in right dimension(m has been changed to mm) + if 'diameter_m' in kwargs: + if diameter_mm!=0: + warnings.warn('you have defined the diameter twice(mm and m).' + ' In the future diameter_m will be renamed to diameter_mm.' + 'diameter_m will be overwritten by diameter_mm') + + else: + v['diameter_mm'] = kwargs['diameter_m']*1000 + warnings.warn(' In the future diameter_m will be renamed to diameter_mm.' + 'diameter_mm will be overwritten by diameter_m') + kwargs.pop('diameter_m') if 'std_type' in kwargs: raise UserWarning('you have defined a std_type, however, using this function you can only ' 'create a pipe setting specific, individual parameters. If you want to ' diff --git a/pandapipes/io/convert_format.py b/pandapipes/io/convert_format.py index ce13afa07..f66cb5133 100644 --- a/pandapipes/io/convert_format.py +++ b/pandapipes/io/convert_format.py @@ -45,6 +45,11 @@ def _rename_columns(net): else: net['controller'].drop('controller', inplace=True, axis=1) net["controller"].rename(columns={"controller": "object"}, inplace=True) + if "pipe" in net: + if "u_w_per_m2k" not in net["pipe"]: + net["pipe"].rename(columns={"alpha_w_per_m2k": "u_w_per_m2k"}, inplace=True) + if "diameter_mm" not in net["pipe"]: + net["pipe"].rename(columns={"diameter_m": "diameter_mm"}, inplace=True) for comp in [CirculationPumpMass, CirculationPumpPressure]: cp_tbl = comp.table_name() if cp_tbl in net: diff --git a/pandapipes/std_types/library/Pipe.csv b/pandapipes/std_types/library/Pipe.csv index 800b02ed4..4a5eebda5 100644 --- a/pandapipes/std_types/library/Pipe.csv +++ b/pandapipes/std_types/library/Pipe.csv @@ -1,221 +1,239 @@ -std_type;nominal_width_mm;outer_diameter_mm;inner_diameter_mm;standard_dimension_ratio;material -80_GGG;80;98.0;86.0;16.33;GGG -100_GGG;100;118.0;105.8;19.34;GGG -125_GGG;125;144.0;131.6;23.23;GGG -150_GGG;150;170.0;157.0;26.15;GGG -200_GGG;200;222.0;208.0;31.71;GGG -250_GGG;250;274.0;259.0;36.53;GGG -300_GGG;300;326.0;310.0;40.75;GGG -350_GGG;350;378.0;361.0;44.47;GGG -400_GGG;400;429.0;411.0;47.67;GGG -500_GGG;500;532.0;512.0;53.2;GGG -600_GGG;600;635.0;613.0;57.73;GGG -20_PE_100_SDR_11;20;20.0;16.2;10.53;PE 100 -25_PE_100_SDR_11;25;25.0;20.4;10.87;PE 100 -32_PE_100_SDR_11;32;32.0;26.2;11.03;PE 100 -40_PE_100_SDR_11;40;40.0;32.6;10.81;PE 100 -50_PE_100_SDR_11;50;50.0;40.8;10.87;PE 100 -63_PE_100_SDR_11;63;63.0;51.4;10.86;PE 100 -75_PE_100_SDR_11;75;75.0;61.4;11.03;PE 100 -90_PE_100_SDR_11;90;90.0;73.6;10.98;PE 100 -90_PE_100_SDR_17;90;90.0;79.2;16.67;PE 100 -110_PE_100_SDR_11;110;110.0;90.0;11.0;PE 100 -110_PE_100_SDR_17;110;110.0;96.8;16.67;PE 100 -125_PE_100_SDR_11;125;125.0;102.2;10.96;PE 100 -125_PE_100_SDR_17;125;125.0;110.2;16.89;PE 100 -140_PE_100_SDR_17;140;140.0;123.4;16.87;PE 100 -160_PE_100_SDR_11;160;160.0;130.8;10.96;PE 100 -160_PE_100_SDR_17;160;160.0;141.0;16.84;PE 100 -180_PE_100_SDR_17;180;180.0;158.6;16.82;PE 100 -180_PE_100_SDR_11;180;180.0;147.2;10.98;PE 100 -200_PE_100_SDR_17;200;200.0;176.2;16.81;PE 100 -225_PE_100_SDR_11;225;225.0;184.0;10.98;PE 100 -225_PE_100_SDR_17;225;225.0;198.2;16.79;PE 100 -250_PE_100_SDR_11;250;250.0;204.6;11.01;PE 100 -250_PE_100_SDR_17;250;250.0;220.4;16.89;PE 100 -280_PE_100_SDR_11;280;280.0;229.2;11.02;PE 100 -280_PE_100_SDR_17;280;280.0;246.8;16.87;PE 100 -315_PE_100_SDR_17;315;315.0;277.6;16.84;PE 100 -315_PE_100_SDR_11;315;315.0;257.8;11.01;PE 100 -355_PE_100_SDR_11;355;355.0;290.6;11.02;PE 100 -355_PE_100_SDR_17;355;355.0;312.8;16.82;PE 100 -400_PE_100_SDR_11;400;400.0;327.4;11.02;PE 100 -400_PE_100_SDR_17;400;400.0;352.6;16.88;PE 100 -450_PE_100_SDR_17;450;450.0;396.6;16.85;PE 100 -450_PE_100_SDR_11;450;450.0;368.0;10.98;PE 100 -500_PE_100_SDR_17;500;500.0;440.6;16.84;PE 100 -560_PE_100_SDR_17;560;560.0;493.6;16.87;PE 100 -630_PE_100_SDR_17;630;630.0;555.2;16.84;PE 100 -710_PE_100_SDR_17;710;710.0;625.8;16.86;PE 100 -800_PE_100_SDR_17;800;800.0;705.2;16.88;PE 100 -900_PE_100_SDR_17;900;900.0;793.4;16.89;PE 100 -20_PE_80_SDR_11;20;20.0;16.2;10.53;PE 80 -25_PE_80_SDR_11;25;25.0;20.4;10.87;PE 80 -32_PE_80_SDR_17.6;32;32.0;28.4;17.78;PE 80 -32_PE_80_SDR_11;32;32.0;26.2;11.03;PE 80 -40_PE_80_SDR_11;40;40.0;32.6;10.81;PE 80 -50_PE_80_SDR_11;50;50.0;40.8;10.87;PE 80 -63_PE_80_SDR_11;63;63.0;51.4;10.86;PE 80 -75_PE_80_SDR_11;75;75.0;61.4;11.03;PE 80 -90_PE_80_SDR_17;90;90.0;79.2;16.67;PE 80 -90_PE_80_SDR_11;90;90.0;73.6;10.98;PE 80 -110_PE_80_SDR_17;110;110.0;96.8;16.67;PE 80 -110_PE_80_SDR_11;110;110.0;90.0;11.0;PE 80 -125_PE_80_SDR_17;125;125.0;110.2;16.89;PE 80 -125_PE_80_SDR_11;125;125.0;102.2;10.96;PE 80 -140_PE_80_SDR_17;140;140.0;123.4;16.87;PE 80 -160_PE_80_SDR_17;160;160.0;141.0;16.84;PE 80 -160_PE_80_SDR_11;160;160.0;130.8;10.96;PE 80 -180_PE_80_SDR_11;180;180.0;147.2;10.98;PE 80 -180_PE_80_SDR_17;180;180.0;158.6;16.82;PE 80 -200_PE_80_SDR_17;200;200.0;176.2;16.81;PE 80 -225_PE_80_SDR_17;225;225.0;198.2;16.79;PE 80 -225_PE_80_SDR_11;225;225.0;184.0;10.98;PE 80 -250_PE_80_SDR_17;250;250.0;220.4;16.89;PE 80 -250_PE_80_SDR_11;250;250.0;204.6;11.01;PE 80 -280_PE_80_SDR_17;280;280.0;246.8;16.87;PE 80 -280_PE_80_SDR_11;280;280.0;229.2;11.02;PE 80 -315_PE_80_SDR_17;315;315.0;277.6;16.84;PE 80 -315_PE_80_SDR_11;315;315.0;257.8;11.01;PE 80 -355_PE_80_SDR_11;355;355.0;290.6;11.02;PE 80 -355_PE_80_SDR_17;355;355.0;312.8;16.82;PE 80 -400_PE_80_SDR_11;400;400.0;327.4;11.02;PE 80 -400_PE_80_SDR_17;400;400.0;352.6;16.88;PE 80 -450_PE_80_SDR_17;450;450.0;396.6;16.85;PE 80 -500_PE_80_SDR_17;500;500.0;440.6;16.84;PE 80 -560_PE_80_SDR_17;560;560.0;493.6;16.87;PE 80 -630_PE_80_SDR_17;630;630.0;555.2;16.84;PE 80 -710_PE_80_SDR_17;710;710.0;625.8;16.86;PE 80 -800_PE_80_SDR_17;800;800.0;705.2;16.88;PE 80 -900_PE_80_SDR_17;900;900.0;793.4;16.89;PE 80 -75_PE-HD_10;75;75.0;61.2;10.87;PE-HD 10 -90_PE-HD_10;90;90.0;73.6;10.98;PE-HD 10 -110_PE-HD_10;110;110.0;90.0;11.0;PE-HD 10 -140_PE-HD_10;140;140.0;114.4;10.94;PE-HD 10 -160_PE-HD_10;160;160.0;130.8;10.96;PE-HD 10 -225_PE-HD_10;225;225.0;184.0;10.98;PE-HD 10 -280_PE-HD_10;280;280.0;229.0;10.98;PE-HD 10 -355_PE-HD_10;355;355.0;290.4;10.99;PE-HD 10 -400_PE-HD_10;400;400.0;327.2;10.99;PE-HD 10 -450_PE-HD_10;450;450.0;368.0;10.98;PE-HD 10 -20_PE-HD_16;20;20.0;14.4;7.14;PE-HD 16 -25_PE-HD_16;25;25.0;18.0;7.14;PE-HD 16 -32_PE-HD_16;32;32.0;23.0;7.11;PE-HD 16 -40_PE-HD_16;40;40.0;28.8;7.14;PE-HD 16 -50_PE-HD_16;50;50.0;36.2;7.25;PE-HD 16 -63_PE-HD_16;63;63.0;45.6;7.24;PE-HD 16 -75_PE-HD_16;75;75.0;54.2;7.21;PE-HD 16 -90_PE-HD_16;90;90.0;65.0;7.2;PE-HD 16 -110PE-HD_16;110;110.0;79.6;7.24;PE-HD 16 -125_PE-HD_16;125;125.0;90.4;7.23;PE-HD 16 -140_PE-HD_16;140;140.0;103.2;7.61;PE-HD 16 -160_PE-HD_16;160;160.0;115.8;7.24;PE-HD 16 -180-PE-HD_16;180;180.0;130.2;7.23;PE-HD 16 -200-PE-HD_16;200;200.0;144.8;7.25;PE-HD 16 -225_PE-HD_16;225;225.0;162.8;7.23;PE-HD 16 -250_PE-HD_16;250;250.0;181.0;7.25;PE-HD 16 -280_PE-HD_16;280;280.0;202.6;7.24;PE-HD 16 -315_PE-HD_16;315;315.0;228.0;7.24;PE-HD 16 -355_PE-HD_16;355;355.0;257.0;7.24;PE-HD 16 -400_PE-HD_16;400;400.0;289.6;7.25;PE-HD 16 -90_PE-HD_6;90;90.0;79.8;17.65;PE-HD 6 -110_PE-HD_6;110;110.0;97.4;17.46;PE-HD 6 -125_PE-HD_6;125;125.0;110.8;17.61;PE-HD 6 -140_PE-HD_6;140;140.0;124.0;17.5;PE-HD 6 -160_PE-HD_6;160;160.0;141.8;17.58;PE-HD 6 -180_PE-HD_6;180;180.0;159.6;17.65;PE-HD 6 -200_PE-HD_6;200;200.0;177.2;17.54;PE-HD 6 -225_PE-HD_6;225;225.0;199.4;17.58;PE-HD 6 -250_PE-HD_6;250;250.0;221.6;17.61;PE-HD 6 -280_PE-HD_6;280;280.0;248.2;17.61;PE-HD 6 -315_PE-HD_6;315;315.0;279.2;17.6;PE-HD 6 -355_PE-HD_6;355;355.0;314.8;17.66;PE-HD 6 -400_PE-HD_6;400;400.0;354.6;17.62;PE-HD 6 -450_PE-HD_6;450;450.0;399.0;17.65;PE-HD 6 -500_PE-HD_6;500;500.0;443.4;17.67;PE-HD 6 -560_PE-HD_6;560;560.0;496.6;17.67;PE-HD 6 -630_PE-HD_6;630;630.0;558.6;17.65;PE-HD 6 -25_PE-Xa_SDR_11;25;32.0;26.2;11.03;PE-Xa -32_PE-Xa_SDR_11;32;40.0;32.6;10.81;PE-Xa -40_PE-Xa_SDR_11;40;50.0;40.8;10.87;PE-Xa -50_PE-Xa_SDR_11;50;63.0;51.4;10.86;PE-Xa -65_PE-Xa_SDR_11;65;75.0;61.4;11.03;PE-Xa -80_PE-Xa_SDR_11;80;90.0;73.6;10.98;PE-Xa -40_PE_80_SDR_17.6;40;40.0;35.4;17.39;PE 80 -50_PE_80_SDR_17.6;50;50.0;44.2;17.24;PE 80 -63_PE_80_SDR_17.6;63;63.0;55.8;17.5;PE 80 -90_PE_80_SDR_17.6;90;90.0;79.8;17.65;PE 80 -110_PE_80_SDR_17.6;110;110.0;97.4;17.46;PE 80 -125_PE_80_SDR_17.6;125;125.0;110.8;17.61;PE 80 -160_PE_80_SDR_17.6;160;160.0;141.8;17.58;PE 80 -180_PE_80_SDR_17.6;180;180.0;159.6;17.65;PE 80 -225_PE_80_SDR_17.6;225;225.0;199.4;17.58;PE 80 -250_PE_80_SDR_17.6;250;250.0;221.6;17.61;PE 80 -280_PE_80_SDR_17.6;280;280.0;248.2;17.61;PE 80 -315_PE_80_SDR_17.6;315;315.0;279.2;17.6;PE 80 -355_PE_80_SDR_17.6;355;355.0;314.8;17.66;PE 80 -400_PE_80_SDR_17.6;400;400.0;354.6;17.62;PE 80 -50_PVC_10;50;63.0;57.0;21.0;PVC -80_PVC_10;80;90.0;81.4;20.93;PVC -100_PVC_10;100;110.0;99.4;20.75;PVC -125_PVC_10;125;140.0;126.6;20.9;PVC -150_PVC_10;150;160.0;144.6;20.78;PVC -200_PVC_10;200;225.0;203.4;20.83;PVC -250_PVC_10;250;280.0;253.2;20.9;PVC -300_PVC_10;300;355.0;321.2;21.01;PVC -350_PVC_10;350;400.0;361.8;20.94;PVC -400_PVC_10;400;450.0;407.0;20.93;PVC -500_PVC_10;500;560.0;506.6;20.97;PVC -600_PVC_10;600;630.0;570.0;21.0;PVC -20_ST;20;25.0;21.0;12.5;ST -20_ST<16;20;26.9;22.3;11.7;ST -25_ST;25;30.0;26.0;15.0;ST -25_ST<16;25;33.7;28.5;12.96;ST -25_ST>16;25;33.7;27.9;11.62;ST -32_ST;32;38.0;33.4;16.52;ST -32_ST<16;32;42.4;37.2;16.31;ST -32_ST>16;32;42.4;36.6;14.62;ST -40_ST;40;48.3;43.7;21.0;ST -40_ST<16;40;48.3;43.1;18.58;ST -50_ST;50;60.3;55.7;26.22;ST -50_ST<16;50;60.3;54.5;20.79;ST -65_ST;65;88.9;83.7;34.19;ST -65_ST<16;65;76.1;70.3;26.24;ST -65_ST>16;65;88.9;82.5;27.78;ST -80_ST;80;88.9;84.3;38.65;ST -80_ST<16;80;88.9;82.5;27.78;ST -80_ST>16;80;88.9;81.7;24.69;ST -100_ST;100;114.3;109.1;43.96;ST -100_ST<16;100;114.3;107.9;35.72;ST -100_ST>16;100;114.3;107.1;31.75;ST -125_ST<16;125;139.7;132.5;38.81;ST -125_ST>16;125;139.7;131.7;34.92;ST -150_ST;150;168.3;162.5;58.03;ST -150_ST<16;150;168.3;160.3;42.08;ST -150_ST>16;150;168.3;159.3;37.4;ST -200_ST;200;219.1;212.7;68.47;ST -200_ST<16;200;219.1;210.1;48.69;ST -200_ST>16;200;219.1;209.1;43.82;ST -250_ST;250;273.0;265.8;75.83;ST -250_ST<16;250;273.0;263.0;54.6;ST -250_ST>16;250;273.0;261.8;48.75;ST -300_ST;300;323.9;315.9;80.97;ST -300_ST<16;300;323.9;312.7;57.84;ST -300_ST>16;300;323.9;311.3;51.41;ST -350_ST;350;355.6;346.6;79.02;ST -350_ST<16;350;355.6;344.4;63.5;ST -400_ST;400;406.4;397.4;90.31;ST -400_ST<16;400;406.4;393.8;64.51;ST -500_ST;500;508.0;496.8;90.71;ST -500_ST<16;500;508.0;495.4;80.63;ST -600_ST;600;610.0;598.8;108.93;ST -600_ST<16;600;610.0;597.4;96.83;ST -700_ST<16;700;711.0;696.8;100.14;ST -800_ST<16;800;813.0;797.0;101.62;ST -900_ST<16;900;914.0;894.0;91.4;ST -1000_ST<16;1000;1016.0;996.0;101.6;ST -1200_ST<16;1200;1220.0;1198.0;110.91;ST -1400_ST<16;1400;1420.0;1398.0;129.09;ST -1600_ST<16;1600;1620.0;1588.0;101.25;ST -1800_ST<16;1800;1820.0;1785.0;104.0;ST -2000_ST<16;2000;2020.0;1980.0;101.0;ST +std_type;nominal_width_mm;outer_diameter_mm;inner_diameter_mm;standard_dimension_ratio;material;u_w_per_m2k +80_GGG;80;98;86;16.33;GGG;0 +100_GGG;100;118;105.8;19.34;GGG;0 +125_GGG;125;144;131.6;23.23;GGG;0 +150_GGG;150;170;157;26.15;GGG;0 +200_GGG;200;222;208;31.71;GGG;0 +250_GGG;250;274;259;36.53;GGG;0 +300_GGG;300;326;310;40.75;GGG;0 +350_GGG;350;378;361;44.47;GGG;0 +400_GGG;400;429;411;47.67;GGG;0 +500_GGG;500;532;512;53.2;GGG;0 +600_GGG;600;635;613;57.73;GGG;0 +20_PE_100_SDR_11;20;20;16.2;10.53;PE 100;0 +25_PE_100_SDR_11;25;25;20.4;10.87;PE 100;0 +32_PE_100_SDR_11;32;32;26.2;11.03;PE 100;0 +40_PE_100_SDR_11;40;40;32.6;10.81;PE 100;0 +50_PE_100_SDR_11;50;50;40.8;10.87;PE 100;0 +63_PE_100_SDR_11;63;63;51.4;10.86;PE 100;0 +75_PE_100_SDR_11;75;75;61.4;11.03;PE 100;0 +90_PE_100_SDR_11;90;90;73.6;10.98;PE 100;0 +90_PE_100_SDR_17;90;90;79.2;16.67;PE 100;0 +110_PE_100_SDR_11;110;110;90;11;PE 100;0 +110_PE_100_SDR_17;110;110;96.8;16.67;PE 100;0 +125_PE_100_SDR_11;125;125;102.2;10.96;PE 100;0 +125_PE_100_SDR_17;125;125;110.2;16.89;PE 100;0 +140_PE_100_SDR_17;140;140;123.4;16.87;PE 100;0 +160_PE_100_SDR_11;160;160;130.8;10.96;PE 100;0 +160_PE_100_SDR_17;160;160;141;16.84;PE 100;0 +180_PE_100_SDR_17;180;180;158.6;16.82;PE 100;0 +180_PE_100_SDR_11;180;180;147.2;10.98;PE 100;0 +200_PE_100_SDR_17;200;200;176.2;16.81;PE 100;0 +225_PE_100_SDR_11;225;225;184;10.98;PE 100;0 +225_PE_100_SDR_17;225;225;198.2;16.79;PE 100;0 +250_PE_100_SDR_11;250;250;204.6;11.01;PE 100;0 +250_PE_100_SDR_17;250;250;220.4;16.89;PE 100;0 +280_PE_100_SDR_11;280;280;229.2;11.02;PE 100;0 +280_PE_100_SDR_17;280;280;246.8;16.87;PE 100;0 +315_PE_100_SDR_17;315;315;277.6;16.84;PE 100;0 +315_PE_100_SDR_11;315;315;257.8;11.01;PE 100;0 +355_PE_100_SDR_11;355;355;290.6;11.02;PE 100;0 +355_PE_100_SDR_17;355;355;312.8;16.82;PE 100;0 +400_PE_100_SDR_11;400;400;327.4;11.02;PE 100;0 +400_PE_100_SDR_17;400;400;352.6;16.88;PE 100;0 +450_PE_100_SDR_17;450;450;396.6;16.85;PE 100;0 +450_PE_100_SDR_11;450;450;368;10.98;PE 100;0 +500_PE_100_SDR_17;500;500;440.6;16.84;PE 100;0 +560_PE_100_SDR_17;560;560;493.6;16.87;PE 100;0 +630_PE_100_SDR_17;630;630;555.2;16.84;PE 100;0 +710_PE_100_SDR_17;710;710;625.8;16.86;PE 100;0 +800_PE_100_SDR_17;800;800;705.2;16.88;PE 100;0 +900_PE_100_SDR_17;900;900;793.4;16.89;PE 100;0 +20_PE_80_SDR_11;20;20;16.2;10.53;PE 80;0 +25_PE_80_SDR_11;25;25;20.4;10.87;PE 80;0 +32_PE_80_SDR_17.6;32;32;28.4;17.78;PE 80;0 +32_PE_80_SDR_11;32;32;26.2;11.03;PE 80;0 +40_PE_80_SDR_11;40;40;32.6;10.81;PE 80;0 +50_PE_80_SDR_11;50;50;40.8;10.87;PE 80;0 +63_PE_80_SDR_11;63;63;51.4;10.86;PE 80;0 +75_PE_80_SDR_11;75;75;61.4;11.03;PE 80;0 +90_PE_80_SDR_17;90;90;79.2;16.67;PE 80;0 +90_PE_80_SDR_11;90;90;73.6;10.98;PE 80;0 +110_PE_80_SDR_17;110;110;96.8;16.67;PE 80;0 +110_PE_80_SDR_11;110;110;90;11;PE 80;0 +125_PE_80_SDR_17;125;125;110.2;16.89;PE 80;0 +125_PE_80_SDR_11;125;125;102.2;10.96;PE 80;0 +140_PE_80_SDR_17;140;140;123.4;16.87;PE 80;0 +160_PE_80_SDR_17;160;160;141;16.84;PE 80;0 +160_PE_80_SDR_11;160;160;130.8;10.96;PE 80;0 +180_PE_80_SDR_11;180;180;147.2;10.98;PE 80;0 +180_PE_80_SDR_17;180;180;158.6;16.82;PE 80;0 +200_PE_80_SDR_17;200;200;176.2;16.81;PE 80;0 +225_PE_80_SDR_17;225;225;198.2;16.79;PE 80;0 +225_PE_80_SDR_11;225;225;184;10.98;PE 80;0 +250_PE_80_SDR_17;250;250;220.4;16.89;PE 80;0 +250_PE_80_SDR_11;250;250;204.6;11.01;PE 80;0 +280_PE_80_SDR_17;280;280;246.8;16.87;PE 80;0 +280_PE_80_SDR_11;280;280;229.2;11.02;PE 80;0 +315_PE_80_SDR_17;315;315;277.6;16.84;PE 80;0 +315_PE_80_SDR_11;315;315;257.8;11.01;PE 80;0 +355_PE_80_SDR_11;355;355;290.6;11.02;PE 80;0 +355_PE_80_SDR_17;355;355;312.8;16.82;PE 80;0 +400_PE_80_SDR_11;400;400;327.4;11.02;PE 80;0 +400_PE_80_SDR_17;400;400;352.6;16.88;PE 80;0 +450_PE_80_SDR_17;450;450;396.6;16.85;PE 80;0 +500_PE_80_SDR_17;500;500;440.6;16.84;PE 80;0 +560_PE_80_SDR_17;560;560;493.6;16.87;PE 80;0 +630_PE_80_SDR_17;630;630;555.2;16.84;PE 80;0 +710_PE_80_SDR_17;710;710;625.8;16.86;PE 80;0 +800_PE_80_SDR_17;800;800;705.2;16.88;PE 80;0 +900_PE_80_SDR_17;900;900;793.4;16.89;PE 80;0 +75_PE-HD_10;75;75;61.2;10.87;PE-HD 10;0 +90_PE-HD_10;90;90;73.6;10.98;PE-HD 10;0 +110_PE-HD_10;110;110;90;11;PE-HD 10;0 +140_PE-HD_10;140;140;114.4;10.94;PE-HD 10;0 +160_PE-HD_10;160;160;130.8;10.96;PE-HD 10;0 +225_PE-HD_10;225;225;184;10.98;PE-HD 10;0 +280_PE-HD_10;280;280;229;10.98;PE-HD 10;0 +355_PE-HD_10;355;355;290.4;10.99;PE-HD 10;0 +400_PE-HD_10;400;400;327.2;10.99;PE-HD 10;0 +450_PE-HD_10;450;450;368;10.98;PE-HD 10;0 +20_PE-HD_16;20;20;14.4;7.14;PE-HD 16;0 +25_PE-HD_16;25;25;18;7.14;PE-HD 16;0 +32_PE-HD_16;32;32;23;7.11;PE-HD 16;0 +40_PE-HD_16;40;40;28.8;7.14;PE-HD 16;0 +50_PE-HD_16;50;50;36.2;7.25;PE-HD 16;0 +63_PE-HD_16;63;63;45.6;7.24;PE-HD 16;0 +75_PE-HD_16;75;75;54.2;7.21;PE-HD 16;0 +90_PE-HD_16;90;90;65;7.2;PE-HD 16;0 +110PE-HD_16;110;110;79.6;7.24;PE-HD 16;0 +125_PE-HD_16;125;125;90.4;7.23;PE-HD 16;0 +140_PE-HD_16;140;140;103.2;7.61;PE-HD 16;0 +160_PE-HD_16;160;160;115.8;7.24;PE-HD 16;0 +180-PE-HD_16;180;180;130.2;7.23;PE-HD 16;0 +200-PE-HD_16;200;200;144.8;7.25;PE-HD 16;0 +225_PE-HD_16;225;225;162.8;7.23;PE-HD 16;0 +250_PE-HD_16;250;250;181;7.25;PE-HD 16;0 +280_PE-HD_16;280;280;202.6;7.24;PE-HD 16;0 +315_PE-HD_16;315;315;228;7.24;PE-HD 16;0 +355_PE-HD_16;355;355;257;7.24;PE-HD 16;0 +400_PE-HD_16;400;400;289.6;7.25;PE-HD 16;0 +90_PE-HD_6;90;90;79.8;17.65;PE-HD 6;0 +110_PE-HD_6;110;110;97.4;17.46;PE-HD 6;0 +125_PE-HD_6;125;125;110.8;17.61;PE-HD 6;0 +140_PE-HD_6;140;140;124;17.5;PE-HD 6;0 +160_PE-HD_6;160;160;141.8;17.58;PE-HD 6;0 +180_PE-HD_6;180;180;159.6;17.65;PE-HD 6;0 +200_PE-HD_6;200;200;177.2;17.54;PE-HD 6;0 +225_PE-HD_6;225;225;199.4;17.58;PE-HD 6;0 +250_PE-HD_6;250;250;221.6;17.61;PE-HD 6;0 +280_PE-HD_6;280;280;248.2;17.61;PE-HD 6;0 +315_PE-HD_6;315;315;279.2;17.6;PE-HD 6;0 +355_PE-HD_6;355;355;314.8;17.66;PE-HD 6;0 +400_PE-HD_6;400;400;354.6;17.62;PE-HD 6;0 +450_PE-HD_6;450;450;399;17.65;PE-HD 6;0 +500_PE-HD_6;500;500;443.4;17.67;PE-HD 6;0 +560_PE-HD_6;560;560;496.6;17.67;PE-HD 6;0 +630_PE-HD_6;630;630;558.6;17.65;PE-HD 6;0 +25_PE-Xa_SDR_11;25;32;26.2;11.03;PE-Xa;0 +32_PE-Xa_SDR_11;32;40;32.6;10.81;PE-Xa;0 +40_PE-Xa_SDR_11;40;50;40.8;10.87;PE-Xa;0 +50_PE-Xa_SDR_11;50;63;51.4;10.86;PE-Xa;0 +65_PE-Xa_SDR_11;65;75;61.4;11.03;PE-Xa;0 +80_PE-Xa_SDR_11;80;90;73.6;10.98;PE-Xa;0 +40_PE_80_SDR_17.6;40;40;35.4;17.39;PE 80;0 +50_PE_80_SDR_17.6;50;50;44.2;17.24;PE 80;0 +63_PE_80_SDR_17.6;63;63;55.8;17.5;PE 80;0 +90_PE_80_SDR_17.6;90;90;79.8;17.65;PE 80;0 +110_PE_80_SDR_17.6;110;110;97.4;17.46;PE 80;0 +125_PE_80_SDR_17.6;125;125;110.8;17.61;PE 80;0 +160_PE_80_SDR_17.6;160;160;141.8;17.58;PE 80;0 +180_PE_80_SDR_17.6;180;180;159.6;17.65;PE 80;0 +225_PE_80_SDR_17.6;225;225;199.4;17.58;PE 80;0 +250_PE_80_SDR_17.6;250;250;221.6;17.61;PE 80;0 +280_PE_80_SDR_17.6;280;280;248.2;17.61;PE 80;0 +315_PE_80_SDR_17.6;315;315;279.2;17.6;PE 80;0 +355_PE_80_SDR_17.6;355;355;314.8;17.66;PE 80;0 +400_PE_80_SDR_17.6;400;400;354.6;17.62;PE 80;0 +50_PVC_10;50;63;57;21;PVC;0 +80_PVC_10;80;90;81.4;20.93;PVC;0 +100_PVC_10;100;110;99.4;20.75;PVC;0 +125_PVC_10;125;140;126.6;20.9;PVC;0 +150_PVC_10;150;160;144.6;20.78;PVC;0 +200_PVC_10;200;225;203.4;20.83;PVC;0 +250_PVC_10;250;280;253.2;20.9;PVC;0 +300_PVC_10;300;355;321.2;21.01;PVC;0 +350_PVC_10;350;400;361.8;20.94;PVC;0 +400_PVC_10;400;450;407;20.93;PVC;0 +500_PVC_10;500;560;506.6;20.97;PVC;0 +600_PVC_10;600;630;570;21;PVC;0 +20_ST;20;25;21;12.5;ST;0 +20_ST<16;20;26.9;22.3;11.7;ST;0 +25_ST;25;30;26;15;ST;0 +25_ST<16;25;33.7;28.5;12.96;ST;0 +25_ST>16;25;33.7;27.9;11.62;ST;0 +32_ST;32;38;33.4;16.52;ST;0 +32_ST<16;32;42.4;37.2;16.31;ST;0 +32_ST>16;32;42.4;36.6;14.62;ST;0 +40_ST;40;48.3;43.7;21;ST;0 +40_ST<16;40;48.3;43.1;18.58;ST;0 +50_ST;50;60.3;55.7;26.22;ST;0 +50_ST<16;50;60.3;54.5;20.79;ST;0 +65_ST;65;88.9;83.7;34.19;ST;0 +65_ST<16;65;76.1;70.3;26.24;ST;0 +65_ST>16;65;88.9;82.5;27.78;ST;0 +80_ST;80;88.9;84.3;38.65;ST;0 +80_ST<16;80;88.9;82.5;27.78;ST;0 +80_ST>16;80;88.9;81.7;24.69;ST;0 +100_ST;100;114.3;109.1;43.96;ST;0 +100_ST<16;100;114.3;107.9;35.72;ST;0 +100_ST>16;100;114.3;107.1;31.75;ST;0 +125_ST<16;125;139.7;132.5;38.81;ST;0 +125_ST>16;125;139.7;131.7;34.92;ST;0 +150_ST;150;168.3;162.5;58.03;ST;0 +150_ST<16;150;168.3;160.3;42.08;ST;0 +150_ST>16;150;168.3;159.3;37.4;ST;0 +200_ST;200;219.1;212.7;68.47;ST;0 +200_ST<16;200;219.1;210.1;48.69;ST;0 +200_ST>16;200;219.1;209.1;43.82;ST;0 +250_ST;250;273;265.8;75.83;ST;0 +250_ST<16;250;273;263;54.6;ST;0 +250_ST>16;250;273;261.8;48.75;ST;0 +300_ST;300;323.9;315.9;80.97;ST;0 +300_ST<16;300;323.9;312.7;57.84;ST;0 +300_ST>16;300;323.9;311.3;51.41;ST;0 +350_ST;350;355.6;346.6;79.02;ST;0 +350_ST<16;350;355.6;344.4;63.5;ST;0 +400_ST;400;406.4;397.4;90.31;ST;0 +400_ST<16;400;406.4;393.8;64.51;ST;0 +500_ST;500;508;496.8;90.71;ST;0 +500_ST<16;500;508;495.4;80.63;ST;0 +600_ST;600;610;598.8;108.93;ST;0 +600_ST<16;600;610;597.4;96.83;ST;0 +700_ST<16;700;711;696.8;100.14;ST;0 +800_ST<16;800;813;797;101.62;ST;0 +900_ST<16;900;914;894;91.4;ST;0 +1000_ST<16;1000;1016;996;101.6;ST;0 +1200_ST<16;1200;1220;1198;110.91;ST;0 +1400_ST<16;1400;1420;1398;129.09;ST;0 +1600_ST<16;1600;1620;1588;101.25;ST;0 +1800_ST<16;1800;1820;1785;104;ST;0 +2000_ST<16;2000;2020;1980;101;ST;0 +25/91 PLUS;20;94;25;11.36;PEXa;0.099 +32/91 PLUS;25;94;32;12.8;PEXa;0.121 +40/111 PLUS;32;114;40;14.29;PEXa;0.124 +50/111;40;114;47.6;13.22;PEXa;0.147 +50/126 PLUS;40;129;47.6;13.22;PEXa;0.13 +63/126;50;129;58.5;14.63;PEXa;0.162 +63/142 PLUS;50;145;58.5;14.63;PEXa;0.142 +75/142;65;145;69.5;15.11;PEXa;0.173 +75/162 PLUS;65;165;69.5;15.11;PEXa;0.148 +90/162;80;165;84;14;PEXa;0.187 +90/182 PLUS;80;185;84;14;PEXa;0.161 +110/182 PLUS;100;185;101;15.54;PEXa;0.206 +110/202 PLUS;100;205;101;15.54;PEXa;0.178 +125/202 PLUS;125;205;116;17.06;PEXa;0.217 +125/225 PLUS;125;228;116;17.06;PEXa;0.185 +140/202;125;205;127;17.89;PEXa;0.255 +140/225 PLUS;125;228;127;17.89;PEXa;0.212 +160/225;150;228;144;19.2;PEXa;0.264 diff --git a/pandapipes/std_types/std_types.py b/pandapipes/std_types/std_types.py index 9105126b3..6b526d679 100644 --- a/pandapipes/std_types/std_types.py +++ b/pandapipes/std_types/std_types.py @@ -5,7 +5,6 @@ import os import warnings import re - import pandas as pd from pandapipes import pp_dir from pandapipes.std_types.std_type_class import get_data, PumpStdType diff --git a/pandapipes/test/api/release_cycle/release_control_test_network.py b/pandapipes/test/api/release_cycle/release_control_test_network.py index 65e5b6816..291ea614d 100644 --- a/pandapipes/test/api/release_cycle/release_control_test_network.py +++ b/pandapipes/test/api/release_cycle/release_control_test_network.py @@ -33,31 +33,23 @@ def release_control_test_network_water(): type="junction", geodata=None) # pipes - pp.create_pipe_from_parameters( - net, from_junction=0, to_junction=8, length_km=3, diameter_m=0.01, k_mm=1, - loss_coefficient=0, sections=10, alpha_w_per_m2k=10, text_k=293, qext_w=0., name="Pipe 0", - index=None, geodata=None, in_service=True, type="pipe") - pp.create_pipe_from_parameters( - net, 9, 2, length_km=6, diameter_m=0.075, k_mm=.1, sections=10, alpha_w_per_m2k=3, - name="Pipe 1") - pp.create_pipe_from_parameters( - net, 2, 12, length_km=5, diameter_m=0.06, k_mm=.1, sections=10, alpha_w_per_m2k=20, - name="Pipe 2") - pp.create_pipe_from_parameters( - net, 4, 12, length_km=0.1, diameter_m=0.07, k_mm=.1, sections=10, alpha_w_per_m2k=2, - name="Pipe 3") - pp.create_pipe_from_parameters( - net, 5, 3, length_km=1, diameter_m=0.09, k_mm=.1, sections=10, alpha_w_per_m2k=3, - name="Pipe 4") - pp.create_pipe_from_parameters( - net, 4, 11, length_km=2.5, diameter_m=0.08, k_mm=.1, sections=10, alpha_w_per_m2k=15, - name="Pipe 5") - pp.create_pipe_from_parameters( - net, 7, 13, length_km=4.5, diameter_m=0.085, k_mm=.1, sections=10, alpha_w_per_m2k=2.5, - name="Pipe 6") - pp.create_pipe_from_parameters( - net, 1, 7, length_km=4, diameter_m=0.03, k_mm=.1, sections=10, alpha_w_per_m2k=1, - name="Pipe 7") + pp.create_pipe_from_parameters(net, from_junction=0, to_junction=8, length_km=3, diameter_mm=0.01 * 1000, k_mm=1, + loss_coefficient=0, sections=10, u_w_per_m2k=10, text_k=293, qext_w=0., + name="Pipe 0", index=None, geodata=None, in_service=True, type="pipe") + pp.create_pipe_from_parameters(net, 9, 2, length_km=6, diameter_mm=0.075 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=3, name="Pipe 1") + pp.create_pipe_from_parameters(net, 2, 12, length_km=5, diameter_mm=0.06 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=20, name="Pipe 2") + pp.create_pipe_from_parameters(net, 4, 12, length_km=0.1, diameter_mm=0.07 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=2, name="Pipe 3") + pp.create_pipe_from_parameters(net, 5, 3, length_km=1, diameter_mm=0.09 * 1000, k_mm=.1, sections=10, u_w_per_m2k=3, + name="Pipe 4") + pp.create_pipe_from_parameters(net, 4, 11, length_km=2.5, diameter_mm=0.08 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=15, name="Pipe 5") + pp.create_pipe_from_parameters(net, 7, 13, length_km=4.5, diameter_mm=0.085 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=2.5, name="Pipe 6") + pp.create_pipe_from_parameters(net, 1, 7, length_km=4, diameter_mm=0.03 * 1000, k_mm=.1, sections=10, u_w_per_m2k=1, + name="Pipe 7") # external grids pp.create_ext_grid(net, junction=0, p_bar=3, t_k=300, name="External Grid 0", in_service=True, @@ -143,32 +135,24 @@ def release_control_test_network_gas(): type="junction", geodata=None) # pipes - pp.create_pipe_from_parameters( - net, from_junction=0, to_junction=1, length_km=3, diameter_m=0.1, k_mm=1, - loss_coefficient=0, sections=10, alpha_w_per_m2k=10, text_k=293, qext_w=0., name="Pipe 0", - index=None, geodata=None, in_service=True, type="pipe") - pp.create_pipe_from_parameters( - net, 2, 3, length_km=6, diameter_m=0.075, k_mm=.1, sections=10, alpha_w_per_m2k=3, - name="Pipe 1") - pp.create_pipe_from_parameters( - net, 3, 4, length_km=5, diameter_m=0.06, k_mm=.1, sections=10, alpha_w_per_m2k=20, - name="Pipe 2") - pp.create_pipe_from_parameters( - net, 4, 5, length_km=0.1, diameter_m=0.07, k_mm=.1, sections=10, alpha_w_per_m2k=2, - name="Pipe 3") - pp.create_pipe_from_parameters( - net, 5, 6, length_km=4.5, diameter_m=0.085, k_mm=.1, sections=10, alpha_w_per_m2k=2.5, - name="Pipe 4") - pp.create_pipe_from_parameters( - net, 8, 7, length_km=4, diameter_m=0.03, k_mm=.1, sections=10, alpha_w_per_m2k=1, - name="Pipe 5") - - pp.create_pipe_from_parameters( - net, 9, 10, length_km=1, diameter_m=0.03, k_mm=.1, sections=10, alpha_w_per_m2k=1, - name="Pipe 6") - pp.create_pipe_from_parameters( - net, 11, 12, length_km=1.5, diameter_m=0.09, k_mm=.1, sections=10, alpha_w_per_m2k=3, - name="Pipe 7") + pp.create_pipe_from_parameters(net, from_junction=0, to_junction=1, length_km=3, diameter_mm=0.1 * 1000, k_mm=1, + loss_coefficient=0, sections=10, u_w_per_m2k=10, text_k=293, qext_w=0., + name="Pipe 0", index=None, geodata=None, in_service=True, type="pipe") + pp.create_pipe_from_parameters(net, 2, 3, length_km=6, diameter_mm=0.075 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=3, name="Pipe 1") + pp.create_pipe_from_parameters(net, 3, 4, length_km=5, diameter_mm=0.06 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=20, name="Pipe 2") + pp.create_pipe_from_parameters(net, 4, 5, length_km=0.1, diameter_mm=0.07 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=2, name="Pipe 3") + pp.create_pipe_from_parameters(net, 5, 6, length_km=4.5, diameter_mm=0.085 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=2.5, name="Pipe 4") + pp.create_pipe_from_parameters(net, 8, 7, length_km=4, diameter_mm=0.03 * 1000, k_mm=.1, sections=10, u_w_per_m2k=1, + name="Pipe 5") + + pp.create_pipe_from_parameters(net, 9, 10, length_km=1, diameter_mm=0.03 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=1, name="Pipe 6") + pp.create_pipe_from_parameters(net, 11, 12, length_km=1.5, diameter_mm=0.09 * 1000, k_mm=.1, sections=10, + u_w_per_m2k=3, name="Pipe 7") # external grids pp.create_ext_grid(net, junction=0, p_bar=16, t_k=280, name="External Grid 0", in_service=True, diff --git a/pandapipes/test/api/test_components/test_circ_pump_mass.py b/pandapipes/test/api/test_components/test_circ_pump_mass.py index 0d643e685..74847d760 100644 --- a/pandapipes/test/api/test_components/test_circ_pump_mass.py +++ b/pandapipes/test/api/test_components/test_circ_pump_mass.py @@ -25,8 +25,8 @@ def test_circulation_pump_constant_mass(use_numba): j3 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) j4 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) - pandapipes.create_pipe_from_parameters(net, j1, j2, k_mm=1., length_km=0.43380, diameter_m=0.1022) - pandapipes.create_pipe_from_parameters(net, j3, j4, k_mm=1., length_km=0.26370, diameter_m=0.1022) + pandapipes.create_pipe_from_parameters(net, j1, j2, length_km=0.43380, diameter_mm=0.1022 * 1000, k_mm=1.) + pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=0.26370, diameter_mm=0.1022 * 1000, k_mm=1.) pandapipes.create_circ_pump_const_mass_flow(net, j4, j1, 5, 5, 300, type='pt') pandapipes.create_heat_exchanger(net, j2, j3, 0.1, qext_w=200000) pandapipes.create_sink(net, j1, 2) diff --git a/pandapipes/test/api/test_components/test_circ_pump_pressure.py b/pandapipes/test/api/test_components/test_circ_pump_pressure.py index 349a7bc6c..7d891d09d 100644 --- a/pandapipes/test/api/test_components/test_circ_pump_pressure.py +++ b/pandapipes/test/api/test_components/test_circ_pump_pressure.py @@ -24,10 +24,8 @@ def test_circulation_pump_constant_pressure(use_numba): j3 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) j4 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) - pandapipes.create_pipe_from_parameters(net, j1, j2, k_mm=1., length_km=0.43380, - diameter_m=0.1022) - pandapipes.create_pipe_from_parameters(net, j3, j4, k_mm=1., length_km=0.26370, - diameter_m=0.1022) + pandapipes.create_pipe_from_parameters(net, j1, j2, length_km=0.43380, diameter_mm=0.1022 * 1000, k_mm=1.) + pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=0.26370, diameter_mm=0.1022 * 1000, k_mm=1.) pandapipes.create_circ_pump_const_pressure(net, j4, j1, 5, 2, 300, type='pt') pandapipes.create_heat_exchanger(net, j2, j3, 0.1, qext_w=200000) pandapipes.create_sink(net, j1, 2) diff --git a/pandapipes/test/api/test_components/test_compressor.py b/pandapipes/test/api/test_components/test_compressor.py index 6d6407162..f7b89e10a 100644 --- a/pandapipes/test/api/test_components/test_compressor.py +++ b/pandapipes/test/api/test_components/test_compressor.py @@ -17,8 +17,8 @@ def test_compressor_pressure_ratio(use_numba): j = pandapipes.create_junctions(net, 6, pn_bar=5, tfluid_k=283.15) j1, j2, j3, j4, j5, j6 = j - pandapipes.create_pipe_from_parameters(net, j1, j2, length_km=0.43380, diameter_m=0.1022) - pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=0.26370, diameter_m=0.1022) + pandapipes.create_pipe_from_parameters(net, j1, j2, length_km=0.43380, diameter_mm=0.1022 * 1000) + pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=0.26370, diameter_mm=0.1022 * 1000) pandapipes.create_ext_grid(net, j1, 5, 283.15, type="p") pandapipes.create_sink(net, j6, 0.02333) diff --git a/pandapipes/test/api/test_components/test_ext_grid.py b/pandapipes/test/api/test_components/test_ext_grid.py index d6945dd55..a68ec5801 100644 --- a/pandapipes/test/api/test_components/test_ext_grid.py +++ b/pandapipes/test/api/test_components/test_ext_grid.py @@ -52,10 +52,10 @@ def test_p_type(use_numba): :rtype: """ net = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 pandapipes.create_junction(net, pn_bar=5, tfluid_k=293.15) pandapipes.create_junction(net, pn_bar=5, tfluid_k=293.15) - pandapipes.create_pipe_from_parameters(net, 0, 1, 10, diameter_m=d, k_mm=0.1, sections=1) + pandapipes.create_pipe_from_parameters(net, 0, 1, 10, diameter_mm=d, k_mm=0.1, sections=1) pandapipes.create_ext_grid(net, 0, p_bar=5, t_k=285.15, type="p") pandapipes.create_sink(net, 1, mdot_kg_per_s=1) pandapipes.create_fluid_from_lib(net, name="water") @@ -81,14 +81,13 @@ def test_t_type_single_pipe(use_numba): :rtype: """ net = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j1 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) pandapipes.create_ext_grid(net, j0, 5, 645, type="pt") pandapipes.create_sink(net, j1, 1) - pandapipes.create_pipe_from_parameters(net, j0, j1, 6, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j1, 6, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) pandapipes.pipeflow(net, stop_condition="tol", iter=70, friction_model="nikuradse", @@ -98,7 +97,7 @@ def test_t_type_single_pipe(use_numba): temp = net.res_junction.t_k.values net2 = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=283) j1 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=283) @@ -106,8 +105,7 @@ def test_t_type_single_pipe(use_numba): pandapipes.create_ext_grid(net2, j1, 100, 323.15, type="t") pandapipes.create_sink(net2, j1, 1) - pandapipes.create_pipe_from_parameters(net2, j0, j1, 6, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j0, j1, 6, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net2, "water", overwrite=True) pandapipes.pipeflow(net2, stop_condition="tol", iter=70, friction_model="nikuradse", transient=False, nonlinear_method="automatic", tol_p=1e-4, tol_v=1e-4, @@ -128,7 +126,7 @@ def test_t_type_tee(use_numba): :rtype: """ net = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=300) j1 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=300) @@ -139,12 +137,9 @@ def test_t_type_tee(use_numba): pandapipes.create_sink(net, j3, 1) pandapipes.create_ext_grid(net, j2, 5, 310, type="t") - pandapipes.create_pipe_from_parameters(net, j0, j1, 6, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j3, 2.5, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j1, 6, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j3, 2.5, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) pandapipes.pipeflow(net, stop_condition="tol", iter=70, friction_model="nikuradse", @@ -154,7 +149,7 @@ def test_t_type_tee(use_numba): temp = net.res_junction.t_k.values net2 = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=300) j1 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=300) @@ -164,12 +159,9 @@ def test_t_type_tee(use_numba): pandapipes.create_sink(net2, j2, 1) pandapipes.create_sink(net2, j3, 1) - pandapipes.create_pipe_from_parameters(net2, j0, j1, 6, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j1, j2, 2.5, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j1, j3, 2.5, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j0, j1, 6, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j1, j2, 2.5, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j1, j3, 2.5, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net2, "water", overwrite=True) pandapipes.pipeflow(net2, stop_condition="tol", iter=70, friction_model="nikuradse", @@ -191,7 +183,7 @@ def test_t_type_tee_2zu_2ab(use_numba): :rtype: """ net = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=300) j1 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=300) @@ -205,14 +197,10 @@ def test_t_type_tee_2zu_2ab(use_numba): pandapipes.create_ext_grid(net, j1, 5, 645, type="t") pandapipes.create_ext_grid(net, j0, 5, 645, type="t") - pandapipes.create_pipe_from_parameters(net, j0, j2, 6, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j4, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j2, 6, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j4, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) pandapipes.pipeflow(net, stop_condition="tol", iter=3, friction_model="nikuradse", @@ -222,7 +210,7 @@ def test_t_type_tee_2zu_2ab(use_numba): temp = net.res_junction.t_k.values net2 = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=300) j1 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=300) @@ -234,14 +222,10 @@ def test_t_type_tee_2zu_2ab(use_numba): pandapipes.create_sink(net2, j3, 1) pandapipes.create_sink(net2, j4, 1) - pandapipes.create_pipe_from_parameters(net2, j0, j2, 6, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j1, j2, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j2, j3, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j2, j4, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j0, j2, 6, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j1, j2, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j2, j3, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j2, j4, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net2, "water", overwrite=True) pandapipes.pipeflow(net2, stop_condition="tol", iter=3, friction_model="nikuradse", @@ -263,7 +247,7 @@ def test_t_type_tee_2zu_2ab2(use_numba): :rtype: """ net = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=3, tfluid_k=300) j1 = pandapipes.create_junction(net, pn_bar=3, tfluid_k=300) @@ -277,14 +261,10 @@ def test_t_type_tee_2zu_2ab2(use_numba): pandapipes.create_ext_grid(net, j0, 5, 645, type="t") pandapipes.create_ext_grid(net, j4, 5, 378.83472, type="t") - pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j4, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j4, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) pandapipes.pipeflow(net, stop_condition="tol", iter=20, friction_model="nikuradse", @@ -294,7 +274,7 @@ def test_t_type_tee_2zu_2ab2(use_numba): temp = net.res_junction.t_k.values net2 = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=300) j1 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=300) @@ -306,14 +286,10 @@ def test_t_type_tee_2zu_2ab2(use_numba): pandapipes.create_sink(net2, j3, 1) pandapipes.create_sink(net2, j4, 1) - pandapipes.create_pipe_from_parameters(net2, j0, j2, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j1, j2, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j2, j3, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j2, j4, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j0, j2, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j1, j2, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j2, j3, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j2, j4, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net2, "water", overwrite=True) pandapipes.pipeflow(net2, stop_condition="tol", iter=20, friction_model="nikuradse", @@ -335,7 +311,7 @@ def test_t_type_tee_2zu_2ab3(use_numba): :rtype: """ net = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=3, tfluid_k=300) j1 = pandapipes.create_junction(net, pn_bar=3, tfluid_k=300) @@ -349,14 +325,10 @@ def test_t_type_tee_2zu_2ab3(use_numba): pandapipes.create_ext_grid(net, j2, 5, 645, type="t") pandapipes.create_ext_grid(net, j4, 5, 378.83472, type="t") - pandapipes.create_pipe_from_parameters(net, j0, j1, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j1, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j3, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j4, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j1, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j1, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j3, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j4, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) pandapipes.pipeflow(net, stop_condition="tol", iter=10, friction_model="nikuradse", @@ -366,7 +338,7 @@ def test_t_type_tee_2zu_2ab3(use_numba): temp = net.res_junction.t_k.values net2 = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=300) j1 = pandapipes.create_junction(net2, pn_bar=5, tfluid_k=300) @@ -378,14 +350,10 @@ def test_t_type_tee_2zu_2ab3(use_numba): pandapipes.create_sink(net2, j3, 1) pandapipes.create_sink(net2, j4, 1) - pandapipes.create_pipe_from_parameters(net2, j0, j1, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j2, j1, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j1, j3, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net2, j1, j4, 2.5, diameter_m=d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j0, j1, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j2, j1, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j1, j3, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net2, j1, j4, 2.5, diameter_mm=d, k_mm=.1, sections=5, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net2, "water", overwrite=True) pandapipes.pipeflow(net2, stop_condition="tol", iter=10, friction_model="nikuradse", diff --git a/pandapipes/test/api/test_components/test_mass_storage.py b/pandapipes/test/api/test_components/test_mass_storage.py index 29789e8ca..5101e37a6 100644 --- a/pandapipes/test/api/test_components/test_mass_storage.py +++ b/pandapipes/test/api/test_components/test_mass_storage.py @@ -16,8 +16,8 @@ def test_mass_storage(use_numba): j = pandapipes.create_junctions(net, 3, pn_bar=2, tfluid_k=283.15) j1, j2, j3 = j - pandapipes.create_pipe_from_parameters(net, j1, j2, length_km=1, diameter_m=0.5) - pandapipes.create_pipe_from_parameters(net, j2, j3, length_km=1, diameter_m=0.5) + pandapipes.create_pipe_from_parameters(net, j1, j2, length_km=1, diameter_mm=0.5 * 1000) + pandapipes.create_pipe_from_parameters(net, j2, j3, length_km=1, diameter_mm=0.5 * 1000) pandapipes.create_ext_grid(net, j1, 2, 283.15, type="p") pandapipes.create_mass_storage(net, j2, 0.1) pandapipes.create_mass_storage(net, j3, -0.2) diff --git a/pandapipes/test/api/test_components/test_pressure_control.py b/pandapipes/test/api/test_components/test_pressure_control.py index e770716fb..40f6de15e 100644 --- a/pandapipes/test/api/test_components/test_pressure_control.py +++ b/pandapipes/test/api/test_components/test_pressure_control.py @@ -25,10 +25,8 @@ def test_pressure_control_from_measurement_parameters(use_numba): j3 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) j4 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) - pandapipes.create_pipe_from_parameters(net, j2, j3, k_mm=1., length_km=5., - diameter_m=0.1022) - pandapipes.create_pipe_from_parameters(net, j3, j4, k_mm=1., length_km=10., - diameter_m=0.1022) + pandapipes.create_pipe_from_parameters(net, j2, j3, length_km=5., diameter_mm=0.1022 * 1000, k_mm=1.) + pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=10., diameter_mm=0.1022 * 1000, k_mm=1.) pandapipes.create_pressure_control(net, j1, j2, j4, 20.) pandapipes.create_ext_grid(net, j1, 5, 283.15, type="p") pandapipes.create_sink(net, j4, 0.5) @@ -60,10 +58,8 @@ def test_2pressure_controller_controllability(): j4 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) j5 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) - pandapipes.create_pipe_from_parameters(net, j2, j3, k_mm=1., length_km=5., - diameter_m=0.1022) - pandapipes.create_pipe_from_parameters(net, j3, j4, k_mm=1., length_km=10., - diameter_m=0.1022) + pandapipes.create_pipe_from_parameters(net, j2, j3, length_km=5., diameter_mm=0.1022 * 1000, k_mm=1.) + pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=10., diameter_mm=0.1022 * 1000, k_mm=1.) pandapipes.create_pressure_control(net, j4, j5, j5, 20.) pandapipes.create_pressure_control(net, j1, j2, j5, 20.) diff --git a/pandapipes/test/api/test_components/test_pump.py b/pandapipes/test/api/test_components/test_pump.py index 0cf9ce61c..3abea9028 100644 --- a/pandapipes/test/api/test_components/test_pump.py +++ b/pandapipes/test/api/test_components/test_pump.py @@ -25,10 +25,8 @@ def test_pump_from_measurement_parameteres(use_numba): j3 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) j4 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) - pandapipes.create_pipe_from_parameters(net, j1, j2, k_mm=1., length_km=0.43380, - diameter_m=0.1022) - pandapipes.create_pipe_from_parameters(net, j3, j4, k_mm=1., length_km=0.26370, - diameter_m=0.1022) + pandapipes.create_pipe_from_parameters(net, j1, j2, length_km=0.43380, diameter_mm=0.1022 * 1000, k_mm=1.) + pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=0.26370, diameter_mm=0.1022 * 1000, k_mm=1.) pandapipes.create_ext_grid(net, j1, 5, 283.15, type="p") pandapipes.create_pump_from_parameters(net, j2, j3, 'P1', [6.1, 5.8, 4], [0, 19, 83], 2) pandapipes.create_sink(net, j4, 0.02333) @@ -65,10 +63,8 @@ def test_pump_from_regression_parameteres(use_numba): j3 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) j4 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283.15) - pandapipes.create_pipe_from_parameters(net, j1, j2, k_mm=1., length_km=0.43380, - diameter_m=0.1022) - pandapipes.create_pipe_from_parameters(net, j3, j4, k_mm=1., length_km=0.26370, - diameter_m=0.1022) + pandapipes.create_pipe_from_parameters(net, j1, j2, length_km=0.43380, diameter_mm=0.1022 * 1000, k_mm=1.) + pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=0.26370, diameter_mm=0.1022 * 1000, k_mm=1.) pandapipes.create_ext_grid(net, j1, 5, 283.15, type="p") pandapipes.create_pump_from_parameters(net, j2, j3, 'P1', poly_coefficents=[-1.48620799e-04, -1.29656785e-02, @@ -206,9 +202,9 @@ def test_compression_power(use_numba): j3 = pandapipes.create_junction(net, pn_bar=1.05, tfluid_k=293.15, height_m=height_asl_m+10) _ = pandapipes.create_pipe_from_parameters(net, from_junction=j0, to_junction=j1, length_km=0.1, - diameter_m=0.05) + diameter_mm=0.05 * 1000) _ = pandapipes.create_pipe_from_parameters(net, from_junction=j2, to_junction=j3, length_km=0.5, - diameter_m=0.05) + diameter_mm=0.05 * 1000) _ = pandapipes.create_pump(net, from_junction=j1, to_junction=j2, std_type="P2", name="Pump1") diff --git a/pandapipes/test/api/test_components/test_valve.py b/pandapipes/test/api/test_components/test_valve.py index dbd737652..08240848f 100644 --- a/pandapipes/test/api/test_components/test_valve.py +++ b/pandapipes/test/api/test_components/test_valve.py @@ -31,13 +31,13 @@ def test_valve(use_numba): pandapipes.create_ext_grid(net, j0, 5, 283.15, type="p") - pandapipes.create_pipe_from_parameters(net, j0, j1, diameter_m=.1, k_mm=1, length_km=1.) - pandapipes.create_pipe_from_parameters(net, j3, j4, diameter_m=.1, k_mm=1, length_km=.5) - pandapipes.create_pipe_from_parameters(net, j2, j4, diameter_m=.1, k_mm=1, length_km=.5) - pandapipes.create_pipe_from_parameters(net, j5, j4, diameter_m=.1, k_mm=1, length_km=.35) - pandapipes.create_pipe_from_parameters(net, j1, j6, diameter_m=.1, k_mm=1, length_km=.1, + pandapipes.create_pipe_from_parameters(net, j0, j1, length_km=1., diameter_mm=.1 * 1000, k_mm=1) + pandapipes.create_pipe_from_parameters(net, j3, j4, length_km=.5, diameter_mm=.1 * 1000, k_mm=1) + pandapipes.create_pipe_from_parameters(net, j2, j4, length_km=.5, diameter_mm=.1 * 1000, k_mm=1) + pandapipes.create_pipe_from_parameters(net, j5, j4, length_km=.35, diameter_mm=.1 * 1000, k_mm=1) + pandapipes.create_pipe_from_parameters(net, j1, j6, length_km=.1, diameter_mm=.1 * 1000, k_mm=1, loss_coefficient=9000) - pandapipes.create_pipe_from_parameters(net, j1, j7, diameter_m=.1, k_mm=1, length_km=.1, + pandapipes.create_pipe_from_parameters(net, j1, j7, length_km=.1, diameter_mm=.1 * 1000, k_mm=1, loss_coefficient=9000) pandapipes.create_valve(net, j6, j2, diameter_m=0.1, opened=False) diff --git a/pandapipes/test/api/test_create.py b/pandapipes/test/api/test_create.py index b2dff8c97..3263fcf83 100644 --- a/pandapipes/test/api/test_create.py +++ b/pandapipes/test/api/test_create.py @@ -145,8 +145,7 @@ def test_create_pipe_from_parameters(create_empty_net): net = copy.deepcopy(create_empty_net) pandapipes.create_junction(net, 1, 293, index=8, geodata=(0, 1)) pandapipes.create_junction(net, 1, 293, index=9, geodata=(2, 2)) - pandapipes.create_pipe_from_parameters(net, 8, 9, 0.3, 0.4, index=2, - geodata=[(0, 1), (1, 1), (2, 2)]) + pandapipes.create_pipe_from_parameters(net, 8, 9, 0.3, 0.4 * 1000, index=2, geodata=[(0, 1), (1, 1), (2, 2)]) assert len(net.junction) == 2 assert len(net.pipe) == 1 diff --git a/pandapipes/test/api/test_network_tables.py b/pandapipes/test/api/test_network_tables.py index 899f1bacd..ea3849869 100644 --- a/pandapipes/test/api/test_network_tables.py +++ b/pandapipes/test/api/test_network_tables.py @@ -23,8 +23,7 @@ def test_default_input_tables(): assert junction_input != junction_input_create, "Input equals create-table, but they shouldn't" pipe_input = list(copy.deepcopy(net.pipe.columns)) - pandapipes.create_pipe_from_parameters(net, 0, 1, 6, diameter_m=0.2, k_mm=.1, sections=6, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, 0, 1, 6, diameter_mm=0.2 * 1000, k_mm=.1, sections=6, u_w_per_m2k=5) pipe_input_create = list(net.pipe.columns) assert pipe_input == pipe_input_create, "Input does not equal Table in create-function" diff --git a/pandapipes/test/api/test_std_types.py b/pandapipes/test/api/test_std_types.py index e1bfcca12..b864dc82c 100644 --- a/pandapipes/test/api/test_std_types.py +++ b/pandapipes/test/api/test_std_types.py @@ -1,10 +1,9 @@ # Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics # and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved. # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. - - +import numpy as np import pytest - +import pandas as pd import pandapipes @@ -305,15 +304,20 @@ def test_available_std_types(): do = 99.5 di = 87.5 rat = 16.33 + u = 0.2 mat = "GGG" typdata = {"standard_dimension_ratio": rat, "material": mat, "inner_diameter_mm": di, - "outer_diameter_mm": do, "nominal_width_mm": w} + "outer_diameter_mm": do, "nominal_width_mm": w, "u_w/mk": u} typdatas = {"typ1": typdata, "typ2": typdata} pandapipes.create_std_types(net, component="pipe", type_dict=typdatas) av = pandapipes.available_std_types(net, component="pipe") - assert av.to_dict(orient="index") == net.std_types["pipe"] + + pipe_df = pd.DataFrame(net.std_types["pipe"]).T + assert av.isnull().equals(pipe_df.isnull()) + assert np.all((av==pipe_df) | av.isnull()) + if __name__ == "__main__": diff --git a/pandapipes/test/io/test_file_io.py b/pandapipes/test/io/test_file_io.py index a3c3299c0..255301108 100644 --- a/pandapipes/test/io/test_file_io.py +++ b/pandapipes/test/io/test_file_io.py @@ -34,20 +34,16 @@ def load_net(): pandapipes.create_ext_grid(net, junction=j1, p_bar=1.1, t_k=293.15, name="Grid Connection") - pandapipes.create_pipe_from_parameters(net, from_junction=j1, to_junction=j2, length_km=10, - diameter_m=0.05, name="Pipe 1", geodata=[(0, 0), (2, 0)]) - pandapipes.create_pipe_from_parameters(net, from_junction=j2, to_junction=j3, length_km=2, - diameter_m=0.05, name="Pipe 2", - geodata=[(2, 0), (2, 4), (7, 4)]) + pandapipes.create_pipe_from_parameters(net, from_junction=j1, to_junction=j2, length_km=10, diameter_mm=0.05 * 1000, + name="Pipe 1", geodata=[(0, 0), (2, 0)]) + pandapipes.create_pipe_from_parameters(net, from_junction=j2, to_junction=j3, length_km=2, diameter_mm=0.05 * 1000, + name="Pipe 2", geodata=[(2, 0), (2, 4), (7, 4)]) pandapipes.create_pipe_from_parameters(net, from_junction=j2, to_junction=j4, length_km=2.5, - diameter_m=0.05, name="Pipe 3", - geodata=[(2, 0), (2, -4), (7, -4)]) - pandapipes.create_pipe_from_parameters(net, from_junction=j3, to_junction=j5, length_km=1, - diameter_m=0.05, name="Pipe 4", - geodata=[(7, 4), (7, 3), (5, 3)]) - pandapipes.create_pipe_from_parameters(net, from_junction=j4, to_junction=j6, length_km=1, - diameter_m=0.05, name="Pipe 5", - geodata=[(7, -4), (7, -3), (5, -3)]) + diameter_mm=0.05 * 1000, name="Pipe 3", geodata=[(2, 0), (2, -4), (7, -4)]) + pandapipes.create_pipe_from_parameters(net, from_junction=j3, to_junction=j5, length_km=1, diameter_mm=0.05 * 1000, + name="Pipe 4", geodata=[(7, 4), (7, 3), (5, 3)]) + pandapipes.create_pipe_from_parameters(net, from_junction=j4, to_junction=j6, length_km=1, diameter_mm=0.05 * 1000, + name="Pipe 5", geodata=[(7, -4), (7, -3), (5, -3)]) pandapipes.create_valve(net, from_junction=j5, to_junction=j6, diameter_m=0.05, opened=True) diff --git a/pandapipes/test/pipeflow_internals/test_inservice.py b/pandapipes/test/pipeflow_internals/test_inservice.py index 1db306804..8dd229ed9 100644 --- a/pandapipes/test/pipeflow_internals/test_inservice.py +++ b/pandapipes/test/pipeflow_internals/test_inservice.py @@ -40,13 +40,11 @@ def create_test_net(): pandapipes.create_ext_grid(net, j1, 1, 285.15, type="pt") - pandapipes.create_pipe_from_parameters(net, j1, j2, 0.1, 0.1, sections=1, alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j3, 0.1, 0.1, sections=2, alpha_w_per_m2k=5, - in_service=False) - pandapipes.create_pipe_from_parameters(net, j4, j6, 0.1, 0.1, sections=2, alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j6, j7, 0.1, 0.1, sections=1, alpha_w_per_m2k=5, - in_service=False) - pandapipes.create_pipe_from_parameters(net, j1, j5, 0.1, 0.1, sections=2, alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j2, 0.1, 0.1 * 1000, sections=1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j3, 0.1, 0.1 * 1000, sections=2, u_w_per_m2k=5, in_service=False) + pandapipes.create_pipe_from_parameters(net, j4, j6, 0.1, 0.1 * 1000, sections=2, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j6, j7, 0.1, 0.1 * 1000, sections=1, u_w_per_m2k=5, in_service=False) + pandapipes.create_pipe_from_parameters(net, j1, j5, 0.1, 0.1 * 1000, sections=2, u_w_per_m2k=5) pandapipes.create_valve(net, j1, j4, 0.1) pandapipes.create_valve(net, j4, j5, 0.1, opened=False) @@ -80,17 +78,14 @@ def complex_heat_connectivity_grid(): pandapipes.create_ext_grid(net, j7, 1, 320.15, type="t", index=2) pandapipes.create_ext_grid(net, j10, 1, 320.15, type="pt", index=1) - pandapipes.create_pipe_from_parameters(net, j1, j2, 0.1, 0.1, alpha_w_per_m2k=5, index=3) - pandapipes.create_pipe_from_parameters(net, j1, j3, 0.1, 0.1, alpha_w_per_m2k=5, index=4) - pandapipes.create_pipe_from_parameters(net, j2, j4, 0.1, 0.1, alpha_w_per_m2k=5, - in_service=False, index=5) - pandapipes.create_pipe_from_parameters(net, j3, j5, 0.1, 0.1, alpha_w_per_m2k=5, - in_service=False, index=7) - pandapipes.create_pipe_from_parameters(net, j6, j7, 0.1, 0.1, alpha_w_per_m2k=5, index=9) - pandapipes.create_pipe_from_parameters(net, j5, j8, 0.1, 0.1, alpha_w_per_m2k=5, - in_service=False, index=8) - pandapipes.create_pipe_from_parameters(net, j8, j10, 0.1, 0.1, alpha_w_per_m2k=5, index=1) - pandapipes.create_pipe_from_parameters(net, j9, j10, 0.1, 0.1, alpha_w_per_m2k=5, index=2) + pandapipes.create_pipe_from_parameters(net, j1, j2, 0.1, 0.1 * 1000, u_w_per_m2k=5, index=3) + pandapipes.create_pipe_from_parameters(net, j1, j3, 0.1, 0.1 * 1000, u_w_per_m2k=5, index=4) + pandapipes.create_pipe_from_parameters(net, j2, j4, 0.1, 0.1 * 1000, u_w_per_m2k=5, index=5, in_service=False) + pandapipes.create_pipe_from_parameters(net, j3, j5, 0.1, 0.1 * 1000, u_w_per_m2k=5, index=7, in_service=False) + pandapipes.create_pipe_from_parameters(net, j6, j7, 0.1, 0.1 * 1000, u_w_per_m2k=5, index=9) + pandapipes.create_pipe_from_parameters(net, j5, j8, 0.1, 0.1 * 1000, u_w_per_m2k=5, index=8, in_service=False) + pandapipes.create_pipe_from_parameters(net, j8, j10, 0.1, 0.1 * 1000, u_w_per_m2k=5, index=1) + pandapipes.create_pipe_from_parameters(net, j9, j10, 0.1, 0.1 * 1000, u_w_per_m2k=5, index=2) pandapipes.create_valve(net, j5, j6, 0.1, index=10) pandapipes.create_valve(net, j4, j5, 0.1, opened=False, index=12) @@ -371,7 +366,7 @@ def test_connectivity_heat4(complex_heat_connectivity_grid, use_numba): net.pipe.in_service.loc[[7, 8]] = True j_new = pandapipes.create_junction(net, 1, 320.15) - pandapipes.create_pipe_from_parameters(net, 8, j_new, 0.1, 0.1, alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, 8, j_new, 0.1, 0.1, u_w_per_m2k=5) net2 = copy.deepcopy(net) @@ -388,7 +383,7 @@ def test_connectivity_heat5(complex_heat_connectivity_grid, use_numba): j_from, j_to = pandapipes.create_junctions(net, 2, 1, 320.15) - pandapipes.create_pipe_from_parameters(net, j_from, j_to, 0.1, 0.1, alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j_from, j_to, 0.1, 0.1, u_w_per_m2k=5) pandapipes.create_sink(net, j_to, 0.1) pandapipes.create_ext_grid(net, j_from, 1, 320.15) @@ -418,7 +413,7 @@ def test_exclude_unconnected_junction(use_numba): pandapipes.create_ext_grid(net, junction=j1, p_bar=1.1, t_k=293.15) pandapipes.create_sink(net, junction=j3, mdot_kg_per_s=0.045) pandapipes.create_pipe_from_parameters(net, from_junction=j1, to_junction=j3, length_km=0.1, - diameter_m=0.05) + diameter_mm=0.05 * 1000) pandapipes.pipeflow(net, use_numba=use_numba) assert net.converged diff --git a/pandapipes/test/pipeflow_internals/test_pipeflow_analytic_comparison.py b/pandapipes/test/pipeflow_internals/test_pipeflow_analytic_comparison.py index 3ad196701..44229ae78 100644 --- a/pandapipes/test/pipeflow_internals/test_pipeflow_analytic_comparison.py +++ b/pandapipes/test/pipeflow_internals/test_pipeflow_analytic_comparison.py @@ -83,7 +83,7 @@ def test_temperature_internal_nodes_single_pipe(use_numba): d = 75e-3 pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) - pandapipes.create_pipe_from_parameters(net, 0, 1, 6, d, k_mm=.1, sections=6, alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, 0, 1, 6, d, k_mm=.1, sections=6, u_w_per_m2k=5) pandapipes.create_ext_grid(net, 0, p_bar=5, t_k=330, type="pt") pandapipes.create_sink(net, 1, mdot_kg_per_s=1) @@ -135,9 +135,9 @@ def test_temperature_internal_nodes_tee_2ab_1zu(use_numba): pandapipes.create_sink(net, j2, mdot_kg_per_s=1) pandapipes.create_sink(net, j3, mdot_kg_per_s=1) - pandapipes.create_pipe_from_parameters(net, j0, j1, 2.5, d, k_mm=.1, alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, d, k_mm=.1, alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j3, 2.5, d, k_mm=.1, alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j1, 2.5, d, k_mm=.1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, d, k_mm=.1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j3, 2.5, d, k_mm=.1, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) @@ -163,18 +163,15 @@ def test_temperature_internal_nodes_tee_2zu_1ab(use_numba): :rtype: """ net = pandapipes.create_empty_network("net", add_stdtypes=False) - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j1 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j2 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j3 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) - pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, d, k_mm=.1, sections=3, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, d, k_mm=.1, sections=3, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, d, k_mm=.1, sections=3, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, d, k_mm=.1, sections=3, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, d, k_mm=.1, sections=3, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, d, k_mm=.1, sections=3, u_w_per_m2k=5) pandapipes.create_ext_grid(net, j0, p_bar=5, t_k=350, type="pt") pandapipes.create_ext_grid(net, j1, p_bar=5, t_k=350, type="pt") pandapipes.create_sink(net, j3, mdot_kg_per_s=1) @@ -203,7 +200,7 @@ def test_temperature_internal_nodes_tee_2zu_1ab_direction_changed(use_numba): :rtype: """ net = pandapipes.create_empty_network("net", add_stdtypes=False) - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j1 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j2 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) @@ -212,12 +209,9 @@ def test_temperature_internal_nodes_tee_2zu_1ab_direction_changed(use_numba): pandapipes.create_ext_grid(net, j1, p_bar=5, t_k=350, type="pt") pandapipes.create_sink(net, j3, mdot_kg_per_s=1) - pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j1, 2.5, d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j1, 2.5, d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, d, k_mm=.1, sections=5, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) @@ -254,10 +248,10 @@ def test_temperature_internal_nodes_2zu_2ab(use_numba): pandapipes.create_sink(net, j3, mdot_kg_per_s=1) pandapipes.create_sink(net, j4, mdot_kg_per_s=1) - pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, d, k_mm=.1, alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, d, k_mm=.1, alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, d, k_mm=.1, alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j2, j4, 2.5, d, k_mm=.1, alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, d, k_mm=.1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, d, k_mm=.1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j3, 2.5, d, k_mm=.1, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j2, j4, 2.5, d, k_mm=.1, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) @@ -283,20 +277,16 @@ def test_temperature_internal_nodes_masche_1load(use_numba): :rtype: """ net = pandapipes.create_empty_network("net", add_stdtypes=False) - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j1 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j2 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j3 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) - pandapipes.create_pipe_from_parameters(net, j0, j1, 2.5, d, k_mm=.1, sections=6, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, d, k_mm=.1, sections=6, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j1, j3, 2.5, d, k_mm=.1, sections=6, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j3, j2, 2.5, d, k_mm=.1, sections=6, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j1, 2.5, d, k_mm=.1, sections=6, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j2, 2.5, d, k_mm=.1, sections=6, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j1, j3, 2.5, d, k_mm=.1, sections=6, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j3, j2, 2.5, d, k_mm=.1, sections=6, u_w_per_m2k=5) pandapipes.create_ext_grid(net, j0, p_bar=5, t_k=350, type="pt") pandapipes.create_sink(net, j2, mdot_kg_per_s=1) @@ -325,17 +315,14 @@ def test_temperature_internal_nodes_masche_1load_changed_direction(use_numba): :rtype: """ net = pandapipes.create_empty_network("net", add_stdtypes=False) - d = 75e-3 + d = 75 j0 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j2 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) j3 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) - pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j0, j3, 2.5, d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) - pandapipes.create_pipe_from_parameters(net, j3, j2, 2.5, d, k_mm=.1, sections=5, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j2, 2.5, d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j0, j3, 2.5, d, k_mm=.1, sections=5, u_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, j3, j2, 2.5, d, k_mm=.1, sections=5, u_w_per_m2k=5) pandapipes.create_fluid_from_lib(net, "water", overwrite=True) diff --git a/pandapipes/test/pipeflow_internals/test_pipeflow_modes.py b/pandapipes/test/pipeflow_internals/test_pipeflow_modes.py index 8daa84d14..9ca5dca9b 100644 --- a/pandapipes/test/pipeflow_internals/test_pipeflow_modes.py +++ b/pandapipes/test/pipeflow_internals/test_pipeflow_modes.py @@ -20,11 +20,10 @@ @pytest.fixture def simple_test_net(): net = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) - pandapipes.create_pipe_from_parameters(net, 0, 1, 6, diameter_m=d, k_mm=.1, sections=1, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, 0, 1, 6, diameter_mm=d, k_mm=.1, sections=1, u_w_per_m2k=5) pandapipes.create_ext_grid(net, 0, p_bar=5, t_k=330, type="pt") pandapipes.create_sink(net, 1, mdot_kg_per_s=1) @@ -67,11 +66,10 @@ def test_hydraulic_only(simple_test_net, use_numba): @pytest.mark.parametrize("use_numba", [True, False]) def test_heat_only(use_numba): net = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) pandapipes.create_junction(net, pn_bar=5, tfluid_k=283) - pandapipes.create_pipe_from_parameters(net, 0, 1, 6, diameter_m=d, k_mm=.1, sections=6, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(net, 0, 1, 6, diameter_mm=d, k_mm=.1, sections=6, u_w_per_m2k=5) pandapipes.create_ext_grid(net, 0, p_bar=5, t_k=330, type="pt") pandapipes.create_sink(net, 1, mdot_kg_per_s=1) @@ -81,11 +79,10 @@ def test_heat_only(use_numba): nonlinear_method="automatic", mode="all", use_numba=use_numba) ntw = pandapipes.create_empty_network("net") - d = 75e-3 + d = 75 pandapipes.create_junction(ntw, pn_bar=5, tfluid_k=283) pandapipes.create_junction(ntw, pn_bar=5, tfluid_k=283) - pandapipes.create_pipe_from_parameters(ntw, 0, 1, 6, diameter_m=d, k_mm=.1, sections=6, - alpha_w_per_m2k=5) + pandapipes.create_pipe_from_parameters(ntw, 0, 1, 6, diameter_mm=d, k_mm=.1, sections=6, u_w_per_m2k=5) pandapipes.create_ext_grid(ntw, 0, p_bar=5, t_k=330, type="pt") pandapipes.create_sink(ntw, 1, mdot_kg_per_s=1) diff --git a/pandapipes/test/plotting/test_collections.py b/pandapipes/test/plotting/test_collections.py index 19011d6c6..d096fa901 100644 --- a/pandapipes/test/plotting/test_collections.py +++ b/pandapipes/test/plotting/test_collections.py @@ -17,7 +17,7 @@ def test_collection_lengths(): net = pandapipes.create_empty_network(add_stdtypes=False) - d = 40e-3 + d = 40 j1 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=293.15, geodata=(0, 0)) j2 = pandapipes.create_junction(net, pn_bar=5, tfluid_k=293.15, geodata=(2, 0)) @@ -36,16 +36,13 @@ def test_collection_lengths(): pandapipes.create_sink(net, j6, mdot_kg_per_s=0.5) pandapipes.create_sink(net, j8, mdot_kg_per_s=0.5) - pandapipes.create_pipe_from_parameters(net, j1, j2, 0.1, diameter_m=d, k_mm=0.1, - geodata=[(0, 0), (2, 0)]) + pandapipes.create_pipe_from_parameters(net, j1, j2, 0.1, diameter_mm=d, k_mm=0.1, geodata=[(0, 0), (2, 0)]) pandapipes.create_valve(net, j2, j3, diameter_m=d, opened=True, loss_coefficient=5e3) pandapipes.create_valve(net, j2, j4, diameter_m=d, opened=False, loss_coefficient=0.01) pandapipes.create_valve(net, j2, j5, diameter_m=d, opened=False, loss_coefficient=0.01) - pandapipes.create_pipe_from_parameters(net, j3, j6, 0.1, diameter_m=d, k_mm=0.1, - geodata=[(4, 2), (6, 2), (6, 0)]) - pandapipes.create_pipe_from_parameters(net, j4, j6, 0.2, diameter_m=d, k_mm=0.1, - geodata=[(4, 0), (6, 0)]) - pandapipes.create_pipe_from_parameters(net, j5, j6, 0.2, diameter_m=d, k_mm=0.1, + pandapipes.create_pipe_from_parameters(net, j3, j6, 0.1, diameter_mm=d, k_mm=0.1, geodata=[(4, 2), (6, 2), (6, 0)]) + pandapipes.create_pipe_from_parameters(net, j4, j6, 0.2, diameter_mm=d, k_mm=0.1, geodata=[(4, 0), (6, 0)]) + pandapipes.create_pipe_from_parameters(net, j5, j6, 0.2, diameter_mm=d, k_mm=0.1, geodata=[(4, -2), (6, -2), (6, 0)]) pandapipes.create_heat_exchanger(net, j6, j7, d, qext_w=20000) pandapipes.create_pump_from_parameters(net, j7, j8, 'P1') diff --git a/pandapipes/test/plotting/test_pipeflow_results.py b/pandapipes/test/plotting/test_pipeflow_results.py index 5e288938f..6194c976c 100644 --- a/pandapipes/test/plotting/test_pipeflow_results.py +++ b/pandapipes/test/plotting/test_pipeflow_results.py @@ -17,13 +17,10 @@ def test_pressure_profile_to_junction_geodata(): pp.create_ext_grid(net, junction=j1, p_bar=1.1, t_k=293.15) pp.create_sink(net, junction=j4, mdot_kg_per_s=0.01) - pp.create_pipe_from_parameters(net, from_junction=j1, to_junction=j2, - length_km=0.2, diameter_m=0.05) + pp.create_pipe_from_parameters(net, from_junction=j1, to_junction=j2, length_km=0.2, diameter_mm=0.05 * 1000) - pp.create_pipe_from_parameters(net, from_junction=j2, to_junction=j3, - length_km=0.3, diameter_m=0.05) - pp.create_pipe_from_parameters(net, from_junction=j3, to_junction=j4, - length_km=0.4, diameter_m=0.05) + pp.create_pipe_from_parameters(net, from_junction=j2, to_junction=j3, length_km=0.3, diameter_mm=0.05 * 1000) + pp.create_pipe_from_parameters(net, from_junction=j3, to_junction=j4, length_km=0.4, diameter_mm=0.05 * 1000) pp.pipeflow(net) @@ -33,9 +30,8 @@ def test_pressure_profile_to_junction_geodata(): assert np.isclose(jgd.x.loc[jgd.index].values, [0.0, 0.2, 0.5, 0.9]).all() #add parallel pipe to test meshed topology - pp.create_pipe_from_parameters(net, from_junction=j1, to_junction=j4, - length_km=0.2, diameter_m=0.05, - name="Pipe 1") + pp.create_pipe_from_parameters(net, from_junction=j1, to_junction=j4, length_km=0.2, diameter_mm=0.05 * 1000, + name="Pipe 1") pp.pipeflow(net) jgd = plot.pressure_profile_to_junction_geodata(net) assert jgd.y.loc[jgd.index].equals(net.res_junction.p_bar.loc[jgd.index]) diff --git a/pandapipes/test/test_toolbox.py b/pandapipes/test/test_toolbox.py index 2c5bc1ae6..224147700 100644 --- a/pandapipes/test/test_toolbox.py +++ b/pandapipes/test/test_toolbox.py @@ -46,27 +46,23 @@ def create_base_net(oos): pandapipes.create_ext_grid(net, junction=junction1, p_bar=1.1, t_k=293.15, name="Grid Connection") - pandapipes.create_pipe_from_parameters(net, from_junction=junction1, to_junction=junction2, - length_km=10, diameter_m=0.3, name="Pipe 1", - geodata=[(0, 0), (2, 0)], in_service=not oos) - pandapipes.create_pipe_from_parameters(net, from_junction=junction2, to_junction=junction3, - length_km=2, diameter_m=0.3, name="Pipe 2", - geodata=[(2, 0), (2, 4), (7, 4)], in_service=not oos) - pandapipes.create_pipe_from_parameters(net, from_junction=junction2, to_junction=junction4, - length_km=2.5, diameter_m=0.3, name="Pipe 3", - geodata=[(2, 0), (2, -4), (7, -4)], in_service=not oos) - pandapipes.create_pipe_from_parameters(net, from_junction=junction3, to_junction=junction5, - length_km=1, diameter_m=0.3, name="Pipe 4", - geodata=[(7, 4), (7, 3), (5, 3)]) - pandapipes.create_pipe_from_parameters(net, from_junction=junction4, to_junction=junction6, - length_km=1, diameter_m=0.3, name="Pipe 5", - geodata=[(7, -4), (7, -3), (5, -3)]) - pandapipes.create_pipe_from_parameters(net, from_junction=junction7, to_junction=junction8, - length_km=1, diameter_m=0.3, name="Pipe 6", - geodata=[(9, -4), (9, 0)]) - pandapipes.create_pipe_from_parameters(net, from_junction=junction7, to_junction=junction8, - length_km=1, diameter_m=0.3, name="Pipe 7", - geodata=[(9, 0), (9, 4)]) + pandapipes.create_pipe_from_parameters(net, from_junction=junction1, to_junction=junction2, length_km=10, + diameter_mm=0.3 * 1000, name="Pipe 1", geodata=[(0, 0), (2, 0)], + in_service=not oos) + pandapipes.create_pipe_from_parameters(net, from_junction=junction2, to_junction=junction3, length_km=2, + diameter_mm=0.3 * 1000, name="Pipe 2", geodata=[(2, 0), (2, 4), (7, 4)], + in_service=not oos) + pandapipes.create_pipe_from_parameters(net, from_junction=junction2, to_junction=junction4, length_km=2.5, + diameter_mm=0.3 * 1000, name="Pipe 3", geodata=[(2, 0), (2, -4), (7, -4)], + in_service=not oos) + pandapipes.create_pipe_from_parameters(net, from_junction=junction3, to_junction=junction5, length_km=1, + diameter_mm=0.3 * 1000, name="Pipe 4", geodata=[(7, 4), (7, 3), (5, 3)]) + pandapipes.create_pipe_from_parameters(net, from_junction=junction4, to_junction=junction6, length_km=1, + diameter_mm=0.3 * 1000, name="Pipe 5", geodata=[(7, -4), (7, -3), (5, -3)]) + pandapipes.create_pipe_from_parameters(net, from_junction=junction7, to_junction=junction8, length_km=1, + diameter_mm=0.3 * 1000, name="Pipe 6", geodata=[(9, -4), (9, 0)]) + pandapipes.create_pipe_from_parameters(net, from_junction=junction7, to_junction=junction8, length_km=1, + diameter_mm=0.3 * 1000, name="Pipe 7", geodata=[(9, 0), (9, 4)]) pandapipes.create_valve(net, from_junction=junction5, to_junction=junction6, diameter_m=0.05, opened=True) @@ -258,6 +254,7 @@ def test_select_subnet(base_net_is_wo_pumps): # check length of results net = nw.gas_tcross2() + print(net.pipe) pandapipes.pipeflow(net) net2 = pandapipes.select_subnet(net, net.junction.index[:-3], include_results=True) for comp in net.component_list: