-fixed u name

e2nIEE · Nov 6, 2023 · 7152f68 · 7152f68
1 parent f16fc41
commit 7152f68
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/pandapipes/create.py b/pandapipes/create.py
@@ -430,7 +430,6 @@ def create_pipe(net, from_junction, to_junction, std_type, length_km, k_mm=0.2,
         >>>             std_type='315_PE_80_SDR_17', length_km=1)
 
     """
-    from pandapipes.toolbox import calculate_alpha
     add_new_component(net, Pipe)
 
     index = _get_index_with_check(net, "pipe", index)
@@ -439,10 +438,10 @@ def create_pipe(net, from_junction, to_junction, std_type, length_km, k_mm=0.2,
 
     pipe_parameter = load_std_type(net, std_type, "pipe")
 
-    if pd.notna(pipe_parameter['u_w/mk']) and alpha_w_per_m2k == 0.0:
-        pipe_parameter['u_w/mk'] = float(pipe_parameter['u_w/mk'])
-        alpha_w_per_m2k = calculate_alpha(pipe_parameter['inner_diameter_mm'], pipe_parameter['u_w/mk'])
-    elif pd.notna(pipe_parameter['u_w/mk']) and alpha_w_per_m2k != 0.0:
+    if pd.notna(pipe_parameter['u_w_per_m2k']) and alpha_w_per_m2k == 0.0:
+        pipe_parameter['u_w_per_m2k'] = float(pipe_parameter['u_w_per_m2k'])
+        alpha_w_per_m2k = pipe_parameter['u_w_per_mk']
+    elif pd.notna(pipe_parameter['u_w_per_m2k']) and alpha_w_per_m2k != 0.0:
         alpha_w_per_m2k = alpha_w_per_m2k
         logger.warning('you have defined alpha which overwrites the heat_transfer coefficient of the pipe standard type')
     else:

diff --git a/pandapipes/std_types/library/Pipe.csv b/pandapipes/std_types/library/Pipe.csv
@@ -1,4 +1,4 @@
-std_type;nominal_width_mm;outer_diameter_mm;inner_diameter_mm;standard_dimension_ratio;material;u_w/mk
+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;
 100_GGG;100;118;105.8;19.34;GGG;
 125_GGG;125;144;131.6;23.23;GGG;

diff --git 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 numpy as np
 import pandas as pd
 from pandapipes import pp_dir
 from pandapipes.std_types.std_type_class import get_data, PumpStdType

diff --git a/pandapipes/toolbox.py b/pandapipes/toolbox.py
@@ -615,6 +615,3 @@ def get_internal_tables_pandas(net, convert_types=True):
                         tbl[col] = tbl[col].astype(np.bool_)
 
     return node_table, branch_table
-
-def calculate_alpha(d, u):
-    return u / (d/1000 * np.pi)