Merge pull request #172 from upb-lea/dct

update io / sto FEM output for full_simulation

Author: gituser789

femmt/optimization/io.py

@@ -1074,7 +1074,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_hyst + fem_output.fem_eddy_core + fem_output.fem_p_loss_winding
+            p_core = reluctance_output.p_hyst + fem_output.fem_eddy_core
+            p_total = p_core + fem_output.fem_p_loss_winding
 
             if print_derivations:
                 logger.info(f"Inductance reluctance: {local_config.target_inductance}")
@@ -1091,4 +1092,4 @@ def full_simulation(df_geometry: pd.DataFrame, current_waveform: list, inductor_
                 logger.info(f"P_hyst FEM: {fem_output.fem_core_total}")
                 logger.info(f"P_hyst derivation: {(reluctance_output.p_hyst - fem_output.fem_core_total) / reluctance_output.p_hyst * 100}")
 
-            return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink
+            return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink, fem_output.fem_p_loss_winding, p_core

femmt/optimization/sto.py

@@ -1311,7 +1311,8 @@ def full_simulation(df_geometry: pd.DataFrame, current_1_waveform: list, current
             reluctance_output: ReluctanceModelOutput = StackedTransformerOptimization.ReluctanceModel.single_reluctance_model_simulation(
                 reluctance_model_input)
 
-            p_total = reluctance_output.p_hyst + fem_output.eddy_core + fem_output.p_loss_winding_1 + fem_output.p_loss_winding_2
+            p_core = reluctance_output.p_hyst + fem_output.eddy_core
+            p_total = p_core + fem_output.p_loss_winding_1 + fem_output.p_loss_winding_2
 
             if print_derivations:
                 logger.info(f"Inductance l_h reluctance: {local_config.l_h_target}")
@@ -1335,4 +1336,4 @@ def full_simulation(df_geometry: pd.DataFrame, current_1_waveform: list, current
                 logger.info(f"P_hyst FEM: {fem_output.core}")
                 logger.info(f"P_hyst derivation: {(reluctance_output.p_hyst - fem_output.core) / reluctance_output.p_hyst * 100}")
 
-            return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink
+            return reluctance_output.volume, p_total, reluctance_output.area_to_heat_sink, fem_output.p_loss_winding_1, fem_output.p_loss_winding_2, p_core