Change ShapeClassification to check for json data

Author: adrianarce-elemwave

src/ShapesClassification.py

@@ -1,3 +1,5 @@
+from enum import Enum
+import json
 from typing import Any, Tuple, List, Dict
 
 import gmsh
@@ -7,55 +9,85 @@
 
 class ShapesClassification:
     isOpenCase:bool
+    crossSectionData: Dict
+    pecs: Dict
+    dielectrics: Dict
 
 
-    def __init__(self, shapes):
+    def __init__(self, shapes, jsonFile:str):
         gmsh.model.occ.synchronize()
 
         self.allShapes = shapes
-        self.pecs = self.get_surfaces_with_label(shapes, "Conductor_")
-        self.dielectrics = self.get_surfaces_with_label(shapes, "Dielectric_")
-        self.open = self.get_surfaces_with_label(shapes, "OpenBoundary_")
+        with open(jsonFile) as f:
+            jsonData = json.load(f)
+        self.crossSectionData = jsonData['CrossSection']
+        self.pecs = self.get_pecs(shapes)
+        self.dielectrics = self.get_dielectrics(shapes)
+        self.shieldReference = dict()
         self.vacuum = dict()
 
         self.isOpenCase = self.isOpenProblem()
 
-        if len(self.open) > 1:
-            raise ValueError("Only one open region is allowed.")
 
     @staticmethod
     def getNumberFromName(entity_name: str, label: str):
         ini = entity_name.rindex(label) + len(label)
         num = int(entity_name[ini:])
         return num
 
-    @staticmethod
-    def get_surfaces_with_label(entity_tags, label: str):
-        surfaces = dict()
+    def get_pecs(self, entity_tags):
+        pecNames = self.__getGeometryNamesByMaterialType('PEC')
+        pecs = dict()
         for s in entity_tags:
-            name = gmsh.model.get_entity_name(*s)
-            if s[0] != 2 or label not in name:
+            name = gmsh.model.get_entity_name(*s).split('/')[-1]
+            if s[0] != 2 or name not in pecNames:
                 continue
-            num = ShapesClassification.getNumberFromName(name, label)
-            surfaces[num] = [s]
+            pecs[name] = [s]
 
-        return surfaces
+        return pecs
+    
+    def get_dielectrics(self, entity_tags):
+        dielectricNames = self.__getGeometryNamesByMaterialType('Dielectric')
+        dielectrics = dict()
+        for s in entity_tags:
+            name = gmsh.model.get_entity_name(*s).split('/')[-1]
+            if s[0] != 2 or name not in dielectricNames:
+                continue
+            dielectrics[name] = [s]
+
+        return dielectrics
+    
+    def __getGeometryNamesByMaterialType(self, materialType:str) -> List[str]:
+        names = [
+            geometry['name'] 
+            for geometry in self.crossSectionData 
+            if geometry['material']['type'] == materialType
+        ]
+        return names
 
     def isOpenProblem(self):
         elements = list(chain(self.pecs.values()))
+        isOpenCase = True
         for idx, element in enumerate(elements):
-            for otheridx, otherElement in enumerate(elements[idx+1:]):
+            intersectWithAll = True
+            intersect = []
+            for otheridx, otherElement in enumerate(elements):
                 if element != otherElement:
                     intersect = gmsh.model.occ.intersect(
                         element, 
                         otherElement,
                         removeObject=False,
                         tag=300+otheridx,
                         removeTool=False
-                    )[0]
-                    if intersect:
-                        return False   
-        return True
+                    )[0]    
+                if len(intersect) == 0:
+                    intersectWithAll = False
+                else:
+                    isOpenCase = False
+            if intersectWithAll:
+                print(element, otherElement)
+                self.shieldReference = {list(self.pecs.keys())[idx] : element}
+        return isOpenCase
 
     def removeConductorsFromDielectrics(self):
         for num, diel in self.dielectrics.items():

src/mesher.py

@@ -46,7 +46,8 @@ def meshFromStep(self, inputFile: str, caseName: str, meshingOptions=None):
 
         gmsh.model.add(caseName)
         allShapes = ShapesClassification(
-            gmsh.model.occ.importShapes(inputFile, highestDimOnly=False)
+            gmsh.model.occ.importShapes(inputFile, highestDimOnly=False),
+            inputFile.strip('.step') + '.json'
         )
 
         # --- Geometry manipulation ---

test/test_ShapesClassification.py

@@ -0,0 +1,86 @@
+import os
+import unittest
+import gmsh
+import json
+
+from src.ShapesClassification import ShapesClassification
+
+
+class TestShapesClassification(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.dirPath = os.path.dirname(os.path.realpath(__file__)) + '/'
+        cls.testdataPath = cls.dirPath + '/../testData/'
+    
+    @classmethod
+    def tearDownClass(cls):
+        del cls.dirPath
+        del cls.testdataPath
+
+    def setUp(self):
+        gmsh.initialize()
+
+    def tearDown(self):
+        gmsh.finalize()
+
+    def inputFileFromCaseName(self, caseName):
+        return self.testdataPath + caseName + '/' + caseName + ".step"
+
+    def initShapeClassification(self, inputFile:str) -> None:
+        jsonFile = inputFile.strip('.step') + '.json'
+        self.shapeClassification = ShapesClassification(
+            gmsh.model.occ.importShapes(inputFile, highestDimOnly=False),
+            jsonFile
+        )
+
+    def testDielectricShieldedPairClassification(self) -> None:
+        case = 'DielectricShieldedPair'
+        filepath = self.inputFileFromCaseName(case)
+        self.initShapeClassification(filepath)
+        expectedShapes = [
+            (2, 1),(2, 2),(2, 3),(2, 4),(2, 5),
+            (1, 1),(1, 2),(1, 3),(1, 4),(1, 5),
+            (0, 1),(0, 1),(0, 2),(0, 2),(0, 3),(0, 3),(0, 4),(0, 4),(0, 5),(0, 5)
+        ]
+        expectedPecs = {
+            'RightConductor': [(2,1)],
+            'ExternalShield': [(2,2)],
+            'LeftConductor': [(2,3)],
+        }
+        expectedDielectrics = {
+            'RightDielectric': [(2,4)],
+            'LeftDielectric': [(2,5)],
+        }
+        expectedShieldReference = {
+            'ExternalShield': [(2,2)],
+        }
+        self.assertListEqual(self.shapeClassification.allShapes, expectedShapes)
+        self.assertDictEqual(self.shapeClassification.pecs, expectedPecs)
+        self.assertDictEqual(self.shapeClassification.dielectrics, expectedDielectrics)
+        self.assertDictEqual(self.shapeClassification.shieldReference, expectedShieldReference)
+        self.assertFalse(self.shapeClassification.isOpenCase)
+
+    def testDielectricUnshieldedPairClassification(self) -> None:
+        case = 'DielectricUnshieldedPair'
+        filepath = self.inputFileFromCaseName(case)
+        self.initShapeClassification(filepath)
+        expectedShapes = [
+            (2, 1),(2, 2),(2, 3),(2, 4),
+            (1, 1),(1, 2),(1, 3),(1, 4),
+            (0, 1),(0, 1),(0, 2),(0, 2),(0, 3),(0, 3),(0, 4),(0, 4),
+        ]
+        expectedPecs = {
+            'RightConductor': [(2,1)],
+            'LeftConductor': [(2,2)],
+        }
+        expectedDielectrics = {
+            'RightDielectric': [(2,3)],
+            'LeftDielectric': [(2,4)],
+        }
+        expectedShieldReference = {}
+        self.assertListEqual(self.shapeClassification.allShapes, expectedShapes)
+        self.assertDictEqual(self.shapeClassification.pecs, expectedPecs)
+        self.assertDictEqual(self.shapeClassification.dielectrics, expectedDielectrics)
+        self.assertDictEqual(self.shapeClassification.shieldReference, expectedShieldReference)
+        self.assertTrue(self.shapeClassification.isOpenCase)

test/test_mesher.py

@@ -19,6 +19,11 @@ def setUpClass(cls):
         cls.dirPath = os.path.dirname(os.path.realpath(__file__)) + '/'
         cls.testdataPath = cls.dirPath + '/../testData/'
 
+    @classmethod
+    def tearDownClass(cls):
+        del cls.dirPath
+        del cls.testdataPath
+
     def setUp(self):
         gmsh.initialize()
 

testData/DielectricShieldedPair/DielectricShieldedPair.20250930-134420.FCBak

@@ -0,0 +1,36 @@
+{
+    "CrossSection":[
+        {
+            "name":"ExternalShield",
+            "material":{
+                "type":"PEC"
+            }
+        },
+        {
+            "name":"RightConductor",
+            "material":{
+                "type":"PEC"
+            }
+        },
+        {
+            "name":"LeftConductor",
+            "material":{
+                "type":"PEC"
+            }
+        },
+        {
+            "name":"LeftDielectric",
+            "material":{
+                "type":"Dielectric",
+                "permittivity": 2.0
+            }
+        },
+        {
+            "name":"RightDielectric",
+            "material":{
+                "type":"Dielectric",
+                "permittivity":2.0
+            }
+        }
+    ]
+}