66 verify winding layout jlpy and incorporate it to main

machine_design/designs/computation.py

@@ -3,8 +3,7 @@
 import numpy as np
 from ansys.aedt.core import Maxwell2d
 
-from machine_design.generic.compute_initpos import compute_initpos
-from machine_design.generic.winding import phase_groups
+from machine_design.generic.winding import assign_slot_currents_to_aedt, compute_winding_layout
 
 from .geometry import GeometryBase
 from .reserved_variables import check_no_reserved_variable_names
@@ -44,14 +43,10 @@ def extract_expression(solutions, expr: str) -> np.ndarray:
     def set_initpos(self) -> None:
         g = self.geometry
         Q = int(g.geom_params["SlotNumber"])
-        self.InitPos = compute_initpos(Q, g.PolePairs, g.n_phases, belt_offset=g.belt_offset)
+        layout = compute_winding_layout(g.n_phases, Q, g.PolePairs, coil_pitch=int(g.wind_params["CoilPitch"]), layers=int(g.wind_params["Layers"]))
+        self.InitPos = (layout.phase_a_axis - 180) / g.PolePairs
         self.oper_params["InitPos"] = f"{self.InitPos}deg"
 
-    def compute_phase_groups(self):
-        g = self.geometry
-        Q = int(g.geom_params["SlotNumber"])
-        return phase_groups(Q, g.PolePairs, g.n_phases, belt_offset=g.belt_offset)
-
     def set_solution_expressions(self):
         self.solution_expressions = [
             "Moving1.Position",
@@ -74,21 +69,16 @@ def set_post_params(self):
         }
 
     def assign_phase_windings(self, m2d: Maxwell2d, phase_currents: list) -> None:
-        groups = self.compute_phase_groups()
-        for group in groups:
-            for coil_name, polarity in group:
-                m2d.assign_coil(assignment=[coil_name], conductors_number="Nc", polarity=polarity, name=f"CS_{coil_name}")
-
-        for phase_name, current, group in zip(self.phases, phase_currents, groups):
-            m2d.assign_winding(
-                assignment=None,
-                winding_type="Current",
-                is_solid=False,
-                current=current,
-                parallel_branches="ParallelPaths",
-                name=f"Phase{phase_name}",
-            )
-            m2d.add_winding_coils(assignment=f"Phase{phase_name}", coils=[f"CS_{coil_name}" for coil_name, _ in group])
+        g = self.geometry
+        Q = int(g.geom_params["SlotNumber"])
+        n = Q // (2 * g.PolePairs)
+        layers = int(g.wind_params["Layers"])
+        layout = compute_winding_layout(g.n_phases, Q, g.PolePairs, coil_pitch=int(g.wind_params["CoilPitch"]), layers=layers)
+        layer_coils = [[f"Coil{i_layer}" if k == 0 else f"Coil{i_layer}_{k}" for k in range(n)] for i_layer in range(layers)]
+        coil_objects = layer_coils[0]
+        coil_objects_back = layer_coils[1] if layers == 2 else None
+        phase_currents_dict = dict(zip(self.phases, phase_currents))
+        assign_slot_currents_to_aedt(m2d, coil_objects, layout, phase_currents_dict, coil_objects_back=coil_objects_back)
 
     def extract_phase_results(self, solutions):
         # SI units

machine_design/generic/__init__.py

@@ -1,3 +1,2 @@
-from .compute_initpos import compute_initpos
 from .transforms import electrical_angle, to_dq, to_phases
-from .winding import coil_name, phase_groups, sector_winding
+from .winding import assign_slot_currents_to_aedt, compute_winding_layout