fix indcutor core losses in fem simulation in inductor optimization

Author: gituser789

femmt/optimization/io.py

@@ -990,7 +990,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 +1104,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 +1121,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