[CO] Improve method to calculate winding periodicity using fft + add test dedicated to periodicity calculation

EmileDvs · EmileDvs · commit d87a1e14a3d4 · 2021-09-24T14:45:54.000+02:00
diff --git a/Tests/Data/Retrocompatibility/Winding/TESLA_S.json b/Tests/Data/Retrocompatibility/Winding/TESLA_S.json
@@ -59,7 +59,7 @@
         }
     },
     "logger_name": null,
-    "name": "TESLA_S",
+    "name": "Tesla_S",
     "rotor": {
         "Hscr": 0.02,
         "Kf1": 0.95,
diff --git a/Tests/Functions/test_retrocompatibility.py b/Tests/Functions/test_retrocompatibility.py
@@ -47,8 +47,8 @@
 )
 # wind_list.append(  # WindingSC + WindingDW2L
 #     {
-#         "ref": join(DATA_DIR, "Machine", "TESLA_S.json"),
-#         "old": join(TEST_DATA_DIR, "Retrocompatibility", "Winding", "TESLA_S.json"),
+#         "ref": join(DATA_DIR, "Machine", "Tesla_S.json"),
+#         "old": join(TEST_DATA_DIR, "Retrocompatibility", "Winding", "Tesla_S.json"),
 #     }
 # )
 wind_list.append(  # WindingDW1L
diff --git a/Tests/Methods/Machine/test_comp_periodicity.py b/Tests/Methods/Machine/test_comp_periodicity.py
@@ -0,0 +1,52 @@
+import pytest
+from os.path import join
+
+from pyleecan.Functions.load import load
+from pyleecan.definitions import DATA_DIR
+
+machine_list = [
+    ["Toyota_Prius", (4, True, 4, True)],
+    ["BMW_i3", (6, True, 6, True)],
+    ["Protean_InWheel", (8, False, 32, True)],
+    ["Tesla_S", (2, False, 2, False)],
+    ["Audi_eTron", (2, False, 2, False)],
+    ["Benchmark", (1, True, 5, True)],
+    ["SCIM_001", (1, True, 1, True)],
+    ["SCIM_006", (2, True, 2, True)],
+    ["SPMSM_001", (4, False, 4, True)],
+    ["SPMSM_003", (1, True, 1, True)],
+    ["SPMSM_015", (9, False, 9, True)],
+    ["SIPMSM_001", (1, False, 2, True)],
+    ["SynRM_001", (2, True, 2, True)],
+]
+
+
+@pytest.mark.periodicity
+def test_comp_periodicity(machine):
+
+    machine_obj = load(join(DATA_DIR, "Machine", machine[0] + ".json"))
+
+    # per_a, aper_a = machine_obj.comp_periodicity_spatial()
+
+    # per_t, aper_t, _, _ = machine_obj.comp_periodicity_time()
+
+    per_a, aper_a, per_t, aper_t = machine_obj.comp_periodicity()
+
+    msg = (
+        "Wrong periodicity calculation for "
+        + machine_obj.name
+        + ": "
+        + str((per_a, aper_a, per_t, aper_t))
+    )
+    assert (per_a, aper_a, per_t, aper_t) == machine[1], msg
+
+    return (per_a, aper_a, per_t, aper_t)
+
+
+# To run it without pytest
+if __name__ == "__main__":
+
+    # per_tuple = test_comp_periodicity(machine_list[1])
+
+    for machine in machine_list:
+        per_tuple = test_comp_periodicity(machine)
diff --git a/Tests/Methods/Slot/test_comp_periodicity.py b/Tests/Methods/Slot/test_comp_periodicity.py
diff --git a/Tests/Validation/Magnetics/test_FEMM_compare.py b/Tests/Validation/Magnetics/test_FEMM_compare.py
@@ -60,7 +60,6 @@ def test_FEMM_compare_IPMSM_xxx():
     simu.force = None
     simu.struct = None
 
-    assert IPMSM_xxx.comp_periodicity() == (4, True, 4, True)
     # Copy the simu and activate the symmetry
     simu_sym = Simu1(init_dict=simu.as_dict())
     simu_sym.mag.is_periodicity_a = True
@@ -129,7 +128,6 @@ def test_FEMM_compare_Prius():
     simu.struct = None
     # simu.struct.force = ForceMT()
     # Copy the simu and activate the symmetry
-    assert Toyota_Prius.comp_periodicity() == (4, True, 4, True)
     simu_sym = Simu1(init_dict=simu.as_dict())
     simu_sym.mag.is_periodicity_a = True
 
@@ -199,7 +197,6 @@ def test_FEMM_compare_SCIM():
     simu.force = None
     simu.struct = None
     # Copy the simu and activate the symmetry
-    assert SCIM_006.comp_periodicity() == (2, True, 2, True)
     simu_sym = Simu1(init_dict=simu.as_dict())
     simu_sym.mag.is_periodicity_a = True
 
@@ -286,7 +283,6 @@ def test_FEMM_compare_SIPMSM():
     )
 
     # Definition of the magnetic simulation (is_mmfr=False => no flux from the magnets)
-    assert SIPMSM_001.comp_periodicity() == (1, False, 2, True)
     simu.mag = MagFEMM(
         type_BH_stator=2,
         type_BH_rotor=2,
@@ -378,7 +374,6 @@ def test_SPMSM_load():
     simu.force = None
     simu.struct = None
     # Copy the simu and activate the symmetry
-    assert SPMSM_003.comp_periodicity() == (1, True, 1, True)
     simu_sym = Simu1(init_dict=simu.as_dict())
     simu_sym.mag.is_periodicity_a = True
 
@@ -460,7 +455,6 @@ def test_SPMSM_noload():
     )
 
     # Definition of the magnetic simulation (is_mmfr=False => no flux from the magnets)
-    assert SPMSM_015.comp_periodicity() == (9, False, 9, True)
     simu.mag = MagFEMM(
         type_BH_stator=0,
         type_BH_rotor=0,
diff --git a/Tests/Validation/Magnetics/test_FEMM_meshsolution_plots.py b/Tests/Validation/Magnetics/test_FEMM_meshsolution_plots.py
@@ -70,7 +70,6 @@ def test_FEMM_meshsolution_plots_SPMSM():
     simu.force = None
     simu.struct = None
     # Copy the simu and activate the symmetry
-    assert SPMSM_003.comp_periodicity() == (1, True, 1, True)
     simu_sym = Simu1(init_dict=simu.as_dict())
     simu_sym.mag.is_periodicity_a = True
 
diff --git a/Tests/Validation/Magnetics/test_FEMM_periodicity.py b/Tests/Validation/Magnetics/test_FEMM_periodicity.py
@@ -33,8 +33,6 @@ def test_FEMM_periodicity_time_no_periodicity_a():
 
     SPMSM_015 = load(join(DATA_DIR, "Machine", "SPMSM_015.json"))
 
-    assert SPMSM_015.comp_periodicity() == (9, False, 9, True)
-
     simu = Simu1(name="test_FEMM_periodicity_time_no_periodicity_a", machine=SPMSM_015)
 
     # Definition of the enforced output of the electrical module
@@ -180,8 +178,6 @@ def test_FEMM_periodicity_time():
 
     SPMSM_015 = load(join(DATA_DIR, "Machine", "SPMSM_015.json"))
 
-    assert SPMSM_015.comp_periodicity() == (9, False, 9, True)
-
     simu = Simu1(name="test_FEMM_periodicity_time", machine=SPMSM_015)
 
     # Definition of the enforced output of the electrical module
@@ -356,8 +352,6 @@ def test_FEMM_periodicity_angle():
     # SPMSM_015.plot()
     # plt.show()
 
-    assert SPMSM_015.comp_periodicity() == (9, False, 9, True)
-
     simu = Simu1(name="test_FEMM_periodicity_angle", machine=SPMSM_015)
 
     # Definition of the enforced output of the electrical module
diff --git a/Tests/Validation/Magnetics/test_FEMM_torque.py b/Tests/Validation/Magnetics/test_FEMM_torque.py
@@ -108,7 +108,6 @@ def test_FEMM_torque():
     simu.input.set_OP_from_array(OP_matrix, type_OP_matrix=varload.type_OP_matrix)
 
     # Definition of the magnetic simulation (1/2 symmetry)
-    assert SynRM_001.comp_periodicity() == (2, True, 2, True)
     simu.mag = MagFEMM(
         type_BH_stator=0,
         type_BH_rotor=0,
diff --git a/pyleecan/Data/Machine/AUDI_eTron.json b/pyleecan/Data/Machine/AUDI_eTron.json
@@ -5,7 +5,7 @@
     "desc": null,
     "frame": null,
     "logger_name": null,
-    "name": "AUDI_eTron",
+    "name": "Audi_eTron",
     "rotor": {
         "Hscr": 0.02,
         "Kf1": 0.95,
diff --git a/pyleecan/Data/Machine/Protean_InWheel.json b/pyleecan/Data/Machine/Protean_InWheel.json
diff --git a/pyleecan/Data/Machine/TESLA_S.json b/pyleecan/Data/Machine/TESLA_S.json
diff --git a/pyleecan/Methods/Machine/Winding/comp_periodicity.py b/pyleecan/Methods/Machine/Winding/comp_periodicity.py

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`}`
`60`	`60`	`},`
`61`	`61`	`"logger_name": null,`
`62`		`- "name": "TESLA_S",`
	`62`	`+ "name": "Tesla_S",`
`63`	`63`	`"rotor": {`
`64`	`64`	`"Hscr": 0.02,`
`65`	`65`	`"Kf1": 0.95,`