[WIP] Ensuring conductor areas are computed correctly

Author: lmdiazangulo

.gitignore

@@ -1,10 +1,12 @@
 *.FCStd1
 *.pyc
-*.msh
 .vscode/
 .pytest_cache/
 .idea/
 tmpFolder/
 venv/
 gmshDoc/
+
+*.msh
 *.vtk
+*.areas.json

src/AreaExporterService.py

@@ -19,23 +19,28 @@ def addComputedArea(self, geometry:str, label:str, area:float):
         }
         self.computedAreas['geometries'].append(geometry)
 
-    def addPhysicalModelOfDimension(self, mappedElements:Dict[str,str],  dimension=2):
-        physicalGroups = gmsh.model.getPhysicalGroups(dimension)
+    def addPhysicalModelForConductors(self, mappedElements:Dict[str,str]):
+        physicalGroups = gmsh.model.getPhysicalGroups(1)
         for physicalGroup in physicalGroups:
             entityTags = gmsh.model.getEntitiesForPhysicalGroup(*physicalGroup)
             geometryName = gmsh.model.getPhysicalName(*physicalGroup)
-            label = ''
-            for key, geometry in mappedElements.items():
-                if geometry == geometryName:
-                    label = key
-            for tag in entityTags:
-                if dimension == 1:
-                    rad = gmsh.model.occ.getMass(dimension, tag) / (2*np.pi)
-                    area = rad*rad*np.pi
-                if dimension == 2:
-                    area = gmsh.model.occ.getMass(dimension, tag)
-                if geometryName != AreaExporterService._EMPTY_NAME_CASE:
-                    self.addComputedArea(geometryName, label, area)
+            if geometryName.startswith("Conductor_"):
+                label = ''
+                for key, geometry in mappedElements.items():
+                    if geometry == geometryName:
+                        label = key
+                        break
+                
+                    assert len(entityTags) == 1
+                    loop = gmsh.model.geo.addCurveLoop(entityTags)
+                    surface = gmsh.model.geo.addPlaneSurface([loop])
+
+                    gmsh.model.geo.synchronize()
+
+                    area = gmsh.model.occ.getMass(2, surface)
+                    gmsh.model.occ.remove([(2, surface)])
+                    if geometryName != AreaExporterService._EMPTY_NAME_CASE:
+                        self.addComputedArea(geometryName, label, area)
 
     def exportToJson(self, exportFileName:str):
         with open(exportFileName + ".areas.json", 'w') as f:

src/ShapesClassification.py

@@ -40,7 +40,8 @@ def getNumberFromName(entity_name: str, label: str):
         num = int(entity_name[ini:])
         return num
 
-    def get_entities_by_material_type(self, entity_tags, material_type: str, entity_dim: int = 2) -> Dict[str, List[Tuple[int,int]]]:
+    def get_entities_by_material_type(self, entity_tags, material_type: str, entity_dim: int = 2) \
+        -> Dict[str, List[Tuple[int,int]]]:
         """
         Generic method to extract entities by material type from the cross-section data.
         

test/test_AreaExporterService.py

@@ -30,8 +30,7 @@ def testAreaExporterReturnsTrueValues(self):
         caseName = 'five_wires'
         mappedElements = Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
         areaExporter = AreaExporterService()
-        areaExporter.addPhysicalModelOfDimension(mappedElements=mappedElements, dimension=1)
-        areaExporter.addPhysicalModelOfDimension(mappedElements=mappedElements, dimension=2)
+        areaExporter.addPhysicalModelForConductors(mappedElements=mappedElements)
         geometries = areaExporter.computedAreas['geometries']
 
         internalElements = []
@@ -48,9 +47,8 @@ def testJsonFormat(self) -> None:
         caseName = 'DielectricUnshieldedPair'
         mappedElements = Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
         areaExporter = AreaExporterService()
-        areaExporter.addPhysicalModelOfDimension(mappedElements=mappedElements, dimension=1)
-        areaExporter.addPhysicalModelOfDimension(mappedElements=mappedElements, dimension=2)
-
+        areaExporter.addPhysicalModelForConductors(mappedElements=mappedElements)
+        
         expectedDict = {
             'geometries': [
                 {
@@ -61,32 +59,8 @@ def testJsonFormat(self) -> None:
                 {
                     'area': 201.06193,
                     'geometry': 'Conductor_0',
-                    'label': 'LeftConductor'},
-                {
-                    'area': 312048.117187,
-                    'geometry': 'OpenBoundary_0',
-                    'label': 'OpenBoundary_0'
-                },
-                {
-                    'area': 603.185789,
-                    'geometry': 'Dielectric_1',
-                    'label': 'RightDielectric'
-                },
-                {
-                    'area': 603.185789,
-                    'geometry': 'Dielectric_0',
-                    'label': 'LeftDielectric'
-                },
-                {
-                    'area': 6491.504606,
-                    'geometry': 'Vacuum_0',
-                    'label': 'Vacuum_0'
-                },
-                {
-                    'area': 303948.117142,
-                    'geometry': 'Vacuum_1',
-                    'label': 'Vacuum_1'
-                }
+                    'label': 'LeftConductor'
+                }            
             ]
         }
         self.maxDiff = None

test/test_mesher.py

@@ -140,7 +140,7 @@ def test_mesh_from_step_with_two_wires_open(self):
             self.assertEqual(self.countEntitiesInPhysicalGroupWithName(
                 name), expectedEntities[idx], name)
 
-    def test_mesh_dielectric_pair_open(self) -> None:
+    def test_mesh_dielectric_unshielded_pair(self) -> None:
         caseName = 'DielectricUnshieldedPair'
         expectedNames = [
             'Conductor_0', 'Conductor_1',
@@ -149,11 +149,13 @@ def test_mesh_dielectric_pair_open(self) -> None:
         expectedEntities = [1, 1, 1, 1, 1, 1, 1]
 
         Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
-       # gmsh.write(caseName + '.vtk')
+        
+        gmsh.write(caseName + '.vtk')
+        gmsh.write(caseName + '.msh')
 
         self.assertPhysicalGroup(expectedNames, expectedEntities)
 
-    def test_mesh_dielectric_pair_open_defined_boundary(self) -> None:
+    def test_mesh_dielectric_unshielded_pair_defined_boundary(self) -> None:
         caseName = 'DielectricUnshieldedPairDefinedBoundary'
 
         meshing_options = copy.deepcopy(Mesher.DEFAULT_MESHING_OPTIONS)