Merge pull request #179 from upb-lea/dct

fix indcutor core losses in fem simulation in inductor optimization

Author: gituser789

femmt/optimization/io.py

@@ -947,11 +947,13 @@ def single_fem_simulation(fem_input: IoFemInput, show_visual_outputs: bool = Fal
                                   plot_interpolation=False, show_fem_simulation_results=show_visual_outputs)
 
             # read the flux per mesh cell and transfer it into losses with the help of the magnet model
-            hyst_losses_custom = geo.calc_hystersis_losses_with_MagNet_model_PB_based_on_mesh_results(b_wave=fmt.WaveformType.Custom,
+            hyst_losses_magnet = geo.calc_hystersis_losses_with_MagNet_model_PB_based_on_mesh_results(b_wave=fmt.WaveformType.Custom,
                                                                                                       custom_b_wave=normalized_current_interp)
-
             result_dict_hyst = geo.read_log()
 
+            core_eddy_current_losses = result_dict_hyst['total_losses']['eddy_core']
+            core_loss_magnet_eddy = hyst_losses_magnet + core_eddy_current_losses
+
             # get the winding losses
             geo.excitation_sweep(frequency_list=fem_input.fft_frequency_list, current_list_list=current_amplitudes,
                                  phi_deg_list_list=phases, show_last_fem_simulation=show_visual_outputs)
@@ -961,7 +963,7 @@ def single_fem_simulation(fem_input: IoFemInput, show_visual_outputs: bool = Fal
                 inductance=result_dict['single_sweeps'][0]['winding1']['flux_over_current'][0],
                 p_loss_winding=result_dict['total_losses']['winding1']['total'],
                 p_core_sine=result_dict_hyst['total_losses']['core'],
-                p_core_magnet=hyst_losses_custom,
+                p_core_magnet=core_loss_magnet_eddy,
                 volume=result_dict["misc"]["core_2daxi_total_volume"]
             )
             return fem_output
@@ -990,7 +992,7 @@ def filter_combined_loss_list_df(df: pd.DataFrame, factor_min_dc_losses: float =
         def full_simulation(df_geometry: pd.DataFrame, current_waveform: list, inductor_config_filepath: str, process_number: int = 1,
                             print_derivations: bool = False) -> tuple:
             """
-            Reluctance model (hysteresis losses) and FEM simulation (winding losses and eddy current losses) for geometries from df_geometry.
+            FEM simulation (winding losses and hysteresis losses from magnet model) for geometries from df_geometry.
 
             :param df_geometry: Pandas dataframe with only one single geometries
             :type df_geometry: pd.DataFrame
@@ -1104,8 +1106,7 @@ def full_simulation(df_geometry: pd.DataFrame, current_waveform: list, inductor_
 
             reluctance_output: IoReluctanceModelOutput = InductorOptimization.ReluctanceModel.single_reluctance_model_simulation(reluctance_model_input)
 
-            p_core = reluctance_output.p_hyst + fem_output.p_core_sine
-            p_total = p_core + fem_output.p_loss_winding
+            p_total = fem_output.p_core_magnet + fem_output.p_loss_winding
 
             if print_derivations:
                 logger.info(f"Inductance reluctance: {local_config.target_inductance}")
@@ -1122,4 +1123,4 @@ def full_simulation(df_geometry: pd.DataFrame, current_waveform: list, inductor_
                 logger.info(f"P_hyst FEM: {fem_output.p_core_magnet}")
                 logger.info(f"P_hyst derivation: {(reluctance_output.p_hyst - fem_output.p_core_magnet) / reluctance_output.p_hyst * 100} %")
 
-            return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink, fem_output.p_loss_winding, p_core
+            return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink, fem_output.p_loss_winding, fem_output.p_core_magnet