Merge branch 'master' of https://github.com/Eomys/pyleecan

Author: BonneelP

pyleecan/Classes/Class_Dict.json

@@ -7721,6 +7721,7 @@
         "daughters": [
             "Slot19",
             "SlotCirc",
+            "SlotDC",
             "SlotMFlat",
             "SlotMFlat2",
             "SlotMPolar",
@@ -7894,6 +7895,104 @@
             }
         ]
     },
+    "SlotDC": {
+        "constants": [
+            {
+                "name": "VERSION",
+                "value": "1"
+            },
+            {
+                "name": "IS_SYMMETRICAL",
+                "value": "1"
+            }
+        ],
+        "daughters": [],
+        "desc": "Slot with two rods (for double squirrel cage)",
+        "is_internal": false,
+        "methods": [
+            "_comp_point_coordinate",
+            "build_geometry",
+            "get_surface_wind"
+        ],
+        "mother": "SlotWind",
+        "name": "SlotDC",
+        "package": "Slot",
+        "path": "pyleecan/Generator/ClassesRef/Slot/SlotDC.csv",
+        "properties": [
+            {
+                "desc": "Slot isthmus width.",
+                "max": "",
+                "min": "0",
+                "name": "W1",
+                "type": "float",
+                "unit": "m",
+                "value": 0.0122
+            },
+            {
+                "desc": "Distance upper rod center to bore",
+                "max": "",
+                "min": "0",
+                "name": "H1",
+                "type": "float",
+                "unit": "m",
+                "value": 0.0122
+            },
+            {
+                "desc": "Diameter upper rod",
+                "max": "",
+                "min": "0",
+                "name": "D1",
+                "type": "float",
+                "unit": "m",
+                "value": 0.001
+            },
+            {
+                "desc": "Middle connection width",
+                "max": "",
+                "min": "0",
+                "name": "W2",
+                "type": "float",
+                "unit": "m",
+                "value": 0.0122
+            },
+            {
+                "desc": "Height between the first and second center",
+                "max": "",
+                "min": "0",
+                "name": "H2",
+                "type": "float",
+                "unit": "m",
+                "value": 0.001
+            },
+            {
+                "desc": "Diameter upper section lower rod",
+                "max": "",
+                "min": "0",
+                "name": "D2",
+                "type": "float",
+                "unit": "m",
+                "value": 0.001
+            },
+            {
+                "desc": "Length of lower rod",
+                "max": "",
+                "min": "0",
+                "name": "H3",
+                "type": "float",
+                "unit": "m",
+                "value": 0.001
+            },
+            {
+                "desc": "Radius lower section lower rod",
+                "max": "",
+                "min": "0",
+                "name": "R3",
+                "type": "float",
+                "unit": "m",
+                "value": 0.001
+            }
+        ]
+    },
     "SlotMFlat": {
         "constants": [
             {
@@ -9795,6 +9894,7 @@
         ],
         "daughters": [
             "SlotCirc",
+            "SlotDC",
             "SlotUD",
             "SlotW10",
             "SlotW11",

pyleecan/Classes/import_all.py

@@ -140,6 +140,7 @@
 from ..Classes.Slot import Slot
 from ..Classes.Slot19 import Slot19
 from ..Classes.SlotCirc import SlotCirc
+from ..Classes.SlotDC import SlotDC
 from ..Classes.SlotMFlat import SlotMFlat
 from ..Classes.SlotMFlat2 import SlotMFlat2
 from ..Classes.SlotMPolar import SlotMPolar

pyleecan/Functions/load_switch.py

@@ -142,6 +142,7 @@
     "Slot": Slot,
     "Slot19": Slot19,
     "SlotCirc": SlotCirc,
+    "SlotDC": SlotDC,
     "SlotMFlat": SlotMFlat,
     "SlotMFlat2": SlotMFlat2,
     "SlotMPolar": SlotMPolar,

pyleecan/Methods/Machine/LamSlotWind/plot.py

@@ -71,9 +71,12 @@ def plot(
             wind_mat = None
             qs = 1
         else:
-            Zs = self.get_Zs()
-            wind_mat = self.winding.comp_connection_mat(Zs)
-            qs = self.winding.qs
+            try:
+                wind_mat = self.winding.comp_connection_mat(self.get_Zs())
+                qs = self.winding.qs
+            except:
+                wind_mat = None
+                qs = 1
     else:
         wind_mat = None
         qs = 1

requirements.txt

@@ -18,4 +18,5 @@ h5py>=2.10.0
 nbformat
 nbconvert
 quadpy
+ezdxf>=0.14.2
 pytest-qt>=3.3.0