change units, #32

openego · Sep 5, 2017 · 54f0cea · 54f0cea
1 parent 513a790
commit 54f0cea
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/edisgo/equipment/equipment-parameters_LV_cables.csv b/edisgo/equipment/equipment-parameters_LV_cables.csv
@@ -1,10 +1,10 @@
 name,U_n,I_max_th,R,L,C,Source
-#-,V,A,ohm/km,mH/km,uF/km,-
-NAYY 4x1x300,400,419,0.1,0.279,,FaberKabel
-NAYY 4x1x240,400,364,0.125,0.254,,FaberKabel
-NAYY 4x1x185,400,313,0.164,0.256,,FaberKabel
-NAYY 4x1x150,400,275,0.206,0.256,,FaberKabel
-NAYY 4x1x120,400,245,0.253,0.256,,FaberKabel
-NAYY 4x1x95,400,215,0.320,0.261,,FaberKabel
-NAYY 4x1x50,400,144,0.449,0.270,,FaberKabel
-NAYY 4x1x35,400,123,0.868,0.271,,FaberKabel
+#-,kV,A,ohm/km,mH/km,uF/km,-
+NAYY 4x1x300,0.4,419,0.1,0.279,,FaberKabel
+NAYY 4x1x240,0.4,364,0.125,0.254,,FaberKabel
+NAYY 4x1x185,0.4,313,0.164,0.256,,FaberKabel
+NAYY 4x1x150,0.4,275,0.206,0.256,,FaberKabel
+NAYY 4x1x120,0.4,245,0.253,0.256,,FaberKabel
+NAYY 4x1x95,0.4,215,0.320,0.261,,FaberKabel
+NAYY 4x1x50,0.4,144,0.449,0.270,,FaberKabel
+NAYY 4x1x35,0.4,123,0.868,0.271,,FaberKabel
diff --git a/edisgo/equipment/equipment-parameters_LV_transformers.csv b/edisgo/equipment/equipment-parameters_LV_transformers.csv
@@ -1,4 +1,4 @@
-name,s_nom,r,x
+name,s_nom,R,X
 #-,kVA,Ohm,Ohm
 # Source 100..1000 kVar transformers: Torsten Werth; Netzberechnung mit Erzeugungsprofilen --
 # Grundlagen, Berechnung, Anwendung; Springer; 2016

diff --git a/edisgo/equipment/equipment-parameters_MV_cables.csv b/edisgo/equipment/equipment-parameters_MV_cables.csv
@@ -1,5 +1,5 @@
 name,U_n,I_max_th,R,L,C
-#-,V,A,ohm/km,mH/km,uF/km,-
+#-,kV,A,ohm/km,mH/km,uF/km,-
 NA2XS2Y 3x1x185 RM/25,10,357,0.164,0.38,0.41
 NA2XS2Y 3x1x240 RM/25,10,417,0.125,0.36,0.47
 NA2XS2Y 3x1x300 RM/25,10,466,0.1,0.35,0.495

diff --git a/edisgo/equipment/equipment-parameters_MV_overhead_lines.csv b/edisgo/equipment/equipment-parameters_MV_overhead_lines.csv
@@ -1,5 +1,5 @@
 name,U_n,I_max_th,R,L,C
-#-,V,A,ohm/km,mH/km,uF/km,-
+#-,kV,A,ohm/km,mH/km,uF/km,-
 48-AL1/8-ST1A,10,210,0.35,1.11,0.0104
 94-AL1/15-ST1A,10,350,0.33,1.05,0.0112
 122-AL1/20-ST1A,10,410,0.31,0.99,0.0115

diff --git a/edisgo/equipment/equipment-parameters_MV_transformers.csv b/edisgo/equipment/equipment-parameters_MV_transformers.csv
@@ -1,4 +1,4 @@
-name,s_nom,r,x
+name,s_nom,R,X
 #-,kVA,Ohm,Ohm
 20 MVA,20000,0,0
 32 MVA,32000,0,0