speed up hysteresis losses by magnet model in radiant-flux-cylinders

Author: gituser789

femmt/functions_reluctance.py

@@ -11,6 +11,7 @@
 import scipy
 from matplotlib import pyplot as plt
 import magnethub as mh
+import pandas as pd
 
 logger = logging.getLogger(__name__)
 
@@ -1271,7 +1272,28 @@ def calc_proximity_factor_air_gap(litz_wire_name: str, number_turns: int, r_1: f
     return proximity_factor
 
 def magent_loss_model_on_cylinder_radiant(magnet_material_model: mh.loss.LossModel, r_cyl_inner: np.float64, r_cyl_outer: np.float64,
-                                          time_vec: np.ndarray, flux_vec: np.ndarray, h_cyl: np.ndarray, temperature: np.float64, total_opening_angle_rad: float = 210 / 360 * 2 * np.pi):
+                                          time_vec: np.ndarray, flux_vec: np.ndarray, h_cyl: np.ndarray, temperature: np.float64,
+                                          total_opening_angle_rad: float = 210 / 360 * 2 * np.pi):
+    """
+    Get the core hysteresis losses for the radiant flux parts in a tablet. Uses the MagNet model.
+
+    :param magnet_material_model: MagNet material model
+    :type magnet_material_model: mh.loss.LossModel
+    :param r_cyl_inner: inner cylinder radius of the tablet
+    :type r_cyl_inner: np.float64
+    :param r_cyl_outer: outer cylinder radius of the tablet
+    :type r_cyl_outer: np.float64
+    :param time_vec: time vector
+    :type time_vec: np.ndarray
+    :param flux_vec: flux vector
+    :type flux_vec: np.ndarray
+    :param h_cyl: height of the tablet / cylinder
+    :type h_cyl: np.ndarray
+    :param temperature: temperature in °C
+    :type temperature: np.float64
+    :param total_opening_angle_rad: cylinder/tablet total opening angle
+    :type total_opening_angle_rad: float
+    """
 
     def flux_density_cylinder_envelope(cylinder_radius: float | np.ndarray, flux_in_cylinder: float | np.ndarray,
                                        height_of_cylinder: float | np.ndarray, magnet_material_model: mh.loss.LossModel,
@@ -1288,6 +1310,14 @@ def flux_density_cylinder_envelope(cylinder_radius: float | np.ndarray, flux_in_
         :type flux_in_cylinder: float | np.ndarray
         :param height_of_cylinder: cylinder height in m
         :type height_of_cylinder: float | np.ndarray
+        :param magnet_material_model: Magnet material model
+        :type magnet_material_model: mh.loss.LossModel
+        :param time_vec: time vector
+        :type time_vec: np.ndarray
+        :param temperature: temperature in degree
+        :type temperature: np.float64
+        :param total_opening_angle_rad: total opening angle in radiant
+        :type total_opening_angle_rad: float
         :return: Flux density in T
         :rtype: float | np.ndarray
         """
@@ -1302,20 +1332,18 @@ def flux_density_cylinder_envelope(cylinder_radius: float | np.ndarray, flux_in_
         fundamental_frequency = 1 / time_vec[-1]
         p_density_middle, _ = magnet_material_model(flux_density_middle_interp, fundamental_frequency, temperature)
 
-        return flux_density_middle, p_density_middle
+        return p_density_middle
 
     # generate flux and loss distribution along the radius
-    radius_list = np.linspace(r_cyl_inner, r_cyl_outer)
-    flux_density_list = []
-    p_density_list = []
-    for radius in radius_list:
-        flux_density_middle, p_density_middle = flux_density_cylinder_envelope(
-            cylinder_radius=radius, flux_in_cylinder=flux_vec, height_of_cylinder=h_cyl, magnet_material_model=magnet_material_model,
-            time_vec=time_vec, temperature=temperature, total_opening_angle_rad=total_opening_angle_rad)
-        flux_density_list.append(flux_density_middle)
-        p_density_list.append(p_density_middle)
+    radius_list = np.linspace(r_cyl_inner, r_cyl_outer, 10)
+    radius_list_df = pd.DataFrame({"radius": radius_list})
+
+    radius_list_df["p_density"] = radius_list_df.apply(
+        lambda x: flux_density_cylinder_envelope(
+            cylinder_radius=x["radius"], flux_in_cylinder=flux_vec, height_of_cylinder=h_cyl, magnet_material_model=magnet_material_model,
+            time_vec=time_vec, temperature=temperature, total_opening_angle_rad=total_opening_angle_rad), axis=1)
 
     # integrate along the axis
-    power = total_opening_angle_rad * h_cyl * np.trapezoid(p_density_list * radius_list, x=radius_list)
+    power = total_opening_angle_rad * h_cyl * np.trapezoid(radius_list_df["p_density"] * radius_list, x=radius_list)
 
     return power

femmt/optimization/sto.py

@@ -396,7 +396,7 @@ def single_reluctance_model_simulation(reluctance_input: StoReluctanceModelInput
                 r_cyl_outer=r_outer, time_vec=reluctance_input.time_extracted_vec, flux_vec=flux_top,
                 h_cyl=reluctance_input.core_inner_diameter / 4, temperature=reluctance_input.temperature)
             volume_core_top_cylinder = 2 * ff.calculate_cylinder_volume(reluctance_input.core_inner_diameter, reluctance_input.window_h_top) - \
-                               ff.calculate_cylinder_volume(reluctance_input.core_inner_diameter, l_top_air_gap)
+                ff.calculate_cylinder_volume(reluctance_input.core_inner_diameter, l_top_air_gap)
             p_top_cylinder = p_density_top * volume_core_top_cylinder
             p_top = p_top_tablet + p_top_cylinder
 
@@ -405,7 +405,7 @@ def single_reluctance_model_simulation(reluctance_input: StoReluctanceModelInput
                 r_cyl_outer=r_outer, time_vec=reluctance_input.time_extracted_vec, flux_vec=flux_bot,
                 h_cyl=reluctance_input.core_inner_diameter / 4, temperature=reluctance_input.temperature)
             volume_core_bot_cylinder = 2 * ff.calculate_cylinder_volume(reluctance_input.core_inner_diameter, reluctance_input.window_h_bot) - \
-                               ff.calculate_cylinder_volume(reluctance_input.core_inner_diameter, l_bot_air_gap)
+                ff.calculate_cylinder_volume(reluctance_input.core_inner_diameter, l_bot_air_gap)
             p_bot_cylinder = p_density_bot * volume_core_bot_cylinder
             p_bot = p_bot_tablet + p_bot_cylinder