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

# Conflicts:
#	requirements.txt

Author: BonneelP

Tests/Data/Load_GUI/DFIM_001.json

@@ -123,7 +123,7 @@
             "Npcpp": 1,
             "Nslot_shift_wind": 0,
             "Ntcoil": 1,
-            "__class__": "WindingDW2L",
+            "__class__": "Winding",
             "coil_pitch": 0,
             "conductor": {
                 "Hwire": 0.005,
@@ -348,7 +348,7 @@
             "Npcpp": 1,
             "Nslot_shift_wind": 0,
             "Ntcoil": 1,
-            "__class__": "WindingDW2L",
+            "__class__": "Winding",
             "coil_pitch": 0,
             "conductor": {
                 "Hwire": 0.005,

Tests/Data/Load_GUI/SCIM_001.json

@@ -166,7 +166,7 @@
             "Npcpp": null,
             "Nslot_shift_wind": null,
             "Ntcoil": null,
-            "__class__": "WindingSC",
+            "__class__": "Winding",
             "conductor": {
                 "Hbar": 0.02,
                 "Wbar": 0.01,
@@ -385,7 +385,7 @@
             "Npcpp": 1,
             "Nslot_shift_wind": 0,
             "Ntcoil": 1,
-            "__class__": "WindingDW2L",
+            "__class__": "Winding",
             "coil_pitch": 0,
             "conductor": {
                 "Hwire": 0.005,

Tests/Functions/test_coordinate_transformation.py

@@ -27,11 +27,13 @@ def test_coordinate_transformation_Ok():
 
     X_uvw = array([[1, -0.5, -0.5], [-1, 0.5, 0.5]])
     X_ab = array([[1, 0], [0, 1]])
+    X_ab_wrong = array([1, 0])
 
     th_90 = pi / 2
     th_180 = pi
 
     X_dq90 = array([[0, -1], [1, 0]])
+    X_dq90_wrong = array([[0, -1]])
     X_dq180 = array([[-1, 0], [0, -1]])
 
     assert_array_almost_equal(ab2n(n2ab(X_uvw)), X_uvw)
@@ -40,3 +42,5 @@ def test_coordinate_transformation_Ok():
 
     assert_array_almost_equal(ab2dq(X_ab, th_90), X_dq90)
     assert_array_almost_equal(ab2dq(X_ab, th_180), X_dq180)
+
+    assert_array_almost_equal(ab2dq(X_ab_wrong, th_90), X_dq90_wrong)

Tests/Functions/test_gmsh2.py

@@ -112,7 +112,7 @@ def test_gmsh_spm():
         path_save=join(save_path, "GSMH_model_spm.msh"),
     )
 
-    with open("gmsh_test_spm.json", "w") as fw:
+    with open(join(save_path, "gmsh_test_spm.json"), "w") as fw:
         json.dump(gmsh_dict, fw, default=encode_complex, indent=4)
 
 

Tests/GUI/DMachineSetup/test_DAVDuct.py

@@ -269,3 +269,19 @@ def test_remove_circ(self):
         assert self.widget.tab_vent.widget(0).w_vent.lf_H0.value() == 10e-3
         assert self.widget.tab_vent.widget(0).w_vent.lf_D0.value() == 40e-3
         assert self.widget.tab_vent.widget(0).w_vent.lf_Alpha0.value() == 0
+
+    def test_check_PVentCirc(self):
+        """Test that check of PVentCirc"""
+        lam = Lamination(Rint=0.1, Rext=1, is_stator=True, is_internal=True)
+        vent = VentilationCirc(Zh=8, H0=10e-3, D0=40e-3, Alpha0=None)
+        assert PVentCirc(vent=vent, lam=lam).check() == "You must set Alpha0 !"
+
+        vent = VentilationCirc(Zh=8, H0=10e-3, D0=None, Alpha0=None)
+        assert PVentCirc(vent=vent, lam=lam).check() == "You must set D0 !"
+
+        vent = VentilationCirc(Zh=8, H0=None, D0=None, Alpha0=None)
+        assert PVentCirc(vent=vent, lam=lam).check() == "You must set H0 !"
+
+        pvent = PVentCirc(vent=vent, lam=lam)
+        pvent.vent.Zh = None
+        assert pvent.check() == "You must set Zh !"

Tests/GUI/DMachineSetup/test_PHoleM50.py

@@ -223,3 +223,31 @@ def test_set_material_2(self):
 
         assert self.widget.w_mat_2.c_mat_type.currentText() == "Magnet1"
         assert self.test_obj.hole[0].magnet_1.mat_type.name == "Magnet1"
+
+    def test_comp_output(self):
+        """Check that you can compute the output only if the hole is correctly set """
+        self.test_obj = LamHole(Rint=0.1, Rext=0.2)
+        self.test_obj.hole = list()
+        self.test_obj.hole.append(
+            HoleM50(
+                H0=0.20,
+                H1=0.11,
+                H2=0.12,
+                W0=0.23,
+                W1=0.14,
+                W2=0.15,
+                H3=0.16,
+                W3=0.27,
+                H4=0.18,
+                W4=0.19,
+            )
+        )
+        self.widget.hole = self.test_obj.hole[0]
+        self.widget.comp_output()
+
+        # Nan are there because the value are not correct for the sin, cos and tan methods. But with true values, it works.
+
+        assert self.widget.out_slot_surface.text() == "Slot suface (2 part): nan m²"
+        assert self.widget.out_magnet_surface.text() == "Magnet surface: 0.0608 m²"
+        assert self.widget.out_alpha.text() == "alpha: nan rad (nan°)"
+        assert self.widget.out_W5.text() == "W5: nan m"

Tests/GUI/DMachineSetup/test_PHoleM51.py

@@ -94,21 +94,31 @@ def test_set_W0(self):
         """Check that the Widget allow to update W0"""
         # Clear the field before writing the new value
         self.widget.lf_W0.clear()
-        QTest.keyClicks(self.widget.lf_W0, "0.31")
+        QTest.keyClicks(self.widget.lf_W0, "0.30")
         self.widget.lf_W0.editingFinished.emit()  # To trigger the slot
 
-        assert self.widget.hole.W0 == 0.31
-        assert self.test_obj.hole[0].W0 == 0.31
+        assert self.widget.hole.W0 == 0.30
+        assert self.test_obj.hole[0].W0 == 0.30
 
     def test_set_W1(self):
         """Check that the Widget allow to update W1"""
         # Clear the field before writing the new value
         self.widget.lf_W1.clear()
-        QTest.keyClicks(self.widget.lf_W1, "0.32")
+        QTest.keyClicks(self.widget.lf_W1, "0.31")
         self.widget.lf_W1.editingFinished.emit()  # To trigger the slot
 
-        assert self.widget.hole.W1 == 0.32
-        assert self.test_obj.hole[0].W1 == 0.32
+        assert self.widget.hole.W1 == 0.31
+        assert self.test_obj.hole[0].W1 == 0.31
+
+    def test_set_W2(self):
+        """Check that the Widget allow to update W2"""
+        # Clear the field before writing the new value
+        self.widget.lf_W2.clear()
+        QTest.keyClicks(self.widget.lf_W2, "0.32")
+        self.widget.lf_W2.editingFinished.emit()  # To trigger the slot
+
+        assert self.widget.hole.W2 == 0.32
+        assert self.test_obj.hole[0].W2 == 0.32
 
     def test_set_W3(self):
         """Check that the Widget allow to update W3"""
@@ -217,3 +227,12 @@ def test_set_material_3(self):
 
         assert self.widget.w_mat_3.c_mat_type.currentText() == "Magnet3"
         assert self.test_obj.hole[0].magnet_2.mat_type.name == "Magnet3"
+
+    def test_comp_output(self):
+        """Check that comp_output is correctly working"""
+        self.test_obj.hole[0].W0 = 0.5
+        self.test_obj.hole[0].H0 = 0.00000001
+        self.widget.hole = self.test_obj.hole[0]
+        self.widget.comp_output()
+        assert not (self.widget.out_alpha.text() == "alpha: ?")
+        assert not (self.widget.out_Whole.text() == "Wslot: ?")

Tests/GUI/DMachineSetup/test_PHoleM52.py

@@ -62,6 +62,21 @@ def test_init(self):
         assert self.widget.w_mat_1.c_mat_type.currentText() == "Magnet2"
         assert self.widget.w_mat_1.c_mat_type.currentIndex() == 1
 
+        self.test_obj = LamHole(Rint=0.1, Rext=0.2)
+        self.test_obj.hole = list()
+        self.test_obj.hole.append(HoleM52(H0=0.10, H1=0.11, H2=0.12, W0=0.13, W3=0.17))
+        self.test_obj.hole[0].magnet_0 == None
+
+        self.matlib = MatLib()
+        self.matlib.dict_mat["RefMatLib"] = [
+            Material(name="Magnet1"),
+            Material(name="Magnet2"),
+            Material(name="Magnet3"),
+        ]
+
+        self.widget = PHoleM52(self.test_obj.hole[0], self.matlib)
+        assert not self.widget.w_mat_1.isHidden()
+
     def test_set_W0(self):
         """Check that the Widget allow to update W0"""
         # Clear the field before writing the new value
@@ -125,3 +140,20 @@ def test_set_material_1(self):
 
         assert self.widget.w_mat_1.c_mat_type.currentText() == "Magnet1"
         assert self.test_obj.hole[0].magnet_0.mat_type.name == "Magnet1"
+
+    def test_comp_output(self):
+        """Check that you can compute the output only if the hole is correctly set """
+        self.test_obj = LamHole(Rint=0.1, Rext=0.2)
+        self.test_obj.hole = list()
+        self.test_obj.hole.append(
+            HoleM52(H0=0.0010, H1=0.11, H2=0.00012, W0=0.0013, W3=0.0017)
+        )
+        self.widget.hole = self.test_obj.hole[0]
+        self.widget.comp_output()
+
+        # Nan are there because the value are not correct for the sin, cos and tan methods. But with true values, it works.
+
+        assert self.widget.out_slot_surface.text() == "Slot suface: 0.002569 m²"
+        assert self.widget.out_magnet_surface.text() == "Magnet surface: 0.000143 m²"
+        assert self.widget.out_alpha.text() == "alpha: 0.166 rad (9.511°)"
+        assert self.widget.out_W1.text() == "W1: 0.006234 m"

Tests/GUI/DMachineSetup/test_PHoleM53.py

@@ -165,3 +165,49 @@ def test_set_material_2(self):
 
         assert self.widget.w_mat_2.c_mat_type.currentText() == "Magnet1"
         assert self.test_obj.hole[0].magnet_1.mat_type.name == "Magnet1"
+
+    def test_comp_output(self):
+        """Check that comp_output is correctly working"""
+        self.test_obj.hole[0] = HoleM53(
+            H0=0.10,
+            H1=0.0000000000011,
+            H2=0.12,
+            H3=0.0000000000015,
+            W4=0.99,
+            W1=0.14,
+            W2=0.0000015,
+            W3=0.0000017,
+        )
+        self.widget.hole = self.test_obj.hole[0]
+        self.widget.comp_output()
+
+        assert self.widget.out_slot_surface.text() == "Slot suface (2 part): 0.01033 m²"
+        assert self.widget.out_magnet_surface.text() == "Magnet surface: 4.08e-07 m²"
+        assert self.widget.out_W5.text() == "W5: 0.01565 m"
+
+    def test_PHoleM53_None_Magnet(self):
+        """Check that you can create PHoleM53 with None for magnet_0"""
+        self.test_obj.hole.append(
+            HoleM53(
+                H0=0.10,
+                H1=0.11,
+                H2=0.12,
+                W4=0.13,
+                W1=0.14,
+                W2=0.15,
+                W3=0.17,
+                magnet_0=None,
+            )
+        )
+
+        self.matlib = MatLib()
+        self.matlib.dict_mat["RefMatLib"] = [
+            Material(name="Magnet1"),
+            Material(name="Magnet2"),
+            Material(name="Magnet3"),
+        ]
+
+        self.widget = PHoleM53(self.test_obj.hole[1], self.matlib)
+
+        assert self.widget.w_mat_1.isHidden()
+        assert self.widget.w_mat_2.isHidden()

Tests/GUI/DMachineSetup/test_PHoleM57.py

@@ -30,7 +30,20 @@ def setup_method(self, method):
         self.test_obj.hole.append(
             HoleM57(H1=0.11, H2=0.12, W0=0.13, W1=0.14, W2=0.15, W3=0.17, W4=0.19)
         )
+        self.test_obj.hole.append(
+            HoleM57(
+                H1=0.11,
+                H2=0.12,
+                W0=0.13,
+                W1=0.14,
+                W2=0.15,
+                W3=0.17,
+                W4=0.19,
+                magnet_0=None,
+            )
+        )
         self.widget = PHoleM57(self.test_obj.hole[0])
+        self.widget2 = PHoleM57(self.test_obj.hole[1])
 
     @classmethod
     def setup_class(cls):
@@ -57,6 +70,8 @@ def test_init(self):
         assert self.widget.lf_W3.value() == 0.17
         assert self.widget.lf_W4.value() == 0.19
 
+        assert self.widget.w_mat_1.isHidden() == False
+
         self.test_obj.hole[0] = HoleM57(
             H1=0.21, H2=0.22, W0=0.23, W1=0.24, W2=0.25, W3=0.27, W4=0.29
         )
@@ -69,6 +84,8 @@ def test_init(self):
         assert self.widget.lf_W3.value() == 0.27
         assert self.widget.lf_W4.value() == 0.29
 
+        assert self.widget2.w_mat_1.isHidden() == True
+
     def test_set_W0(self):
         """Check that the Widget allow to update W0"""
         # Clear the field before writing the new value