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

fiqus/geom_generators/GeometryPancake3D.py

@@ -5,6 +5,7 @@ from inspect import currentframe, getframeinfo
 from typing import List, Tuple, Dict
 import operator
 
+import os
 import json
 import timeit
 import numpy as np
@@ -17,6 +18,7 @@ from fiqus.data.DataFiQuSPancake3D import Pancake3DGeometry
 
 logger = logging.getLogger(__name__)
 
+# coordinateList = []
 
 def findSurfacesWithNormalsOnXYPlane(dimTags):
     result = []
@@ -103,7 +105,7 @@ class dimTags:
     If parentName is specified, during the volume information file generation, another
     key that is equal to parentName is created, and all the dimTags are also added
     there. For example, air consists of many parts such as gap, outer tube, inner
-    cylinder parts, and their dimTags object all have the parentName of self.geo.ai.name
+    cylinder parts, and their dimTags object all have the parentName of self.geo.air.name
     (user input of the air name) so that in the volume information file, they are all
     combined under the air name as well.
 
@@ -463,6 +465,27 @@ class dimTagsStorage:
         else:
             cls.__dimTagsDict[dimTagsObject.name] = dimTagsObject
 
+    # @classmethod
+    # def updateDimTagsFromDict(cls, name: str, dimTagsList: List[Tuple[int, int]]):
+    #     """
+    #     Updates or adds dimTags from a list of (dim, tag) tuples.
+    #
+    #     :param name: Name of the dimTags entry to update or add.
+    #     :type name: str
+    #     :param dimTagsList: List of (dim, tag) tuples to be associated with the name.
+    #     :type dimTagsList: List[Tuple[int, int]]
+    #     """
+    #     # Check if the entry exists; if so, update it, otherwise add a new entry
+    #     if name in cls.__dimTagsDict:
+    #         existingDimTags = cls.__dimTagsDict[
+    #             name].dimTags  # Assuming dimTags object has a dimTags attribute storing the list of tuples
+    #         updatedDimTags = existingDimTags + dimTagsList
+    #         cls.__dimTagsDict[name].dimTags = updatedDimTags  # Update the list of tuples
+    #     else:
+    #         # Create a new dimTags object (this step depends on how your dimTags class is structured)
+    #         newDimTagsObject = dimTags(name=name, dimTags=dimTagsList)  # Assuming such a constructor exists
+    #         cls.__dimTagsDict[name] = newDimTagsObject
+
     @classmethod
     def getDimTagsObject(cls, names: List[str]):
         """
@@ -633,6 +656,9 @@ class point:
     """
 
     def __init__(self, r0=0.0, r1=0.0, r2=0.0, type=coordinate.rectangular) -> None:
+
+        self.type = type  # Store 'type' as an instance attribute
+
         if type is coordinate.rectangular:
             self.x = r0
             self.y = r1
@@ -702,7 +728,7 @@ class point:
         )
 
 
-class spiralCurve:
+class spiralCurve():
     """
     A class to create a spiral curves parallel to XY plane in GMSH. The curve is defined
     by a spline and it is divided into sub-curves. Sub-curves are used because it makes
@@ -828,9 +854,13 @@ class spiralCurve:
         pointTagsWithoutBreakPoints = []  # only used if cutPlaneNormal is not None
         breakPointObjectsDueToTransition = []
         breakPointTagsDueToTransition = []
+        coordinateList = []
 
         for j in range(len(theta)):
             pointObject = point(r[j], theta[j], z[j], coordinate.cylindrical)
+            [x_c, y_c, z_c] = [r[j], theta[j], z[j]]
+            #print([x_c, y_c, z_c])
+            coordinateList.append([x_c, y_c, z_c])
             points.append(pointObject)
             pointTags.append(pointObject.tag)
             if cutPlaneNormal is not None:
@@ -853,6 +883,169 @@ class spiralCurve:
                 breakPointObjectsDueToTransition.append(pointObject)
                 breakPointTagsDueToTransition.append(pointObject.tag)
 
+        # Plotter
+        # x_coords = [coord[0] for coord in coordinateList]
+        # y_coords = [coord[1] for coord in coordinateList]
+        # z_coords = [coord[2] for coord in coordinateList]
+
+        # print(f'number of divisions {self.Pancake3DMeshWinding.ane}')
+        # print(self.wi.ane)
+        # Creating the 3D plot
+        # fig = plt.figure()
+        # ax = fig.add_subplot(111, projection='3d')
+
+        # Plotting the coordinates
+        # ax.scatter(x_coords, y_coords, z_coords, c='r', marker='o')
+        #
+        # # Setting labels
+        # ax.set_xlabel('X Label')
+        # ax.set_ylabel('Y Label')
+        # ax.set_zlabel('Z Label')
+        #
+        # plt.show()
+
+        # Logic to break the points up into relevant geom coordinates
+        # Brick points structure (for X-Y plane only for now):
+        # [[[x1, y1, z1], [x2, y2, z2], [x3, y3, z3], [x4, y4, z4]], ...]
+        # Theoretically, very easy to extend to 8 points knowing the height of the
+
+        # Defining the coordinate lists to which the points are to be added
+
+        # winding one covers the list of points in the domain of theta [k, pi*k], where k is an integer number
+        winding_1 = []
+        # winding one covers the list of points in the domain of theta [pi*k, 2pi*k], where k is an integer number
+        winding_2 = []
+        # winding one covers the list of points in the domain of theta [k, pi*k], where k is an integer number
+        winding_3 = []
+        # winding one covers the list of points in the domain of theta [pi*k, 2pi*k], where k is an integer number
+        winding_4 = []
+        #print(theta[10])
+        # heightPancake = self.geo.winding.height
+        # print(heightPancake)
+        for i in range(len(theta)-1): # range is reduced as no brick can be created starting at the last point
+            # Assuming theta is a numpy array and you're looking for the index of a value close to pi
+            value_to_find = theta[i]+np.pi
+            tolerance = 1e-10  # Define a small tolerance
+            # Find indices where the condition is true
+            indices = np.where(np.abs(theta - value_to_find) < tolerance)[0]
+            if len(indices) > 0:
+                windingUpIndex = indices[0]  # Take the first index if there are multiple matches
+                try:
+                    x_1 = r[i] * np.cos(theta[i])
+                    y_1 = r[i] * np.sin(theta[i])
+                    z_g = z[i]
+                    x_2 = r[i+1] * np.cos(theta[i+1])
+                    y_2 = r[i+1] * np.sin(theta[i+1])
+                    x_3 = r[windingUpIndex] * np.cos(theta[windingUpIndex])
+                    y_3 = r[windingUpIndex] * np.sin(theta[windingUpIndex])
+                    x_4 = r[windingUpIndex+1] * np.cos(theta[windingUpIndex+1])
+                    y_4 = r[windingUpIndex+1] * np.sin(theta[windingUpIndex+1])
+                    addPoints = [[x_1, y_1, z_g], [x_2, y_2, z_g], [x_3, y_3, z_g], [x_4, y_4, z_g]]
+                    k = theta[i]//(2*np.pi)
+                    if (theta[i] <= np.pi*(k+1)):
+                        # print('winding 1 or 3')
+                        if (k%2 == 0):
+                            # print('winding 1')
+                            winding_1.append(addPoints)
+                        else:
+                            # print('winding 3')
+                            winding_3.append(addPoints)
+
+                    if (theta[i] >= np.pi*(k+1)):
+                        # print('winding 2 or 4')
+                        if (k%2 == 0):
+                            # print('winding 2')
+                            winding_2.append(addPoints)
+                        else:
+                            # print('winding 4')
+                            winding_4.append(addPoints)
+                except IndexError:
+                    print('All of the winding conductor points have been found')
+
+        # print(winding_1)
+        # print(winding_2)
+        # print(winding_3)
+        # print(winding_4)
+
+        # Plotter
+        # x_coords = [coord[0] for coord in winding_1]
+        # y_coords = [coord[1] for coord in winding_1]
+        # z_coords = [coord[2] for coord in winding_1]
+        #
+        # # Creating the 3D plot
+        # fig = plt.figure()
+        # ax = fig.add_subplot(111, projection='3d')
+        #
+        # # Plotting the coordinates
+        # ax.scatter(x_coords, y_coords, z_coords, c='r', marker='o')
+        #
+        # # Setting labels
+        # ax.set_xlabel('X Label')
+        # ax.set_ylabel('Y Label')
+        # ax.set_zlabel('Z Label')
+        #
+        # plt.show()
+
+        # if True:
+        #     indexPoint = 1
+        #     rangeUpdated = 0
+        #     dict_cond = {0: {'SHAPE': 'BR8', 'XCENTRE': '0.0', 'YCENTRE': '0.0', 'ZCENTRE': '0.0', 'PHI1': '0.0', 'THETA1': '0.0', 'PSI1': '0.0', 'XCEN2': '0.0', 'YCEN2': '0.0', 'ZCEN2': '0.0', 'THETA2': '0.0', 'PHI2': '0.0', 'PSI2': '0.0', 'XP1': '-0.879570', 'YP1': '-0.002940', 'ZP1': '-1.131209', 'XP2': '-0.879570', 'YP2': '0.002940', 'ZP2': '-1.131209', 'XP3': '-0.881381', 'YP3': '0.002940', 'ZP3': '-1.114205', 'XP4': '-0.881381', 'YP4': '-0.002940', 'ZP4': '-1.114205', 'XP5': '-0.861227', 'YP5': '-0.002972', 'ZP5': '-1.129183', 'XP6': '-0.861208', 'YP6': '0.002908', 'ZP6': '-1.129182', 'XP7': '-0.863294', 'YP7': '0.002912', 'ZP7': '-1.112210', 'XP8': '-0.863313', 'YP8': '-0.002968', 'ZP8': '-1.112211', 'CURD': '201264967.975494', 'SYMMETRY': '1', 'DRIVELABEL': 'drive 0', 'IRXY': '0', 'IRYZ': '0', 'IRZX': '0', 'TOLERANCE': '1e-6'}, 1: {'SHAPE': 'BR8', 'XCENTRE': '0.0', 'YCENTRE': '0.0', 'ZCENTRE': '0.0', 'PHI1': '0.0', 'THETA1': '0.0', 'PSI1': '0.0', 'XCEN2': '0.0', 'YCEN2': '0.0', 'ZCEN2': '0.0', 'THETA2': '0.0', 'PHI2': '0.0', 'PSI2': '0.0', 'XP1': '-0.861227', 'YP1': '-0.002972', 'ZP1': '-1.129183', 'XP2': '-0.861208', 'YP2': '0.002908', 'ZP2': '-1.129182', 'XP3': '-0.863294', 'YP3': '0.002912', 'ZP3': '-1.112210', 'XP4': '-0.863313', 'YP4': '-0.002968', 'ZP4': '-1.112211', 'XP5': '-0.842917', 'YP5': '-0.003066', 'ZP5': '-1.126858', 'XP6': '-0.842880', 'YP6': '0.002814', 'ZP6': '-1.126858', 'XP7': '-0.845242', 'YP7': '0.002830', 'ZP7': '-1.109922', 'XP8': '-0.845278', 'YP8': '-0.003050', 'ZP8': '-1.109922', 'CURD': '201264967.975494', 'SYMMETRY': '1', 'DRIVELABEL': 'drive 0', 'IRXY': '0', 'IRYZ': '0', 'IRZX': '0', 'TOLERANCE': '1e-6'}, 2: {'SHAPE': 'BR8', 'XCENTRE': '0.0', 'YCENTRE': '0.0', 'ZCENTRE': '0.0', 'PHI1': '0.0', 'THETA1': '0.0', 'PSI1': '0.0', 'XCEN2': '0.0', 'YCEN2': '0.0', 'ZCEN2': '0.0', 'THETA2': '0.0', 'PHI2': '0.0', 'PSI2': '0.0', 'XP1': '-0.842917', 'YP1': '-0.003066', 'ZP1': '-1.126858', 'XP2': '-0.842880', 'YP2': '0.002814', 'ZP2': '-1.126858', 'XP3': '-0.845242', 'YP3': '0.002830', 'ZP3': '-1.109922', 'XP4': '-0.845278', 'YP4': '-0.003050', 'ZP4': '-1.109922', 'XP5': '-0.824646', 'YP5': '-0.003216', 'ZP5': '-1.124235', 'XP6': '-0.824593', 'YP6': '0.002664', 'ZP6': '-1.124239', 'XP7': '-0.827229', 'YP7': '0.002698', 'ZP7': '-1.107343', 'XP8': '-0.827282', 'YP8': '-0.003181', 'ZP8': '-1.107339', 'CURD': '201264967.975494', 'SYMMETRY': '1', 'DRIVELABEL': 'drive 0', 'IRXY': '0', 'IRYZ': '0', 'IRZX': '0', 'TOLERANCE': '1e-6'}}
+        #     # print(dict_cond)
+        #     for brick in dict_cond:
+        #         for pointIndex in range (rangeUpdated, rangeUpdated+7):
+        #             dict_cond[brick][f'XP{indexPoint}'] = str(coordinateList[pointIndex][0])
+        #             dict_cond[brick][f'YP{indexPoint}'] = str(coordinateList[pointIndex][1])
+        #             dict_cond[brick][f'ZP{indexPoint}'] = str(coordinateList[pointIndex][2])
+        #             indexPoint+=1
+        #         indexPoint = 1
+        #         rangeUpdated = rangeUpdated + 8
+
+            # writing COND.json file
+            # Define the path for the JSON file, one directory up from the current script
+            # json_file_path = os.path.join(os.path.dirname(os.getcwd()), "BR8.json")
+
+            # Function to print the contents of a JSON file
+            # def print_json_contents(path):
+            #     try:
+            #         with open(path, 'r') as file:
+            #             data = json.load(file)
+            #             print(json.dumps(data, indent=4))
+            #     except FileNotFoundError:
+            #         print("File not found.")
+            #     except json.JSONDecodeError:
+            #         print("File is empty or contains non-JSON conforming data.")
+            #
+            # # Print current contents
+            # print("Current contents of BR8.json:")
+            # print_json_contents(json_file_path)
+
+            # Overwrite the JSON file
+            # with open(json_file_path, 'w') as file:
+            #     json.dump(dict_cond, file, indent=4)
+            #
+            # print("\nContents of BR8.json after overwriting:")
+            # print_json_contents(json_file_path)
+            # writing the .cond file
+
+            # p = tuh.Paths('tests/parsers', '')
+            # FilesAndFolders.prep_folder(p.model_folder)
+
+            # Specify the target directory relative to the current working directory
+            target_dir = os.path.join(os.getcwd(), 'tests', '_outputs', 'parsers')
+
+            # Ensure the target directory exists
+            os.makedirs(target_dir, exist_ok=True)
+
+            # Define the output file path
+            # out_file = os.path.join(target_dir, 'BR8.cond')
+            # list_of_shapes = ['BR8']
+            # for shape in list_of_shapes:
+            #         pc = ParserCOND()
+            #         input_dict = dict_cond
+            #         pc.write_cond(input_dict, out_file)
+            # print('path')
+            # print(out_file)
+            # print('hello world')
         # =============================================================================
         # GENERATING POINTS ENDS ======================================================
         # =============================================================================
@@ -873,6 +1066,7 @@ class spiralCurve:
         # number of turns. It is best to visually look at the divisions with
         # gmsh.fltk.run() to understand why the split points are chosen the way they are
         # selected.
+
         if cutPlaneNormal is None:
             pointObjectsWithoutBreakPoints = points
             pointTagsWithoutBreakPoints = pointTags
@@ -2930,49 +3124,49 @@ class pancakeCoilsWithAir:
         # ==============================================================================
         # Air shell (they will be empty if shellTransformation == False):
         # For cylinder type:
-        self.airShellVolume = dimTags(name=self.geo.ai.shellVolumeName, save=True)
+        self.airShellVolume = dimTags(name=self.geo.air.shellVolumeName, save=True)
 
         # For cuboid type:
         self.airShellVolumePart1 = dimTags(
-            name=self.geo.ai.shellVolumeName + "-Part1", save=True
+            name=self.geo.air.shellVolumeName + "-Part1", save=True
         )
         self.airShellVolumePart2 = dimTags(
-            name=self.geo.ai.shellVolumeName + "-Part2", save=True
+            name=self.geo.air.shellVolumeName + "-Part2", save=True
         )
         self.airShellVolumePart3 = dimTags(
-            name=self.geo.ai.shellVolumeName + "-Part3", save=True
+            name=self.geo.air.shellVolumeName + "-Part3", save=True
         )
         self.airShellVolumePart4 = dimTags(
-            name=self.geo.ai.shellVolumeName + "-Part4", save=True
+            name=self.geo.air.shellVolumeName + "-Part4", save=True
         )
 
         # Outer air tube volume (actually it is not a tube if the air type is cuboid):
         self.outerAirTubeVolume = dimTags(
-            name=self.geo.ai.name + "-OuterTube", save=True, parentName=self.geo.ai.name
+            name=self.geo.air.name + "-OuterTube", save=True, parentName=self.geo.air.name
         )
 
         # Outer terminal's outer tube part:
         self.outerTerminalTubeVolume = dimTags(
-            name=self.geo.ti.o.name + "-Tube", save=True, parentName=self.geo.ti.o.name
+            name=self.geo.terminals.outer.name + "-Tube", save=True, parentName=self.geo.terminals.outer.name
         )
 
         # Outer terminal's volume that touches the winding:
         self.outerTerminalTouchingVolume = dimTags(
-            name=self.geo.ti.o.name + "-Touching",
+            name=self.geo.terminals.outer.name + "-Touching",
             save=True,
-            parentName=self.geo.ti.o.name,
+            parentName=self.geo.terminals.outer.name,
         )
 
         # Inner terminal's volume that touches the winding:
         self.innerTerminalTouchingVolume = dimTags(
-            name=self.geo.ti.i.name + "-Touching",
+            name=self.geo.terminals.inner.name + "-Touching",
             save=True,
-            parentName=self.geo.ti.i.name,
+            parentName=self.geo.terminals.inner.name,
         )
 
         # Inner terminal's inner tube part:
         self.innerTerminalTubeVolume = dimTags(
-            name=self.geo.ti.i.name + "-Tube", save=True, parentName=self.geo.ti.i.name
+            name=self.geo.terminals.inner.name + "-Tube", save=True, parentName=self.geo.terminals.inner.name
         )
 
         # Transition layers:
@@ -2987,63 +3181,63 @@ class pancakeCoilsWithAir:
 
         # Inner air cylinder volume:
         self.centerAirCylinderVolume = dimTags(
-            name=self.geo.ai.name + "-InnerCylinder",
+            name=self.geo.air.name + "-InnerCylinder",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
 
         # Top and bottom parts of the air volume:
         self.topAirPancakeWindingExtursionVolume = dimTags(
-            name=self.geo.ai.name + "-TopPancakeWindingExtursion",
+            name=self.geo.air.name + "-TopPancakeWindingExtursion",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
         self.topAirPancakeContactLayerExtursionVolume = dimTags(
-            name=self.geo.ai.name + "-TopPancakeContactLayerExtursion",
+            name=self.geo.air.name + "-TopPancakeContactLayerExtursion",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
         self.topAirTerminalsExtrusionVolume = dimTags(
-            name=self.geo.ai.name + "-TopTerminalsExtrusion",
+            name=self.geo.air.name + "-TopTerminalsExtrusion",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
         self.topAirTubeTerminalsExtrusionVolume = dimTags(
-            name=self.geo.ai.name + "-TopTubeTerminalsExtrusion",
+            name=self.geo.air.name + "-TopTubeTerminalsExtrusion",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
 
         self.bottomAirPancakeWindingExtursionVolume = dimTags(
-            name=self.geo.ai.name + "-BottomPancakeWindingExtursion",
+            name=self.geo.air.name + "-BottomPancakeWindingExtursion",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
         self.bottomAirPancakeContactLayerExtursionVolume = dimTags(
-            name=self.geo.ai.name + "-BottomPancakeContactLayerExtursion",
+            name=self.geo.air.name + "-BottomPancakeContactLayerExtursion",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
         self.bottomAirTerminalsExtrusionVolume = dimTags(
-            name=self.geo.ai.name + "-BottomTerminalsExtrusion",
+            name=self.geo.air.name + "-BottomTerminalsExtrusion",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
         self.bottomAirTubeTerminalsExtrusionVolume = dimTags(
-            name=self.geo.ai.name + "-BottomTubeTerminalsExtrusion",
+            name=self.geo.air.name + "-BottomTubeTerminalsExtrusion",
             save=True,
-            parentName=self.geo.ai.name,
+            parentName=self.geo.air.name,
         )
 
         # Gap air:
         self.gapAirVolume = dimTags(
-            name=self.geo.ai.name + "-Gap", save=True, parentName=self.geo.ai.name
+            name=self.geo.air.name + "-Gap", save=True, parentName=self.geo.air.name
         )
 
         # Create additional/optional volume storages (they might be used in the meshing
         # process):
-        self.firstTerminalVolume = dimTags(name=self.geo.ti.firstName, save=True)
-        self.lastTerminalVolume = dimTags(name=self.geo.ti.lastName, save=True)
+        self.firstTerminalVolume = dimTags(name=self.geo.terminals.firstName, save=True)
+        self.lastTerminalVolume = dimTags(name=self.geo.terminals.lastName, save=True)
 
         # ==============================================================================
         # CREATING VOLUME STORAGES ENDS ================================================
@@ -3072,20 +3266,20 @@ class pancakeCoilsWithAir:
 
         self.gapAirSurfacesDimTags = []
 
-        for i in range(self.geo.N):
+        for i in range(self.geo.numberOfPancakes):
             # Itterate over the number of pancake coils:
             self.individualWinding.append(
                 dimTags(
-                    name=self.geo.wi.name + str(self.pancakeIndex + 1),
+                    name=self.geo.winding.name + str(self.pancakeIndex + 1),
                     save=True,
-                    parentName=self.geo.wi.name,
+                    parentName=self.geo.winding.name,
                 )
             )
             self.individualContactLayer.append(
                 dimTags(
-                    name=self.geo.ii.name + str(self.pancakeIndex + 1),
+                    name=self.geo.contactLayer.name + str(self.pancakeIndex + 1),
                     save=True,
-                    parentName=self.geo.ii.name,
+                    parentName=self.geo.contactLayer.name,
                 )
             )
 
@@ -3128,7 +3322,7 @@ class pancakeCoilsWithAir:
                         self.fundamentalSurfaces[self.outerTerminalTubeVolume]
                     )
 
-                    if self.mesh.ti.structured:
+                    if self.mesh.terminals.structured:
                         lastItTubeVolDimTags = self.innerTerminalTubeVolume.getDimTags(
                             3
                         )[-4:]
@@ -3147,7 +3341,7 @@ class pancakeCoilsWithAir:
                         findOuterOnes(lastItTubeSideSurfsDimTags)
                     )
 
-                    if self.mesh.ai.structured:
+                    if self.mesh.air.structured:
                         lastAirTubeVolDimTags = self.outerAirTubeVolume.getDimTags(3)[
                             -4:
                         ]
@@ -3173,7 +3367,7 @@ class pancakeCoilsWithAir:
                     topSurfacesDimTags.extend(
                         self.fundamentalSurfaces[self.innerTerminalTubeVolume]
                     )
-                    if self.mesh.ti.structured:
+                    if self.mesh.terminals.structured:
                         lastOtTubeVolDimTags = self.outerTerminalTubeVolume.getDimTags(
                             3
                         )[-4:]
@@ -3192,7 +3386,7 @@ class pancakeCoilsWithAir:
                         findOuterOnes(lastOtTubeSurfsDimTags, findInnerOnes=True)
                     )
 
-                    if self.mesh.ai.structured:
+                    if self.mesh.air.structured:
                         lastAirCylinderVolDimTags = (
                             self.centerAirCylinderVolume.getDimTags(3)[-4:]
                         )
@@ -3240,7 +3434,7 @@ class pancakeCoilsWithAir:
                 # funny about the geometry, the gap air can be created with fragment
                 # operations as well.
 
-                if not self.geo.ai.fragment:
+                if not self.geo.air.generateGapAirWithFragment:
                     allGapAirSurfacesTags = [
                         dimTag[1] for dimTag in allGapAirSurfacesDimTags
                     ]
@@ -3263,12 +3457,12 @@ class pancakeCoilsWithAir:
                 # downwards to create the bottom air volume and terminal volume.
                 _ = self.extrudeGapPart(
                     self.fundamentalSurfaces,
-                    -self.geo.ai.margin,
+                    -self.geo.air.axialMargin,
                     terminalDimTagsObject=self.outerTerminalTubeVolume,
                     firstTerminal=True,
                 )
 
-            if not i == self.geo.N - 1:
+            if not i == self.geo.numberOfPancakes - 1:
                 # If it is not the last pancake coil, extrude the terminal surface to
                 # create the next contactTerminalSurface and store the new volume in the
                 # corresponding dimTags object.
@@ -3280,13 +3474,13 @@ class pancakeCoilsWithAir:
                 # dimTags object.
                 _ = self.extrudeGapPart(
                     topSurfaces,
-                    self.geo.ai.margin,
+                    self.geo.air.axialMargin,
                     lastTerminal=True,
                 )
             self.pancakeIndex = self.pancakeIndex + 1
 
         # Create the gap air volume:
-        if self.geo.ai.fragment and self.geo.N > 1:
+        if self.geo.air.generateGapAirWithFragment and self.geo.numberOfPancakes > 1:
             self.generateGapAirWithFragment(self.gapAirSurfacesDimTags)
 
         logger.info(
@@ -3313,24 +3507,25 @@ class pancakeCoilsWithAir:
 
         # Calculate the z coordinate of the surfaces:
         z = (
-            -self.geo.ai.h / 2
-            + self.geo.ai.margin
-            + self.pancakeIndex * (self.geo.wi.h + self.geo.gap)
+            -self.geo.air.h / 2
+            + self.geo.air.axialMargin
+            + self.pancakeIndex * (self.geo.winding.height + self.geo.gapBetweenPancakes)
         )
 
         # Create the winding and contact layer surface:
         surface = spiralSurface(
-            self.geo.wi.r_i,
-            self.geo.wi.t,
-            self.geo.ii.t,
-            self.geo.wi.N,
+            self.geo.winding.innerRadius,
+            self.geo.winding.thickness,
+            self.geo.contactLayer.thickness,
+            self.geo.winding.numberOfTurns,
             z,
-            self.geo.wi.theta_i,
-            self.geo.ti.transitionNotchAngle,
+            self.geo.winding.theta_i,
+            self.geo.terminals.transitionNotchAngle,
             spiralDirection,
-            thinShellApproximation=self.geo.ii.tsa,
+            thinShellApproximation=self.geo.contactLayer.thinShellApproximation,
         )
-
+        #print("this is the surface")
+        #print(surface)
         # Save the surface tags (if TSA, contactLayerSurfaceTags will be empty):
         fundamentalSurfaces[self.individualWinding[self.pancakeIndex]] = [
             (2, tag) for tag in surface.surfaceTags
@@ -3339,37 +3534,37 @@ class pancakeCoilsWithAir:
             (2, tag) for tag in surface.contactLayerSurfaceTags
         ]
 
-        if self.geo.ai.type == "cylinder":
+        if self.geo.air.type == "cylinder":
             outerAirSurf = outerAirSurface(
-                self.geo.ai.r,
-                self.geo.ti.o.r,
+                self.geo.air.radius,
+                self.geo.terminals.outer.r,
                 type="cylinder",
-                divideIntoFourParts=self.mesh.ai.structured,
-                divideTerminalPartIntoFourParts=self.mesh.ti.structured,
+                divideIntoFourParts=self.mesh.air.structured,
+                divideTerminalPartIntoFourParts=self.mesh.terminals.structured,
             )
-        elif self.geo.ai.type == "cuboid":
+        elif self.geo.air.type == "cuboid":
             outerAirSurf = outerAirSurface(
-                self.geo.ai.a / 2,
-                self.geo.ti.o.r,
+                self.geo.air.sideLength / 2,
+                self.geo.terminals.outer.r,
                 type="cuboid",
-                divideIntoFourParts=self.mesh.ai.structured,
-                divideTerminalPartIntoFourParts=self.mesh.ti.structured,
+                divideIntoFourParts=self.mesh.air.structured,
+                divideTerminalPartIntoFourParts=self.mesh.terminals.structured,
             )
 
         outerTerminalSurf = outerTerminalSurface(
-            self.geo.ti.o.r,
-            self.geo.ti.o.t,
-            divideIntoFourParts=self.mesh.ti.structured,
+            self.geo.terminals.outer.r,
+            self.geo.terminals.outer.thickness,
+            divideIntoFourParts=self.mesh.terminals.structured,
         )
         innerTerminalSurf = innerTerminalSurface(
-            self.geo.ti.i.r,
-            self.geo.ti.i.t,
-            divideIntoFourParts=self.mesh.ti.structured,
+            self.geo.terminals.inner.r,
+            self.geo.terminals.inner.thickness,
+            divideIntoFourParts=self.mesh.terminals.structured,
         )
         innerAirSurf = innerAirSurface(
-            self.geo.ti.i.r,
-            divideIntoFourParts=self.mesh.ai.structured,
-            divideTerminalPartIntoFourParts=self.mesh.ti.structured,
+            self.geo.terminals.inner.r,
+            divideIntoFourParts=self.mesh.air.structured,
+            divideTerminalPartIntoFourParts=self.mesh.terminals.structured,
         )
 
         if self.contactSurfaces:
@@ -3380,8 +3575,8 @@ class pancakeCoilsWithAir:
             # Create outer air:
             outerAirPSDimTags = self.contactSurfaces[self.outerAirTubeVolume]
             outerAirPSTags = [dimTag[1] for dimTag in outerAirPSDimTags]
-            if self.geo.ai.shellTransformation:
-                if self.geo.ai.type == "cuboid":
+            if self.geo.air.shellTransformation:
+                if self.geo.air.type == "cuboid":
                     cuboidShellDimTags1 = self.contactSurfaces[self.airShellVolumePart1]
                     cuboidShellTags1 = [dimTag[1] for dimTag in cuboidShellDimTags1]
                     cuboidShellDimTags2 = self.contactSurfaces[self.airShellVolumePart2]
@@ -3397,7 +3592,7 @@ class pancakeCoilsWithAir:
                         cuboidShellTags3=cuboidShellTags3,
                         cuboidShellTags4=cuboidShellTags4,
                     )
-                elif self.geo.ai.type == "cylinder":
+                elif self.geo.air.type == "cylinder":
                     cylinderShellDimTags = self.contactSurfaces[self.airShellVolume]
                     cylinderShellTags = [dimTag[1] for dimTag in cylinderShellDimTags]
                     outerAirSurf.setPrecreatedSurfaceTags(
@@ -3462,18 +3657,18 @@ class pancakeCoilsWithAir:
             # If self.contactSurfaces is empty, it means that it is the first pancake
             # coil. In that case, the surfaces should be created from scratch.
 
-            if self.geo.ai.shellTransformation:
-                if self.geo.ai.type == "cuboid":
+            if self.geo.air.shellTransformation:
+                if self.geo.air.type == "cuboid":
                     outerAirSurf.createFromScratch(
                         z,
                         shellTransformation=True,
-                        shellRadius=self.geo.ai.shellSideLength / 2,
+                        shellRadius=self.geo.air.shellSideLength / 2,
                     )
                 else:
                     outerAirSurf.createFromScratch(
                         z,
                         shellTransformation=True,
-                        shellRadius=self.geo.ai.shellOuterRadius,
+                        shellRadius=self.geo.air.shellOuterRadius,
                     )
             else:
                 outerAirSurf.createFromScratch(z)
@@ -3488,35 +3683,35 @@ class pancakeCoilsWithAir:
 
         # Save the surface tags:
         fundamentalSurfaces[self.outerAirTubeVolume] = [
-            (2, tag) for tag in outerAirSurf.surfaceTags
+           (2, tag) for tag in outerAirSurf.surfaceTags
         ]
 
         fundamentalSurfaces[self.centerAirCylinderVolume] = [
-            (2, tag) for tag in innerAirSurf.surfaceTags
+           (2, tag) for tag in innerAirSurf.surfaceTags
         ]
 
         fundamentalSurfaces[self.outerTerminalTubeVolume] = [
-            (2, tag) for tag in outerTerminalSurf.tubeSurfaceTags
+           (2, tag) for tag in outerTerminalSurf.tubeSurfaceTags
         ]
         fundamentalSurfaces[self.outerTerminalTouchingVolume] = [
-            (2, tag) for tag in outerTerminalSurf.nontubeSurfaceTags
+           (2, tag) for tag in outerTerminalSurf.nontubeSurfaceTags
         ]
 
         fundamentalSurfaces[self.innerTerminalTubeVolume] = [
-            (2, tag) for tag in innerTerminalSurf.tubeSurfaceTags
+           (2, tag) for tag in innerTerminalSurf.tubeSurfaceTags
         ]
         fundamentalSurfaces[self.innerTerminalTouchingVolume] = [
-            (2, tag) for tag in innerTerminalSurf.nontubeSurfaceTags
+           (2, tag) for tag in innerTerminalSurf.nontubeSurfaceTags
         ]
         fundamentalSurfaces[self.innerTransitionNotchVolume] = [
-            (2, tag) for tag in surface.innerNotchSurfaceTags
+           (2, tag) for tag in surface.innerNotchSurfaceTags
         ]
         fundamentalSurfaces[self.outerTransitionNotchVolume] = [
-            (2, tag) for tag in surface.outerNotchSurfaceTags
+           (2, tag) for tag in surface.outerNotchSurfaceTags
         ]
 
-        if self.geo.ai.shellTransformation:
-            if self.geo.ai.type == "cuboid":
+        if self.geo.air.shellTransformation:
+            if self.geo.air.type == "cuboid":
                 fundamentalSurfaces[self.airShellVolumePart1] = [
                     (2, tag) for tag in outerAirSurf.shellTagsPart1
                 ]
@@ -3529,10 +3724,17 @@ class pancakeCoilsWithAir:
                 fundamentalSurfaces[self.airShellVolumePart4] = [
                     (2, tag) for tag in outerAirSurf.shellTagsPart4
                 ]
-            elif self.geo.ai.type == "cylinder":
+            elif self.geo.air.type == "cylinder":
                 fundamentalSurfaces[self.airShellVolume] = [
                     (2, tag) for tag in outerAirSurf.shellTags
                 ]
+        # windingSurfaces = {}
+        # # Save only the winding surface tags:
+        # windingSurfaces[self.individualWinding[self.pancakeIndex]] = [
+        #     (2, tag) for tag in surface.surfaceTags
+        # ]
+        # fundamentalSurfaces = windingSurfaces
+        # print(fundamentalSurfaces)
 
         return fundamentalSurfaces
 
@@ -3550,7 +3752,7 @@ class pancakeCoilsWithAir:
         returns the extrusion's top surfaces as a dictionary again, where the keys are
         the corresponding dimTagsObjects and the values are the dimTags of the surfaces.
 
-        If tZ is not given, then it is set to the gap height (self.geo.gap). This is the
+        If tZ is not given, then it is set to the gap height (self.geo.gapBetweenPancakes). This is the
         default value used for connecting the pancake coils. Only for the creation of
         the first and the last pancake coils different tZ values are used.
 
@@ -3577,7 +3779,7 @@ class pancakeCoilsWithAir:
         bottomPart = False
         topPart = False
         if tZ is None:
-            tZ = self.geo.gap
+            tZ = self.geo.gapBetweenPancakes
         elif tZ < 0:
             bottomPart = True
         elif tZ > 0:
@@ -3730,7 +3932,7 @@ class pancakeCoilsWithAir:
 
     def extrudeWindingPart(self):
         """
-        Extrudes all the fundamental surfaces of the pancake coil by self.geo.wi.h and
+        Extrudes all the fundamental surfaces of the pancake coil by self.geo.winding.height and
         returns the next connection terminal's top surface dimTag, and other air dimTags
         in a dictionary so that they can be further extruded.
 
@@ -3749,7 +3951,7 @@ class pancakeCoilsWithAir:
 
         # Extrude the fundamental surfaces:
         extrusionResult = dimTags()
-        extrusionResult.add(gmsh.model.occ.extrude(listOfDimTags, 0, 0, self.geo.wi.h))
+        extrusionResult.add(gmsh.model.occ.extrude(listOfDimTags, 0, 0, self.geo.winding.height))
 
         # Add the created volumes to the corresponding dimTags objects:
         volumes = extrusionResult.getDimTags(3)
@@ -3760,23 +3962,23 @@ class pancakeCoilsWithAir:
             # Note the first pancake (sometimes useful for creating regions in the
             # meshing part):
             for i, volumeDimTag in enumerate(volumes):
-                if listOfDimTagsObjects[i].parentName == self.geo.ti.o.name:
+                if listOfDimTagsObjects[i].parentName == self.geo.terminals.outer.name:
                     self.firstTerminalVolume.add(volumeDimTag)
 
         # Not elif! Because the first pancake coil is also the last pancake coil if
         # there is only one pancake coil.
-        if self.pancakeIndex == self.geo.N - 1:
+        if self.pancakeIndex == self.geo.numberOfPancakes - 1:
             # Note the last pancake (sometimes useful for creating regions in the
             # meshing part):
             for i, volumeDimTag in enumerate(volumes):
                 if (
                     self.pancakeIndex % 2 == 1
-                    and listOfDimTagsObjects[i].parentName == self.geo.ti.o.name
+                    and listOfDimTagsObjects[i].parentName == self.geo.terminals.outer.name
                 ):
                     self.lastTerminalVolume.add(volumeDimTag)
                 elif (
                     self.pancakeIndex % 2 == 0
-                    and listOfDimTagsObjects[i].parentName == self.geo.ti.i.name
+                    and listOfDimTagsObjects[i].parentName == self.geo.terminals.inner.name
                 ):
                     self.lastTerminalVolume.add(volumeDimTag)
 
@@ -3819,11 +4021,11 @@ class pancakeCoilsWithAir:
         dummyAir = gmsh.model.occ.addCylinder(
             0,
             0,
-            -self.geo.ai.h / 2,
+            -self.geo.air.h / 2,
             0,
             0,
-            self.geo.ai.h,
-            self.geo.ti.o.r,
+            self.geo.air.h,
+            self.geo.terminals.outer.r,
         )
 
         toBeDeletedDimTags = []
@@ -3903,7 +4105,7 @@ class Geometry(Base):
 
         # Start GMSH:
         self.gu = GmshUtils(self.geom_folder)
-        self.gu.initialize()
+        self.gu.initialize(verbosity_Gmsh=fdm.run.verbosity_Gmsh)
 
         # To speed up the GUI:
         gmsh.option.setNumber("Geometry.NumSubEdges", 10)
@@ -3911,21 +4113,18 @@ class Geometry(Base):
         # To see the surfaces in a better way in GUI:
         gmsh.option.setNumber("Geometry.SurfaceType", 1)
 
-        # Makes the gmsh.mode.occ.cut function faster:
-        gmsh.option.setNumber("Geometry.OCCParallel", 1)
-
         # To avoid any unwanted modifications to the geometry, the automatic fixing of
         # the geometry is disabled:
         gmsh.option.setNumber("Geometry.OCCAutoFix", 0)
 
         # Set the tolerance:
-        if self.geo.dimTol < gmsh.option.getNumber("Geometry.Tolerance"):
-            gmsh.option.setNumber("Geometry.Tolerance", self.geo.dimTol)
+        if self.geo.dimensionTolerance < gmsh.option.getNumber("Geometry.Tolerance"):
+            gmsh.option.setNumber("Geometry.Tolerance", self.geo.dimensionTolerance)
 
-        gmsh.option.setNumber("Geometry.ToleranceBoolean", self.geo.dimTol)
+        gmsh.option.setNumber("Geometry.ToleranceBoolean", self.geo.dimensionTolerance)
 
-        spiralCurve.sectionsPerTurn = self.geo.wi.spt
-        spiralCurve.curvesPerTurn = self.geo.wi.NofVolPerTurn
+        spiralCurve.sectionsPerTurn = self.geo.winding.spt
+        spiralCurve.curvesPerTurn = self.geo.winding.numberOfVolumesPerTurn
 
     def generate_geometry(self):
         """