Merge pull request #164 from upb-lea/gmsh_improvement

gituser789 · web-flow · commit f9f788231c4a · 2025-09-05T11:51:12.000+02:00
Gmsh improvement
diff --git a/femmt/component.py b/femmt/component.py
@@ -64,7 +64,7 @@ def __init__(self, simulation_type: SimulationType = SimulationType.FreqDomain,
         :type component_type: ComponentType
         :param working_directory: Sets the working directory
         :type working_directory: string
-        :param visualization_mode: Sets the visualization mode. it is only used in the time domain simulation.
+        :param visualization_mode: Sets the visualization mode. it is used in the time and frequency domain simulation.
         :type visualization_mode: VisualizationMode
         :param is_gui: Asks at first startup for onelab-path. Distinction between GUI and command line.
             Defaults to 'False' in command-line-mode.
@@ -1301,8 +1301,23 @@ def simulate(self):
         # Run simulations as sub clients (non-blocking??)
         getdp_filepath = os.path.join(self.file_data.onelab_folder_path, "getdp")
         if self.simulation_type == SimulationType.FreqDomain:
-            self.onelab_client.runSubClient("myGetDP", getdp_filepath + " " + solver_freq + " -msh " + \
-                                            self.file_data.e_m_mesh_file + " -solve Analysis -v2 " + verbose + to_file_str)
+            if self.visualization_mode == VisualizationMode.Stream:
+                # It opens gmsh and runs live
+                # 1) Start GUI
+                if not gmsh.isInitialized():
+                    gmsh.initialize()
+                if '-nopopup' not in sys.argv:
+                    gmsh.fltk.initialize()
+                gmsh.onelab.run("myGetDP", getdp_filepath + " " + solver_freq + " -msh " + self.file_data.e_m_mesh_file + \
+                                " -solve Analysis -v2" + verbose + to_file_str)
+                gmsh.fltk.run()
+            elif self.visualization_mode == VisualizationMode.Post:
+                gmsh.onelab.run("myGetDP", getdp_filepath + " " + solver_freq + " -msh " + self.file_data.e_m_mesh_file + \
+                                " -solve Analysis -v2" + verbose + to_file_str)
+                gmsh.fltk.run()
+            else:
+                self.onelab_client.runSubClient("myGetDP", getdp_filepath + " " + solver_freq + " -msh " + \
+                                                self.file_data.e_m_mesh_file + " -solve Analysis -v2 " + verbose + to_file_str)
         if self.simulation_type == SimulationType.TimeDomain:
             if self.visualization_mode == VisualizationMode.Stream:
                 # 1) Start GUI
@@ -1430,8 +1445,9 @@ def single_simulation(self, freq: float, current: list[float], phi_deg: list[flo
             self.calculate_and_write_freq_domain_log()  # TODO: reuse center tapped
             self.log_reluctance_and_inductance()
             logging_time = time.time() - start_time
-            if show_fem_simulation_results:
-                self.visualize()
+            if self.visualization_mode == VisualizationMode.Final:
+                if show_fem_simulation_results:
+                    self.visualize()
 
             return generate_electro_magnetic_mesh_time, prepare_simulation_time, real_simulation_time, logging_time
         else:
@@ -1444,8 +1460,9 @@ def single_simulation(self, freq: float, current: list[float], phi_deg: list[flo
             self.simulate()
             self.calculate_and_write_freq_domain_log()  # TODO: reuse center tapped
             self.log_reluctance_and_inductance()
-            if show_fem_simulation_results:
-                self.visualize()
+            if self.visualization_mode == VisualizationMode.Final:
+                if show_fem_simulation_results:
+                    self.visualize()
         logger.info(f"The electromagnetic results are stored here: {self.file_data.e_m_results_log_path}")
 
     def time_domain_simulation(self, current_period_vec: list[list[float]], time_period_vec: list[float], number_of_periods: int,
@@ -3476,6 +3493,10 @@ def write_electro_magnetic_parameter_pro(self):
             text_file.write("Flag_Freq_Domain = 1;\n")
             text_file.write("Flag_Time_Domain = 0;\n")
             text_file.write("Flag_Static = 0;\n")
+            if self.visualization_mode == VisualizationMode.Stream or self.visualization_mode == VisualizationMode.Post:
+                text_file.write("Flag_Stream_Visualization = 1;\n")
+            else:
+                text_file.write("Flag_Stream_Visualization = 0;\n")
 
         if self.simulation_type == SimulationType.TimeDomain:
             text_file.write("Flag_Time_Domain = 1;\n")
@@ -3658,7 +3679,8 @@ def write_electro_static_parameter_pro(self):
                                                       winding_number=winding_number)
 
             if self.windings[winding_number].parallel:
-                raise Exception("Parallel winding are not considered yet for electrostatic simulation")
+                text_file.write(f"NbrCond_{winding_number + 1} = 1;\n")
+                text_file.write(f"AreaCell_{winding_number + 1} = {self.windings[winding_number].a_cell * turns};\n")
             else:
                 text_file.write(f"NbrCond_{winding_number + 1} = {turns};\n")
                 text_file.write(f"AreaCell_{winding_number + 1} = {self.windings[winding_number].a_cell};\n")
@@ -4356,8 +4378,11 @@ def calculate_and_write_electrostatic_log(self):
         log_dict["capacitances"] = {"within_winding": {}, "between_windings": {}, "between_turns_core": {}}
 
         for winding_number in range(len(self.windings)):
-            turns = ff.get_number_of_turns_of_winding(winding_windows=self.winding_windows, windings=self.windings,
-                                                      winding_number=winding_number)
+            if self.windings[winding_number].parallel:
+                turns = 1
+            else:
+                turns = ff.get_number_of_turns_of_winding(winding_windows=self.winding_windows, windings=self.windings,
+                                                          winding_number=winding_number)
             winding_name = f"Winding_{winding_number + 1}"
             log_dict["capacitances"]["within_winding"][winding_name] = {}
 
@@ -4380,10 +4405,16 @@ def calculate_and_write_electrostatic_log(self):
             for winding2 in range(len(self.windings)):
                 if winding1 == winding2:
                     continue
-                turns1 = ff.get_number_of_turns_of_winding(winding_windows=self.winding_windows, windings=self.windings,
-                                                           winding_number=winding1)
-                turns2 = ff.get_number_of_turns_of_winding(winding_windows=self.winding_windows, windings=self.windings,
-                                                           winding_number=winding2)
+                if self.windings[winding1].parallel:
+                    turns1 = 1
+                else:
+                    turns1 = ff.get_number_of_turns_of_winding(winding_windows=self.winding_windows, windings=self.windings,
+                                                               winding_number=winding1)
+                if self.windings[winding2].parallel:
+                    turns2 = 1
+                else:
+                    turns2 = ff.get_number_of_turns_of_winding(winding_windows=self.winding_windows, windings=self.windings,
+                                                               winding_number=winding2)
                 winding2_name = f"Winding_{winding2 + 1}"
                 log_dict["capacitances"]["between_windings"][winding1_name][winding2_name] = {}
 
@@ -4410,9 +4441,11 @@ def calculate_and_write_electrostatic_log(self):
         for winding_number in range(len(self.windings)):
             winding_name = f"Winding_{winding_number + 1}"
             log_dict["capacitances"]["between_turns_core"][winding_name] = {}
-
-            turns = ff.get_number_of_turns_of_winding(winding_windows=self.winding_windows, windings=self.windings,
-                                                      winding_number=winding_number)
+            if self.windings[winding_number].parallel:
+                turns = 1
+            else:
+                turns = ff.get_number_of_turns_of_winding(winding_windows=self.winding_windows, windings=self.windings,
+                                                          winding_number=winding_number)
             for turn in range(1, turns + 1):
                 turn_key = f"Turn_{turn}"
                 capacitance_key = f"C_{winding_number + 1}_{turn}_Core"
diff --git a/femmt/electro_magnetic/fields.pro b/femmt/electro_magnetic/fields.pro
@@ -51,25 +51,67 @@ PostOperation Map_local UsingPost MagDyn_a {
   //Print[ ir_norm, OnElementsOf Region[{Domain}], File StrCat[DirResFields, "ir_norm", ExtGmsh], LastTimeStepOnly ] ;
 
   // Ohmic Loss
-  If(Flag_show_standard_fields)
-    //Print[ j2F, OnElementsOf Region[{DomainC}], Name "Solid wire and core eddy current losses / W", File StrCat[DirResFields, "j2F", ExtGmsh], LastTimeStepOnly ] ;
-    Print[ j2F_density, OnElementsOf Region[{DomainC}], Name "Solid wire and core eddy current loss density / W/m^3", File StrCat[DirResFields, "j2F_density", ExtGmsh], LastTimeStepOnly ] ;
-  EndIf
-  If(Flag_show_standard_fields)
-    //Print[ j2H, OnElementsOf DomainS, Name "Litz wire losses / W" , File StrCat[DirResFields,"jH",ExtGmsh] ] ;
-    Print[ j2H_density, OnElementsOf DomainS, Name "Litz wire loss density / W/m^3", File StrCat[DirResFields,"jH_density",ExtGmsh] ] ;
-  EndIf
-  //Print[ j2Hprox,   OnElementsOf DomainS, File StrCat[DirResFields,"jHprox",ExtGmsh] ] ;
-  //Print[ j2Hskin,   OnElementsOf DomainS, File StrCat[DirResFields,"jHskin",ExtGmsh] ] ;
+  // This code is written to avoid the duplication of the printed losses, and also to avoid printing both losses where do we have just solid losses
+  // This is just in stream visualization
+  If (Flag_Stream_Visualization)
+    // initialize
+    solid_exist = 0;
+    litz_exist  = 0;
+
+    For n In {1:n_windings}
+        If(!Flag_HomogenisedModel~{n})
+            solid_exist = 1; // found a solid conductor
+        Else
+            litz_exist  = 1; // found a litz conductor
+        EndIf
+    EndFor
 
+    If(Flag_show_standard_fields)
+        If(solid_exist)
+            Print[ j2F_density, OnElementsOf Region[{DomainC}], Name "Solid wire and core eddy current loss density / W/m^3",
+                   File StrCat[DirResFields, "j2F_density", ExtGmsh], LastTimeStepOnly] ;
+        EndIf
+        If(litz_exist)
+            Print[ j2H_density, OnElementsOf DomainS, Name "Litz wire loss density / W/m^3", File StrCat[DirResFields,"j2H_density",ExtGmsh], LastTimeStepOnly] ;
+        EndIf
+    EndIf
+ Else
+    If(Flag_show_standard_fields)
+         Print[ j2F_density, OnElementsOf Region[{DomainC}], Name "Solid wire and core eddy current loss density / W/m^3", File StrCat[DirResFields, "j2F_density", ExtGmsh]] ;
+         Print[ j2H_density, OnElementsOf DomainS, Name "Litz wire loss density / W/m^3", File StrCat[DirResFields,"j2H_density",ExtGmsh]] ;
+    EndIf
+ EndIf
 
   // Settings
+  /*
   Echo[ Str["View[PostProcessing.NbViews-1].Light=0;
              View[PostProcessing.NbViews-1].LineWidth = 2;
              View[PostProcessing.NbViews-1].RangeType=3;
              View[PostProcessing.NbViews-1].IntervalsType=1;
+             View[PostProcessing.NbViews-1].ScaleType=1;
              View[PostProcessing.NbViews-1].NbIso = 25;"],
-           File OptionPos];
+           File "Option.pos"]; */
+ // Settings
+ If (Flag_Stream_Visualization)
+  Echo[ Str[
+  "For k In {0:PostProcessing.NbViews-1}",
+  "  View[k].RangeType  = 3;",  // per timestep
+  "  View[k].NbIso = 25;",
+  "  View[k].IntervalsType= 3;",
+  "  View[k].AutoPosition = 3;",
+  "  If (!StrCmp(View[k].Name, 'Solid wire and core eddy current loss density / W/m^3'))",
+  "    View[k].ScaleType = 2;",
+  "    View[k].SaturateValues = 1;",
+  "  EndIf",
+  "  If (!StrCmp(View[k].Name, 'Litz wire loss density / W/m^3'))",
+  "    View[k].ScaleType = 2;",
+  "  EndIf",
+  "  If (!StrCmp(View[k].Name, 'Litz wire loss density / W/m^3'))",
+  "    View[k].ScaleType = 2;",
+  "  EndIf",
+  "EndFor"
+ ], File "option.pos"];
+ EndIf
   // RangeType = 1; // Value scale range type (1=default, 2=custom, 3=per time step)
   // IntervalsType = 2; // Type of interval display (1=iso, 2=continuous, 3=discrete, 4=numeric)
 
diff --git a/femmt/electro_magnetic/ind_axi_python_controlled.pro b/femmt/electro_magnetic/ind_axi_python_controlled.pro
@@ -7,6 +7,7 @@ If(Flag_Permeability_From_Data)
   Include "core_materials_temp.pro";
 EndIf
 ExtGmsh = ".pos";
+po = "Output 2D (Magnetic Simulation)/";
 
 
 // ----------------------
diff --git a/femmt/electro_magnetic/values.pro b/femmt/electro_magnetic/values.pro
@@ -10,11 +10,6 @@ PostOperation Get_global UsingPost MagDyn_a {
   //Print[ SoF[ DomainC ], OnGlobal, Format TimeTable,  File > Sprintf("results/SF_Core.dat")] ; // TODO: Complex power
   //Print[ j2F[ Winding~{1} ], OnGlobal, Format TimeTable, File > StrCat[DirResVals, "j2F_1.dat"]] ;
 
-  For n In {1:n_windings}
-      Print[ j2F[ Winding~{n} ], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals, "j2F_%g.dat"], n]] ;
-  EndFor
-
-
 
   //Print[ j2F[ Winding3 ], OnGlobal, Format TimeTable, File > StrCat[DirResVals,"j2F_3.dat"]] ;
   // Stranded
@@ -24,10 +19,41 @@ PostOperation Get_global UsingPost MagDyn_a {
   //Print[ j2H[ StrandedWinding~{1} ], OnGlobal, Format TimeTable, File > StrCat[DirResVals,"j2H_1.dat"] ] ;
   //Print[ j2H[ StrandedWinding1 ], OnGlobal, Format Table];
 
-  For n In {1:n_windings}
-      Print[ j2H[ StrandedWinding~{n} ], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals,"j2H_%g.dat"], n]] ;
-  EndFor
-
+  // This code is to prevent printing both if one of them is not exist
+  If (Flag_Stream_Visualization)
+    // initialize
+    solid_exist = 0;
+    litz_exist  = 0;
+
+    For n In {1:n_windings}
+        If(!Flag_HomogenisedModel~{n})
+            solid_exist = 1; // found a solid conductor
+        Else
+            litz_exist  = 1; // found a litz conductor
+        EndIf
+    EndFor
+    If (solid_exist)
+        For n In {1:n_windings}
+            Print[ j2F[ Winding~{n} ], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals, "j2F_%g.dat"], n],
+             SendToServer Sprintf[StrCat[po,"12winding_%g_losses [J]"], n],  Color "LightYellow" ] ;
+        EndFor
+    EndIf
+    If(litz_exist)
+        For n In {1:n_windings}
+            Print[ j2H[ StrandedWinding~{n} ], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals,"j2H_%g.dat"], n],
+            SendToServer Sprintf[StrCat[po,"13winding_%g_losses [J]"], n],  Color "LightYellow"] ;
+        EndFor
+    EndIf
+  Else
+      For n In {1:n_windings}
+          Print[ j2F[ Winding~{n} ], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals, "j2F_%g.dat"], n],
+           SendToServer Sprintf[StrCat[po,"12winding_%g_losses [J]"], n],  Color "LightYellow" ] ;
+      EndFor
+      For n In {1:n_windings}
+          Print[ j2H[ StrandedWinding~{n} ], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals,"j2H_%g.dat"], n],
+           SendToServer Sprintf[StrCat[po,"13winding_%g_losses [J]"], n],  Color "LightYellow"] ;
+      EndFor
+  EndIf
 
   //Print[ j2H[ StrandedWinding2 ], OnGlobal, Format TimeTable, File > StrCat[DirResVals,"j2H_2.dat"] ] ;
   //Print[ j2H[ StrandedWinding3 ], OnGlobal, Format TimeTable, File > StrCat[DirResVals,"j2H_3.dat"] ] ;
@@ -54,13 +80,15 @@ PostOperation Get_global UsingPost MagDyn_a {
   // Core
 
   // Eddy Current Losses according to sigma in Core
-  Print[ j2F[ Core ], OnGlobal, Format TimeTable, File > StrCat[DirResVals,"CoreEddyCurrentLosses.dat"]] ;
+  Print[ j2F[ Core ], OnGlobal, Format TimeTable, File > StrCat[DirResVals,"CoreEddyCurrentLosses.dat"], SendToServer StrCat[po,"15core_eddy_losses[J]"], Color "LightYellow" ] ;
 
   // Hysteresis Losses according to complex permeability in Core
   Print[ p_hyst[ Core ], OnGlobal, Format TimeTable, File > StrCat[DirResVals,"p_hyst.dat"]] ;// Core losses
   For n In {1:nCoreParts}
-      Print[ p_hyst[ CorePart~{n} ], OnGlobal , Format TimeTable, File > Sprintf[StrCat[DirResValsCore, "p_hyst_%g.dat"], n]] ;
-      Print[ j2F[ CorePart~{n} ], OnGlobal , Format TimeTable, File > Sprintf[StrCat[DirResValsCore, "CoreEddyCurrentLosses_%g.dat"], n]] ;
+      Print[ p_hyst[ CorePart~{n} ], OnGlobal , Format TimeTable, File > Sprintf[StrCat[DirResValsCore, "p_hyst_%g.dat"], n],
+       SendToServer StrCat[po,"16hyst_losses[J]"], Color "LightYellow"] ;
+      Print[ j2F[ CorePart~{n} ], OnGlobal , Format TimeTable, File > Sprintf[StrCat[DirResValsCore, "CoreEddyCurrentLosses_%g.dat"], n],
+       SendToServer Sprintf[StrCat[po,"17core_part_%g_eddy_losses [J]"], n],  Color "LightYellow"] ;
   EndFor
 
 
@@ -76,14 +104,16 @@ PostOperation Get_global UsingPost MagDyn_a {
   // Print[ Flux_Linkage_1[DomainCond1], OnGlobal, Format Table];
 
   For n In {1:n_windings}
-      Print[ Flux_Linkage~{n}[DomainCond~{n}], OnGlobal, Format Table, File > Sprintf[StrCat[DirResVals,"Flux_Linkage_%g.dat"], n]];
+      Print[ Flux_Linkage~{n}[DomainCond~{n}], OnGlobal, Format Table, File > Sprintf[StrCat[DirResVals,"Flux_Linkage_%g.dat"], n],
+       SendToServer Sprintf[StrCat[po,"18Flux_%g [Wb]"], n],  Color "LightYellow"];
       //Print[ Flux_Linkage~{n}[DomainCond~{n}], OnGlobal, Format Table];
   EndFor
 
   // Inductances
   For n In {1:n_windings}
       If(Val_EE~{n}!=0)
-         Print[ L~{n}~{n}[DomainCond~{n}], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals,"L_%g_%g.dat"], n, n]] ;
+         Print[ L~{n}~{n}[DomainCond~{n}], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals,"L_%g_%g.dat"], n, n],
+         SendToServer Sprintf[StrCat[po,"19L_%g_%g [Wb]"], n, n],  Color "LightYellow"] ;
          Print[ LFromMagEnergy~{n}~{n}[Domain], OnGlobal, Format TimeTable, File > Sprintf[StrCat[DirResVals,"LFromMagEnergy_%g_%g.dat"], n, n]] ;
       EndIf
   EndFor
@@ -100,16 +130,20 @@ PostOperation Get_global UsingPost MagDyn_a {
   If(!Flag_Circuit)
      For n In {1:n_windings}
          If(!Flag_HomogenisedModel~{n})
-           Print[ I, OnRegion Winding~{n}, Format TimeTable, File > Sprintf[StrCat[DirResCirc,"I_%g_f%g.dat"], n, Freq] , LastTimeStepOnly];
-           Print[ U, OnRegion Winding~{n}, Format TimeTable, File > Sprintf[StrCat[DirResCirc,"U_%g_f%g.dat"], n, Freq] , LastTimeStepOnly];
+           Print[ I, OnRegion Winding~{n}, Format TimeTable, File > Sprintf[StrCat[DirResCirc,"I_%g_f%g.dat"], n, Freq] , LastTimeStepOnly,
+            SendToServer Sprintf[StrCat[po,"10I_%g [A]"], n], Color "LightYellow"];
+           Print[ U, OnRegion Winding~{n}, Format TimeTable, File > Sprintf[StrCat[DirResCirc,"U_%g_f%g.dat"], n, Freq] , LastTimeStepOnly,
+           SendToServer Sprintf[StrCat[po,"11V_%g [V]"], n], Color "LightYellow"];
          Else
-           Print[ I, OnRegion StrandedWinding~{n}, Format TimeTable, File > Sprintf[StrCat[DirResCirc,"I_%g_f%g.dat"], n, Freq] , LastTimeStepOnly];
-           Print[ U, OnRegion StrandedWinding~{n}, Format TimeTable, File > Sprintf[StrCat[DirResCirc,"U_%g_f%g.dat"], n, Freq] , LastTimeStepOnly];
+           Print[ I, OnRegion StrandedWinding~{n}, Format TimeTable, File > Sprintf[StrCat[DirResCirc,"I_%g_f%g.dat"], n, Freq] , LastTimeStepOnly,
+            SendToServer Sprintf[StrCat[po,"10I_%g [A]"], n], Color "LightYellow"];
+           Print[ U, OnRegion StrandedWinding~{n}, Format TimeTable, File > Sprintf[StrCat[DirResCirc,"U_%g_f%g.dat"], n, Freq] , LastTimeStepOnly,
+           SendToServer Sprintf[StrCat[po,"11V_%g [V]"], n], Color "LightYellow"];
          EndIf
      EndFor
   Else
-     Print[ I, OnRegion Input, Format TimeTable, File >Sprintf("results/I_f%g.dat", Freq), LastTimeStepOnly];
-     Print[ U, OnRegion Input, Format TimeTable, File >Sprintf("results/U_f%g.dat", Freq), LastTimeStepOnly];
+     Print[ I, OnRegion Input, Format TimeTable, File >Sprintf("results/I_f%g.dat", Freq), LastTimeStepOnly, SendToServer Sprintf[StrCat[po,"20I_%g [A]"], n], Color "LightYellow"];
+     Print[ U, OnRegion Input, Format TimeTable, File >Sprintf("results/U_f%g.dat", Freq), LastTimeStepOnly, SendToServer Sprintf[StrCat[po,"21V_%g [V]"], n], Color "LightYellow"];
   EndIf
 
 }
diff --git a/femmt/electro_magnetic/values_time.pro b/femmt/electro_magnetic/values_time.pro
