Merge pull request #190 from EOMYS-Public/FEMM

Femm

Author: BonneelP

Tests/Methods/Simulation/test_InCurrent_meth.py

@@ -60,12 +60,12 @@
 M1 = MachineDFIM()
 M1.stator = LamSlotWind()
 M1.stator.winding.qs = 3
-M1.rotor.winding = None
+M1.rotor.winding.qs = 0
 # Winding rotor only
 M2 = MachineDFIM()
 M2.rotor = LamSlotWind()
 M2.rotor.winding.qs = 2
-M2.stator.winding = None
+M2.stator.winding.qs = 0
 # Winding rotor + stator
 M3 = MachineDFIM()
 M3.stator = LamSlotWind()
@@ -258,11 +258,11 @@ def test_InputCurrent_DQ(self, test_dict):
         # Generate Is according to Id/Iq
         test_obj.input.gen_input()
         assert_array_almost_equal(
-            output.elec.time.get_values(is_oneperiod=False),
+            output.elec.Time.get_values(is_oneperiod=False),
             time_exp,
         )
         assert_array_almost_equal(
-            output.elec.angle.get_values(is_oneperiod=False),
+            output.elec.Angle.get_values(is_oneperiod=False),
             linspace(0, 2 * pi, Na_tot, endpoint=False),
         )
         assert_array_almost_equal(output.elec.get_Is().values, Is_exp)
@@ -287,7 +287,14 @@ def test_InputCurrent_DQ(self, test_dict):
         assert out.elec.Id_ref == pytest.approx(test_dict["Id"], abs=0.01)
         assert out.elec.Iq_ref == pytest.approx(test_dict["Iq"], abs=0.01)
 
-        out.plot_A_time("elec.Is", index_list=[0, 1, 2])
+        # Plot 3-phase current function of time
+        out.plot_2D_Data(
+            "elec.Is",
+            "time",
+            "phase",
+        )
+
+        # Save picture
         title = "Id=" + str(test_dict["Id"]) + " Iq=" + str(test_dict["Iq"])
         fig = plt.gcf()
         plt.title(title)
@@ -302,3 +309,36 @@ def test_InputCurrent_DQ(self, test_dict):
             )
         )
         plt.close("all")
+
+        return out
+
+
+# To run it without pytest
+if __name__ == "__main__":
+
+    obj = Test_InCurrent_meth()
+
+    test_dict = idq_test[0]
+
+    out = obj.test_InputCurrent_DQ(test_dict)
+
+    # out.plot_2D_Data(
+    #         "elec.Is",
+    #         "time",
+    #         "phase",
+    #     )
+
+    # title = "Id=" + str(test_dict["Id"]) + " Iq=" + str(test_dict["Iq"])
+    # fig = plt.gcf()
+    # plt.title(title)
+    # fig.savefig(
+    #     join(
+    #         save_path,
+    #         "test_InCurrent_Id="
+    #         + str(test_dict["Id"])
+    #         + "_Iq="
+    #         + str(test_dict["Iq"])
+    #         + ".png",
+    #     )
+    # )
+    # plt.close("all")

Tests/Plot/test_plot_axis.py

@@ -219,7 +219,7 @@ def test_axis_LamWind(CURVE_COLORS):
     fig.savefig(join(save_path, "test_axis_LamWind_mmf.png"))
 
     # Plot maximum of the fundamental of the mmf
-    MMF = SCIM_001.stator.comp_mmf_unit(Na=600, Nt=1)
+    MMF = SCIM_001.stator.comp_mmf_unit(Na=600, Nt=1)[0]
     p = SCIM_001.stator.get_pole_pair_number()
     results = MMF.get_along("angle")
     angle_rotor = results["angle"]
@@ -284,9 +284,10 @@ def test_axis_LamWind(CURVE_COLORS):
     simu.run()
 
     plt.close("all")
-    out.plot_A_space("mag.B", is_deg=False)
+    out.plot_2D_Data("mag.B", "angle{rad}")
+
     fig = plt.gcf()
-    Br = out.mag.B.get_rad_along("time", "angle")
+    Br = out.mag.B.components["radial"].get_along("time", "angle")
     fig.axes[0].plot(d_angle, max(max(Br)), "rx")
     fig.axes[0].text(d_angle, max(max(Br)), "Max of mmf")
     fig.savefig(join(save_path, "test_axis_LamWind_flux.png"))