Add label to exported json

Author: adrianarce-elemwave

src/AreaExporterService.py

@@ -11,26 +11,31 @@ def __init__(self):
             "geometries": []
         }
 
-    def addComputedArea(self, geometry:str, area:float):
+    def addComputedArea(self, geometry:str, label:str, area:float):
         geometry:Dict ={
             "geometry": geometry,
-            "area": area,
+            "label": label,
+            "area": round(area,6),
         }
         self.computedAreas['geometries'].append(geometry)
 
-    def addPhysicalModelOfDimension(self, dimension=2):
+    def addPhysicalModelOfDimension(self, mappedElements:Dict[str,str],  dimension=2):
         physicalGroups = gmsh.model.getPhysicalGroups(dimension)
         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, area)
+                    self.addComputedArea(geometryName, label, area)
 
     def exportToJson(self, exportFileName:str):
         with open(exportFileName + ".areas.json", 'w') as f:

test/test_AreaExporterService.py

@@ -23,15 +23,15 @@ def setUp(self):
 
     def tearDown(self):
         gmsh.finalize()
-    def inputFileFromCaseName(self, caseName):
+    def inputFileFromCaseName(self, caseName) -> None:
         return self.testdataPath + caseName + '/' + caseName + ".step"
 
     def testAreaExporterReturnsTrueValues(self):
         caseName = 'five_wires'
-        Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
+        mappedElements = Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
         areaExporter = AreaExporterService()
-        areaExporter.addPhysicalModelOfDimension(dimension=1)
-        areaExporter.addPhysicalModelOfDimension(dimension=2)
+        areaExporter.addPhysicalModelOfDimension(mappedElements=mappedElements, dimension=1)
+        areaExporter.addPhysicalModelOfDimension(mappedElements=mappedElements, dimension=2)
         geometries = areaExporter.computedAreas['geometries']
 
         internalElements = []
@@ -43,3 +43,51 @@ def testAreaExporterReturnsTrueValues(self):
         areaElements = self.sumAreasFromList(internalElements)
 
         self.assertAlmostEqual(totalArea, areaElements)
+
+    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)
+
+        expectedDict = {
+            'geometries': [
+                {
+                    'area': 201.06193,
+                    'geometry': 'Conductor_1',
+                    'label': 'RightConductor'
+                },
+                {
+                    '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'
+                }
+            ]
+        }
+        self.maxDiff = None
+        self.assertDictEqual(areaExporter.computedAreas, expectedDict)