fiqus 2024.5.2__py3-none-any.whl → 2024.6.0__py3-none-any.whl

fiqus/mesh_generators/MeshMultipole.py

@@ -8,6 +8,7 @@ from fiqus.utils.Utils import FilesAndFolders as Util
 from fiqus.data import DataFiQuS as dF
 from fiqus.data import DataMultipole as dM
 from fiqus.data.RegionsModelFiQuS import RegionsModel as rM
+from fiqus.data import RegionsModelFiQuS as Reg_Mod_FiQ
 
 
 class Mesh:
@@ -219,23 +220,25 @@ class Mesh:
         self.rm.air.vol.number = self.md.domains.physical_groups.surfaces['air']
         self.rm.air_far_field.vol.names = ["AirInf"]
         self.rm.air_far_field.vol.numbers = [self.md.domains.physical_groups.surfaces['air_inf']]
-        self.rm.powered.vol.names = []
-        self.rm.powered.vol.numbers = []
+        self.rm.powered['Multipole'] =  Reg_Mod_FiQ.Powered()
+        self.rm.powered['Multipole'].vol.names = []
+        self.rm.powered['Multipole'].vol.numbers = []
         self.rm.iron.vol.names = []
         self.rm.iron.vol.numbers = []
-        self.rm.induced.vol.names = []
-        self.rm.induced.vol.numbers = []
+        self.rm.induced['Multipole'] =  Reg_Mod_FiQ.Induced()
+        self.rm.induced['Multipole'].vol.names = []
+        self.rm.induced['Multipole'].vol.numbers = []
         for group_name, surface in self.md.domains.physical_groups.surfaces.items():
             if group_name[:5] == 'block':
-                self.rm.powered.vol.names.append(group_name)
-                self.rm.powered.vol.numbers.append(surface)
+                self.rm.powered['Multipole'].vol.names.append(group_name)
+                self.rm.powered['Multipole'].vol.numbers.append(surface)
                 #  self.fd.half_turns.cross_sections.append(self.conductor_areas[name])
             elif group_name[:2] == 'BH':
                 self.rm.iron.vol.names.append(group_name)
                 self.rm.iron.vol.numbers.append(surface)
             elif group_name[:5] == 'wedge':
-                self.rm.induced.vol.names.append(group_name)
-                self.rm.induced.vol.numbers.append(surface)
+                self.rm.induced['Multipole'].vol.names.append(group_name)
+                self.rm.induced['Multipole'].vol.numbers.append(surface)
 
         self.rm.air_far_field.surf.name = "Surface_Inf"
         self.rm.air_far_field.surf.number = self.md.domains.physical_groups.curves['air_inf']

fiqus/mesh_generators/MeshPancake3D.py

@@ -109,22 +109,22 @@ class regions:
 
         # This is used because self.rm.powered is not initialized in
         # RegionsModelFiQuS.RegionsModel. It should be fixed in the future.
-        self.rm.powered = RegionsModelFiQuS.Powered()
+        self.rm.powered["Pancake3D"] = RegionsModelFiQuS.Powered()
 
         # Initializing the required variables (air and powered.vol_in and
         # powered.vol_out are not initialized because they are not lists but numbers):
-        self.rm.powered.vol.names = []
-        self.rm.powered.vol.numbers = []
-        self.rm.powered.surf.names = []
-        self.rm.powered.surf.numbers = []
-        self.rm.powered.surf_th.names = []
-        self.rm.powered.surf_th.numbers = []
-        self.rm.powered.surf_in.names = []
-        self.rm.powered.surf_in.numbers = []
-        self.rm.powered.surf_out.names = []
-        self.rm.powered.surf_out.numbers = []
-        self.rm.powered.curve.names = []
-        self.rm.powered.curve.numbers = []
+        self.rm.powered["Pancake3D"].vol.names = []
+        self.rm.powered["Pancake3D"].vol.numbers = []
+        self.rm.powered["Pancake3D"].surf.names = []
+        self.rm.powered["Pancake3D"].surf.numbers = []
+        self.rm.powered["Pancake3D"].surf_th.names = []
+        self.rm.powered["Pancake3D"].surf_th.numbers = []
+        self.rm.powered["Pancake3D"].surf_in.names = []
+        self.rm.powered["Pancake3D"].surf_in.numbers = []
+        self.rm.powered["Pancake3D"].surf_out.names = []
+        self.rm.powered["Pancake3D"].surf_out.numbers = []
+        self.rm.powered["Pancake3D"].curve.names = []
+        self.rm.powered["Pancake3D"].curve.numbers = []
 
         self.rm.insulator.vol.names = []
         self.rm.insulator.vol.numbers = []
@@ -167,12 +167,12 @@ class regions:
 
         if regionType is regionType.powered:
             if entityType is entityType.vol_in or entityType is entityType.vol_out:
-                getattr(self.rm.powered, entityType).name = name
-                getattr(self.rm.powered, entityType).number = regionTag
+                getattr(self.rm.powered["Pancake3D"], entityType).name = name
+                getattr(self.rm.powered["Pancake3D"], entityType).number = regionTag
 
             else:
-                getattr(self.rm.powered, entityType).names.append(name)
-                getattr(self.rm.powered, entityType).numbers.append(
+                getattr(self.rm.powered["Pancake3D"], entityType).names.append(name)
+                getattr(self.rm.powered["Pancake3D"], entityType).numbers.append(
                     regionTag
                 )
         elif regionType is regionType.insulator:
@@ -792,6 +792,7 @@ class Mesh(Base):
             )
             newAirOuterTubeVolumeDimTag = airOuterTubeVolumeDimTag
             removedAirVolumeDimTags.extend(airOuterTubeVolumeDimTags)
+            self.dimTags[self.geo.ai.name + "-OuterTube"] = [newAirOuterTubeVolumeDimTag]
 
             if self.geo.ai.shellTransformation:
                 # Fuse air shell volumes:
@@ -858,6 +859,7 @@ class Mesh(Base):
                         fuseOtherSurfaces=False,
                         surfacesArePlane=False,
                     )
+                    self.dimTags[self.geo.ai.name + "-OuterTube"] = [newAirOuterTubeVolumeDimTag]
                     airOuterTubeVolumeDimTag = newAirOuterTubeVolumeDimTag
                     self.dimTags[self.geo.ai.shellVolumeName].append(
                         newShellVolumeDimTag
@@ -2602,7 +2604,7 @@ class Mesh(Base):
         # Create a region with two points on air to be used in the pro file formulation:
         # To those points, Phi=0 boundary condition will be applied to set the gauge.
         outerAirSurfaces = gmsh.model.getBoundary(
-            self.dimTags[self.geo.ai.name], combined=True, oriented=False
+            self.dimTags[self.geo.ai.name + "-OuterTube"], combined=True, oriented=False
         )
         outerAirSurface = outerAirSurfaces[-1]
         outerAirCurves = gmsh.model.getBoundary(