Fixes tagnumber overwriting in edges

src_json_parser/smbjson.F90

@@ -493,6 +493,7 @@ subroutine appendRegion(resCoords, resNCoords, resNCoordsMax, cs)
             resNCoords = size(cs)
             resNCoordsMax = size(cs)
          else 
+            allocate(auxCs(size(resCoords)))
             do i = 1, size(resCoords)
                 auxCs(i) = resCoords(i)
             end do

test/pyWrapper/test_integration.py

@@ -62,8 +62,8 @@ def test_sphere_case_with_far_field_probe_launches(tmp_path):
     assert np.all(p.cell_init == np.array([2, 2, 2]))
 
 
-def test_sgbc_with_mapvtk_checking_tagnumbers(tmp_path):
-    fn = CASES_FOLDER + 'sgbc/sgbc.fdtd.json'
+def test_tagnumbers_3_surfaces(tmp_path):
+    fn = CASES_FOLDER + 'tagNumber_mediaType/three_surfaces.fdtd.json'
     solver = FDTD(input_filename=fn, path_to_exe=SEMBA_EXE,
                   run_in_folder=tmp_path, flags=['-mapvtk'])
     solver['general']['numberOfSteps'] = 1
@@ -74,7 +74,126 @@ def test_sgbc_with_mapvtk_checking_tagnumbers(tmp_path):
     vtkmapfile = solver.getVTKMap()
     assert os.path.isfile(vtkmapfile)
 
-    d = createFaceTagDictionary(vtkmapfile)
-    assert d[64] == 4
-    assert d[128] == 4
-    assert d[192] == 4
+    face_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'tagnumber')
+    assert face_tag_dict[64] == 4
+    assert face_tag_dict[128] == 4
+    assert face_tag_dict[192] == 4
+
+    line_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'tagnumber')
+    assert line_tag_dict[64] == 8
+    assert line_tag_dict[128] == 4
+    assert line_tag_dict[192] == 4
+
+    face_media_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'mediatype')
+    assert face_media_dict[0] == 4 #PEC surface
+    assert face_media_dict[304] == 4 #SGBC surface
+    assert face_media_dict[305] == 4 #SGBC surface
+
+    line_media_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'mediatype')
+    assert line_media_dict[0.5] == 8 #PEC line
+    assert line_media_dict[3.5] == 8 #SGBC line
+
+def test_tagnumbers_1_volume(tmp_path):
+    fn = CASES_FOLDER + 'tagNumber_mediaType/pec_volume.fdtd.json'
+    solver = FDTD(input_filename=fn, path_to_exe=SEMBA_EXE,
+                  run_in_folder=tmp_path, flags=['-mapvtk'])
+    solver['general']['numberOfSteps'] = 1
+
+    solver.run()
+    assert solver.hasFinishedSuccessfully() == True
+
+    vtkmapfile = solver.getVTKMap()
+    assert os.path.isfile(vtkmapfile)
+
+    face_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'tagnumber')
+    assert face_tag_dict[64] == 36
+
+    line_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'tagnumber')
+    assert len(line_tag_dict) == 0
+
+    face_media_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'mediatype')
+    assert face_media_dict[0] == 36 #PEC surface
+
+    line_media_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'mediatype')
+    assert len(line_media_dict) == 0
+
+def test_tagnumbers_2_volumes(tmp_path):
+    fn = CASES_FOLDER + 'tagNumber_mediaType/pec_volumes.fdtd.json'
+    solver = FDTD(input_filename=fn, path_to_exe=SEMBA_EXE,
+                  run_in_folder=tmp_path, flags=['-mapvtk'])
+    solver['general']['numberOfSteps'] = 1
+
+    solver.run()
+    assert solver.hasFinishedSuccessfully() == True
+
+    vtkmapfile = solver.getVTKMap()
+    assert os.path.isfile(vtkmapfile)
+
+    face_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'tagnumber')
+    assert face_tag_dict[64] == 36
+    assert face_tag_dict[128] == 36
+
+    line_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'tagnumber')
+    assert len(line_tag_dict) == 0
+
+    face_media_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'mediatype')
+    assert face_media_dict[0] == 72 #PEC surface
+
+    line_media_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'mediatype')
+    assert len(line_media_dict) == 0
+
+def test_tagnumbers_1_line(tmp_path):
+    fn = CASES_FOLDER + 'tagNumber_mediaType/pec_line.fdtd.json'
+    solver = FDTD(input_filename=fn, path_to_exe=SEMBA_EXE,
+                  run_in_folder=tmp_path, flags=['-mapvtk'])
+    solver['general']['numberOfSteps'] = 1
+
+    solver.run()
+    assert solver.hasFinishedSuccessfully() == True
+
+    vtkmapfile = solver.getVTKMap()
+    assert os.path.isfile(vtkmapfile)
+
+    face_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'tagnumber')
+    assert len(face_tag_dict) == 0
+
+    line_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'tagnumber')
+    assert line_tag_dict[64] == 2
+
+    face_media_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'mediatype')
+    assert len(face_media_dict) == 0
+
+    line_media_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'mediatype')
+    assert line_media_dict[0.5] == 2 #PEC line
+
+def test_tagnumbers_volume_and_surfacs(tmp_path):
+    fn = CASES_FOLDER + 'tagNumber_mediaType/volume_and_surfaces.fdtd.json'
+    solver = FDTD(input_filename=fn, path_to_exe=SEMBA_EXE,
+                  run_in_folder=tmp_path, flags=['-mapvtk'])
+    solver['general']['numberOfSteps'] = 1
+
+    solver.run()
+    assert solver.hasFinishedSuccessfully() == True
+
+    vtkmapfile = solver.getVTKMap()
+    assert os.path.isfile(vtkmapfile)
+
+    face_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'tagnumber')
+    assert face_tag_dict[64] == 6
+    assert face_tag_dict[128] == 1
+    assert face_tag_dict[192] == 1
+
+    line_tag_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'tagnumber')
+    assert line_tag_dict[64] == 1
+    assert line_tag_dict[128] == 4
+    assert line_tag_dict[192] == 3
+
+    face_media_dict = createPropertyDictionary(vtkmapfile, celltype = 9, property = 'mediatype')
+    assert face_media_dict[-1] == 1 #PEC surface
+    assert face_media_dict[0] == 6 #PEC surface
+    assert face_media_dict[305] == 1 #SGBC surface
+
+    line_media_dict = createPropertyDictionary(vtkmapfile, celltype = 3, property = 'mediatype')
+    assert line_media_dict[-0.5] == 4 #PMC line
+    assert line_media_dict[0.5] == 1 #PEC line
+    assert line_media_dict[3.5] == 3 #SGBC line

test/pyWrapper/utils.py

@@ -92,15 +92,18 @@ def readSpiceFile(spice_file):
     return t, val
 
 
-def createFaceTagDictionary(vtkfile):
+def createPropertyDictionary(vtkfile, celltype:int, property:str):
     ugrid = pv.UnstructuredGrid(vtkfile)
-    quads = np.argwhere(ugrid.celltypes == 9)  # [i][0]
-    tags = np.array([])
-    tagnumber_array = ugrid.cell_data['tagnumber']
-    for i in range(quads[0][0], quads[-1][0]+1):
-        tags = np.append(tags, tagnumber_array[i])
-
-    unique, counts = np.unique(tags, return_counts=True)
+    objs = np.argwhere(ugrid.celltypes == celltype)  # [i][0]
+    if len(objs) == 0:
+        return dict()
+
+    props = np.array([])
+    prop_array = ugrid.cell_data[property]
+    for i in range(objs[0][0], objs[-1][0]+1):
+        props = np.append(props, prop_array[i])
+
+    unique, counts = np.unique(props, return_counts=True)
     return dict(zip(unique, counts))
 
 

testData/cases/tagNumber_mediaType/pec_line.fdtd.json

@@ -0,0 +1,37 @@
+{
+    "format": "FDTD Input file",
+    "__comments": "Example input with sgbc material",
+
+    "general": {
+        "timeStep": 10e-12,
+        "numberOfSteps": 2000
+    },
+
+    "boundary": {
+        "all": {"type": "mur"}
+    },
+
+    "mesh": {
+        "grid": {
+            "numberOfCells": [10, 10, 10],
+            "steps": { "x": [0.1], "y": [0.1], "z": [0.1] }
+        },
+        "elements": [
+            {"id": 1, "type": "cell", "intervals": [ [ [3, 3, 3], [3, 3, 5] ] ]}
+        ]
+    },
+
+    "materials": [
+        {
+            "type": "pec",
+            "id": 1
+        }
+    ],
+
+    "materialAssociations": [
+        {
+            "materialId": 1,
+            "elementIds": [ 1 ]
+        }
+    ]
+}

testData/cases/tagNumber_mediaType/pec_volume.fdtd.json

@@ -0,0 +1,37 @@
+{
+    "format": "FDTD Input file",
+    "__comments": "Example input with sgbc material",
+
+    "general": {
+        "timeStep": 10e-12,
+        "numberOfSteps": 2000
+    },
+
+    "boundary": {
+        "all": {"type": "mur"}
+    },
+
+    "mesh": {
+        "grid": {
+            "numberOfCells": [10, 10, 10],
+            "steps": { "x": [0.1], "y": [0.1], "z": [0.1] }
+        },
+        "elements": [
+            {"id": 1, "type": "cell", "intervals": [ [ [3, 3, 3], [5, 5, 5] ] ]}
+        ]
+    },
+
+    "materials": [
+        {
+            "type": "pec",
+            "id": 1
+        }
+    ],
+
+    "materialAssociations": [
+        {
+            "materialId": 1,
+            "elementIds": [ 1 ]
+        }
+    ]
+}

testData/cases/tagNumber_mediaType/pec_volumes.fdtd.json

@@ -0,0 +1,42 @@
+{
+    "format": "FDTD Input file",
+    "__comments": "Example input with sgbc material",
+
+    "general": {
+        "timeStep": 10e-12,
+        "numberOfSteps": 2000
+    },
+
+    "boundary": {
+        "all": {"type": "mur"}
+    },
+
+    "mesh": {
+        "grid": {
+            "numberOfCells": [10, 10, 10],
+            "steps": { "x": [0.1], "y": [0.1], "z": [0.1] }
+        },
+        "elements": [
+            {"id": 1, "type": "cell", "intervals": [ [ [3, 3, 3], [5, 5, 5] ] ]},
+            {"id": 2, "type": "cell", "intervals": [ [ [6, 6, 6], [8, 8, 8] ] ]}
+        ]
+    },
+
+    "materials": [
+        {
+            "type": "pec",
+            "id": 1
+        }
+    ],
+
+    "materialAssociations": [
+        {
+            "materialId": 1,
+            "elementIds": [ 1 ]
+        },
+        {
+            "materialId": 1,
+            "elementIds": [ 2 ]
+        }
+    ]
+}

testData/cases/tagNumber_mediaType/volume_and_surfaces.fdtd.json

@@ -0,0 +1,60 @@
+{
+    "format": "FDTD Input file",
+    "__comments": "Example input with sgbc material",
+
+    "general": {
+        "timeStep": 10e-12,
+        "numberOfSteps": 2000
+    },
+
+    "boundary": {
+        "all": {"type": "mur"}
+    },
+
+    "mesh": {
+        "grid": {
+            "numberOfCells": [10, 10, 10],
+            "steps": { "x": [0.1], "y": [0.1], "z": [0.1] }
+        },
+        "elements": [
+            {"id": 1, "type": "cell", "intervals": [ [ [5, 4, 4], [6, 5, 4] ] ]},
+            {"id": 2, "type": "cell", "intervals": [ [ [4, 4, 4], [5, 5, 5] ] ]},
+            {"id": 3, "type": "cell", "intervals": [ [ [4, 5, 4], [5, 6, 4] ] ]}
+        ]
+    },
+
+    "materials": [
+        {
+            "type": "pmc",
+            "id": 1
+        },
+        {
+            "type": "pec",
+            "id": 2
+        },
+        {
+            "name": "2-layers-composite",
+            "type": "multilayeredSurface",
+            "id": 3,
+            "layers": [
+                {"thickness": 1e-3, "relativePermittivity": 1.3, "electricConductivity": 2e-4},
+                {"thickness": 5e-3, "relativePermittivity": 1.3}
+            ]
+        }
+    ],
+
+    "materialAssociations": [
+        {
+            "materialId": 1,
+            "elementIds": [ 1 ]
+        },
+        {
+            "materialId": 2,
+            "elementIds": [ 2 ]
+        },
+        {
+            "materialId": 3,
+            "elementIds": [ 3 ]
+        }
+    ]
+}