Skip to content

Commit 840b529

Browse files
committed
Adds unshielded single wire test
1 parent a921bc7 commit 840b529

2 files changed

Lines changed: 33 additions & 11 deletions

File tree

src/ShapesClassification.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ def isOpenProblem(self) -> bool:
9090
return True
9191
if roots[0] in self.dielectrics.keys():
9292
return True
93+
if roots[0] in self.pecs.keys() and roots[0] not in self.nestedGraph.getParentNodes():
94+
return True
9395
return False
9496

9597
def removeConductorsFromDielectrics(self):

test/test_mesher.py

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,25 +149,25 @@ def test_mesh_dielectric_unshielded_pair(self) -> None:
149149
expectedEntities = [1, 1, 1, 1, 1, 1, 1]
150150

151151
Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
152-
152+
153153
gmsh.write(caseName + '.vtk')
154154
gmsh.write(caseName + '.msh')
155155

156156
self.assertPhysicalGroup(expectedNames, expectedEntities)
157157

158158
def test_mesh_dielectric_unshielded_pair_defined_boundary(self) -> None:
159159
caseName = 'DielectricUnshieldedPairDefinedBoundary'
160-
160+
161161
meshing_options = copy.deepcopy(Mesher.DEFAULT_MESHING_OPTIONS)
162162
meshing_options["Mesh.ElementOrder"] = 1
163-
163+
164164
Mesher().meshFromStep(
165-
self.inputFileFromCaseName(caseName),
165+
self.inputFileFromCaseName(caseName),
166166
caseName,
167167
meshingOptions=meshing_options)
168168

169169
gmsh.write(caseName + '.vtk')
170-
170+
171171
expectedNames = [
172172
'Conductor_0', 'Conductor_1',
173173
'Dielectric_0', 'Dielectric_1',
@@ -190,7 +190,7 @@ def test_mesh_from_step_with_five_wires(self):
190190
Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
191191

192192
gmsh.write(caseName + '.vtk')
193-
193+
194194
pGs = gmsh.model.getPhysicalGroups()
195195
pGNames = [gmsh.model.getPhysicalName(*pG) for pG in pGs]
196196
self.assertEqual(sorted(pGNames), sorted(expectedNames))
@@ -365,16 +365,35 @@ def test_lansink2024_single_wire_multipolar(self):
365365
self.assertEqual(self.countEntitiesInPhysicalGroupWithName(
366366
name), expectedEntities[idx], name)
367367

368+
def test_unshielded_single_wire(self):
369+
caseName = 'unshielded_single_wire'
370+
Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
371+
372+
expectedNames = [
373+
'Conductor_0',
374+
'OpenBoundary_0',
375+
'Vacuum_0', # Inner region
376+
'Vacuum_1' # Outer region
377+
]
378+
expectedEntities = [1, 1, 1, 1]
379+
380+
# For debugging.
381+
gmsh.write(caseName + '.vtk')
382+
gmsh.write(caseName + '.msh')
383+
# gmsh.fltk.run()
384+
385+
self.assertPhysicalGroup(expectedNames, expectedEntities)
386+
368387
def test_unshielded_nesting(self):
369388
caseName = 'UnshieldedNested'
370389
Mesher().meshFromStep(self.inputFileFromCaseName(caseName), caseName)
371-
372-
#gmsh.write(caseName + '.msh')
373-
#gmsh.write(caseName + '.vtk')
390+
391+
# gmsh.write(caseName + '.msh')
392+
# gmsh.write(caseName + '.vtk')
374393

375394
pGs = gmsh.model.getPhysicalGroups()
376395
pGNames = [gmsh.model.getPhysicalName(*pG) for pG in pGs]
377-
expectedNames = ['Conductor_0',
396+
expectedNames = ['Conductor_0',
378397
'Conductor_1',
379398
'Conductor_2',
380399
'OpenBoundary_0',
@@ -385,7 +404,8 @@ def test_unshielded_nesting(self):
385404
self.assertEqual(sorted(pGNames), sorted(expectedNames))
386405

387406
for idx, name in enumerate(expectedNames):
388-
self.assertEqual(self.countEntitiesInPhysicalGroupWithName(name), expectedEntities[idx], name)
407+
self.assertEqual(self.countEntitiesInPhysicalGroupWithName(
408+
name), expectedEntities[idx], name)
389409

390410

391411
if __name__ == '__main__':

0 commit comments

Comments
 (0)