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

Author: BonneelP

Tests/Functions/test_gmsh.py

@@ -13,6 +13,7 @@
 
 
 @pytest.mark.GMSH
+@pytest.mark.long
 def test_slot_10():
     """Check generation of the 3D mesh of Slot 10 with gmsh"""
     if isinstance(gen_3D_mesh, ImportError):

Tests/Methods/Slot/test_SlotW10_meth.py

@@ -217,7 +217,7 @@ def test_build_geometry_wind(self):
         point_ref = (Z7 + Ztan1 + Ztan2 + Z6) / 4
 
         surface = SurfLine(
-            line_list=curve_list, point_ref=point_ref, label="WindS_R0_T0_S0"
+            line_list=curve_list, point_ref=point_ref, label="Wind_Stator_R0_T0_S0"
         )
         expected.append(surface)
 
@@ -229,7 +229,7 @@ def test_build_geometry_wind(self):
         curve_list.append(Segment(Ztan2, Ztan1))
         point_ref = (Z4 + Ztan1 + Ztan2 + Z5) / 4
         surface = SurfLine(
-            line_list=curve_list, point_ref=point_ref, label="WindS_R0_T1_S0"
+            line_list=curve_list, point_ref=point_ref, label="Wind_Stator_R0_T1_S0"
         )
         expected.append(surface)
 

Tests/Methods/Slot/test_SlotW21_meth.py

@@ -209,7 +209,7 @@ def test_build_geometry_wind(self):
         curve_list.append(Segment(Z4, Z3))
         point_ref = (Z3 + Ztan1 + Ztan2 + Z4) / 4
         surface = SurfLine(
-            line_list=curve_list, point_ref=point_ref, label="WindS_R0_T0_S0"
+            line_list=curve_list, point_ref=point_ref, label="Wind_Stator_R0_T0_S0"
         )
         expected.append(surface)
 
@@ -221,7 +221,7 @@ def test_build_geometry_wind(self):
         curve_list.append(Segment(Ztan2, Ztan1))
         point_ref = (Z5 + Ztan1 + Ztan2 + Z6) / 4
         surface = SurfLine(
-            line_list=curve_list, point_ref=point_ref, label="WindS_R0_T1_S0"
+            line_list=curve_list, point_ref=point_ref, label="Wind_Stator_R0_T1_S0"
         )
         expected.append(surface)
 

Tests/Plot/test_ICEM_2020.py

@@ -90,6 +90,7 @@ def test_FEMM_sym():
 
 
 @pytest.mark.GMSH
+@pytest.mark.long
 def test_gmsh_mesh_dict():
     """Figure 10: Generate a 3D mesh with Gmsh by setting the
     number of element on each lines
@@ -149,8 +150,10 @@ def test_gmsh_mesh_dict():
 
 
 @pytest.mark.GMSH
+@pytest.mark.long
 def test_SlotMulti_sym():
-    """Figure 11: Generate a 3D mesh with GMSH for a lamination
+    """Figure 11: Genera
+    te a 3D mesh with GMSH for a lamination
     with several slot types and notches
     """
 

Tests/Validation/Simulation/test_E_IPMSM_FL_002.py

@@ -51,7 +51,11 @@ def test_E_IPMSM_FL_002():
     simu.run()
 
     # Definition of the magnetic simulation (FEMM)
-    simu2.mag = MagFEMM(type_BH_stator=0, type_BH_rotor=0, is_periodicity_a=True,)
+    simu2.mag = MagFEMM(
+        type_BH_stator=0,
+        type_BH_rotor=0,
+        is_periodicity_a=True,
+    )
 
     out2 = Output(simu=simu2)
     simu2.run()

Tests/Validation/Simulation/test_FM_MT_SynRM_FL_001_.py

@@ -64,7 +64,11 @@ def test_Magnetic_AGSF():
     )
 
     # Definition of the magnetic simulation (1/2 symmetry)
-    simu.mag = MagFEMM(type_BH_stator=0, type_BH_rotor=0, is_periodicity_a=True,)
+    simu.mag = MagFEMM(
+        type_BH_stator=0,
+        type_BH_rotor=0,
+        is_periodicity_a=True,
+    )
 
     # Definition of the magnetic simulation (no symmetry)
     simu.force = ForceMT(is_periodicity_a=True)

Tests/Validation/Simulation/test_IPMSM_torque_current_angle.py

@@ -26,7 +26,10 @@ def test_OP():
     simu = Simu1(name="tuto_Id_Iq", machine=IPMSM_A)
 
     # Definition of the magnetic simulation (FEMM with symmetry and sliding band)
-    simu.mag = MagFEMM(is_periodicity_a=True, Kgeo_fineness=1,)
+    simu.mag = MagFEMM(
+        is_periodicity_a=True,
+        Kgeo_fineness=1,
+    )
     # Run only Magnetic module
     simu.elec = None
     simu.force = None

Tests/Validation/Simulation/test_import_FEMM_file.py

@@ -47,7 +47,11 @@ def test_import_FEMM_file():
     simu.input.N0 = 3000  # Rotor speed [rpm]
 
     # Definition of the magnetic simulation
-    simu.mag = MagFEMM(type_BH_stator=2, type_BH_rotor=2, is_periodicity_a=True,)
+    simu.mag = MagFEMM(
+        type_BH_stator=2,
+        type_BH_rotor=2,
+        is_periodicity_a=True,
+    )
     out = simu.run()
 
     # Second simulation, importing femm file and FEMM_dict

pyleecan/Classes/CellMat.py

@@ -101,7 +101,7 @@ def __init__(
         nb_cell=0,
         nb_pt_per_cell=0,
         indice=[],
-        interpolation=None,
+        interpolation=-1,
         init_dict=None,
         init_str=None,
     ):

pyleecan/Classes/Class_Dict.json

@@ -342,7 +342,7 @@
                 "name": "interpolation",
                 "type": "Interpolation",
                 "unit": "",
-                "value": null
+                "value": -1
             }
         ]
     },
@@ -3573,7 +3573,8 @@
             "comp_length_ring",
             "plot",
             "comp_number_phase_eq",
-            "comp_periodicity"
+            "comp_periodicity",
+            "comp_surface_ring"
         ],
         "mother": "LamSlotWind",
         "name": "LamSquirrelCage",
@@ -3823,7 +3824,8 @@
             "get_material_list",
             "get_polar_eq",
             "plot",
-            "plot_anim_rotor"
+            "plot_anim_rotor",
+            "get_lam_list"
         ],
         "mother": "",
         "name": "Machine",
@@ -3923,8 +3925,7 @@
         "is_internal": false,
         "methods": [
             "check",
-            "get_machine_type",
-            "get_lam_list"
+            "get_machine_type"
         ],
         "mother": "MachineAsync",
         "name": "MachineDFIM",
@@ -3963,8 +3964,7 @@
         "is_internal": false,
         "methods": [
             "check",
-            "get_machine_type",
-            "get_lam_list"
+            "get_machine_type"
         ],
         "mother": "MachineSync",
         "name": "MachineIPMSM",
@@ -4023,7 +4023,6 @@
         "is_internal": false,
         "methods": [
             "check",
-            "get_lam_list",
             "get_machine_type"
         ],
         "mother": "MachineSync",
@@ -4063,7 +4062,6 @@
         "is_internal": false,
         "methods": [
             "check",
-            "get_lam_list",
             "get_machine_type"
         ],
         "mother": "MachineSync",
@@ -4103,7 +4101,6 @@
         "is_internal": false,
         "methods": [
             "check",
-            "get_lam_list",
             "get_machine_type"
         ],
         "mother": "MachineSync",
@@ -4168,7 +4165,6 @@
         "is_internal": false,
         "methods": [
             "build_geometry",
-            "get_lam_list",
             "plot",
             "is_synchronous"
         ],
@@ -4209,7 +4205,6 @@
         "is_internal": false,
         "methods": [
             "check",
-            "get_lam_list",
             "get_machine_type"
         ],
         "mother": "MachineSync",
@@ -7223,7 +7218,8 @@
             "jacobian",
             "grad_shape_function",
             "get_real_point",
-            "get_ref_point"
+            "get_ref_point",
+            "is_inside"
         ],
         "mother": "RefCell",
         "name": "RefTriangle3",
@@ -7560,7 +7556,8 @@
             "get_surface_tooth",
             "is_outwards",
             "plot",
-            "comp_width_opening"
+            "comp_width_opening",
+            "get_name_lam"
         ],
         "mother": "",
         "name": "Slot",