Bugfixed due to new ANN variables

ethz-pes · May 3, 2020 · 62917a6 · 62917a6
1 parent 2f7ba7b
commit 62917a6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/source_inductor/inductor_design/+design_compute/InductorCompute.m b/source_inductor/inductor_design/+design_compute/InductorCompute.m
@@ -356,7 +356,7 @@ function init_thermal_loss(self)
             h_convection = self.fom.material.h_convection;
 
             % get the thermal simulation results from the ANN/regression object
-            excitation_tmp = struct('h_convection', h_convection, 'P_winding', P_winding, 'P_core', P_core);
+            excitation_tmp = struct('h_convection', h_convection, 'P_winding', P_winding, 'P_core', P_core, 'T_ambient', T_ambient);
             [is_valid_tmp, fom_tmp] = self.ann_fem_obj.get_ht(excitation_tmp);
 
             % extract the hotspot temperature elevation

diff --git a/source_input/get_design_data_compute.m b/source_input/get_design_data_compute.m
@@ -43,7 +43,7 @@
 eval_ann.eval_type = 'ann';
 
 % inductor data (data which are not only numeric and common for all the sample)
-data_compute.data_const = get_design_data_cons();
+data_compute.data_const = get_design_data_const();
 
 % function for getting the inductor data (struct of vectors with one value per sample)
 data_compute.fct_data_vec = @(var, n_sol) get_data_vec(var, n_sol);
@@ -176,9 +176,9 @@
 type = 'pwm';
 
 % data for full load operation
-excitation.full_load = get_excitation_load(L, T_ambient, f, load_full_load, type);
+excitation.full_load = get_design_excitation(L, T_ambient, f, load_full_load, type);
 
 % data for partial load operation
-excitation.partial_load = get_excitation_load(L, T_ambient, f, load_partial_load, type);
+excitation.partial_load = get_design_excitation(L, T_ambient, f, load_partial_load, type);
 
 end
diff --git a/source_input/get_design_data_plot.m b/source_input/get_design_data_plot.m
@@ -21,7 +21,7 @@
 %    - choice of the variable (x, y, and color) for the scatter plot
 %    - the variable are chosen from the data created by the extraction function
 %    - control of the format
-plot_param.weighted_losses = get_plot_param('V_box', 'P_tot', 'f', [50e3 500e3]);
+plot_param.full_load_losses = get_plot_param('V_box', 'P_fl', 'f', [50e3 500e3]);
 plot_param.mass_correlation = get_plot_param('V_box', 'm_tot', 'f', [50e3 500e3]);
 plot_param.cost_correlation = get_plot_param('V_box', 'c_tot', 'f', [50e3 500e3]);
 

diff --git a/source_input/get_design_data_single.m b/source_input/get_design_data_single.m
@@ -25,7 +25,7 @@
 eval_ann.eval_type = eval_type;
 
 % inductor data (data which are not only numeric)
-data_compute.data_const = get_design_data_cons();
+data_compute.data_const = get_design_data_const();
 
 % inductor data (struct of scalars)
 data_compute.data_vec = get_data_vec();

diff --git a/source_input/get_fem_ann_data_train.m b/source_input/get_fem_ann_data_train.m
@@ -55,10 +55,10 @@
     var_inp{end+1} = struct('name', 'J_winding', 'var_trf', 'log', 'var_norm', 'min_max', 'min', 0.99.*0.001e6, 'max', 1.01.*20e6);
 
     % permeability of the core for the FEM simulation
-    var_inp{end+1} = struct('name', 'mu_core', 'var_trf', 'none', 'var_norm', 'min_max', 'min', 0.99.*1500.0, 'max', 1.01.*2500.0);
+    var_inp{end+1} = struct('name', 'mu_core', 'var_trf', 'none', 'var_norm', 'min_max', 'min', 0.99.*1500.0, 'max', 1.01.*3000.0);
 
     % beta (Steinmetz parameter) of the core for the FEM simulation
-    var_inp{end+1} = struct('name', 'beta_core', 'var_trf', 'none', 'var_norm', 'min_max', 'min', 0.99.*2.0, 'max', 1.01.*2.5);
+    var_inp{end+1} = struct('name', 'beta_core', 'var_trf', 'none', 'var_norm', 'min_max', 'min', 0.99.*2.0, 'max', 1.01.*2.8);
 end
 if strcmp(model_type, 'ht')
     % total losses (core and winding) divided by the area of the boxed inductor
@@ -71,7 +71,7 @@
     var_inp{end+1} = struct('name', 'h_convection', 'var_trf', 'none', 'var_norm', 'min_max', 'min', 0.99.*15.0, 'max', 1.01.*30.0);
 
     % ambient temperature
-    var_inp{end+1} = struct('name', 'h_convection', 'var_trf', 'none', 'var_norm', 'min_max', 'min', 0.99.*25.0, 'max', 1.01.*65.0);
+    var_inp{end+1} = struct('name', 'T_ambient', 'var_trf', 'none', 'var_norm', 'min_max', 'min', 0.99.*25.0, 'max', 1.01.*65.0);
 end
 
 % description of the output variables: