Merge pull request #171 from upb-lea/dct

update return of reluctance model full simulation: core and winding loss

Author: gituser789

femmt/optimization/io.py

@@ -680,7 +680,8 @@ def full_simulation(df_geometry: pd.DataFrame, current_waveform: list, inductor_
                 reluctance_output: ReluctanceModelOutput = InductorOptimization.ReluctanceModel.single_reluctance_model_simulation(reluctance_model_input)
 
                 p_total = reluctance_output.p_loss_total
-                return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink
+
+                return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink, reluctance_output.p_winding, reluctance_output.p_hyst
 
     class FemSimulation:
         """Contains methods to perform FEM simulations or process their results."""

femmt/optimization/sto.py

@@ -886,7 +886,8 @@ def full_simulation(df_geometry: pd.DataFrame, time_current_waveform_1: list, ti
 
                 p_total = reluctance_output.p_loss
 
-                return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink
+                return (reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink, reluctance_output.winding_1_loss,
+                        reluctance_output.winding_2_loss, reluctance_output.p_hyst)
 
     class FemSimulation:
         """Contains methods to perform FEM simulations or process their results."""