Merge pull request #169 from OpenSEMBA/dev

Merge pull request #168 from OpenSEMBA/fix/bug-in-tags

Fix bug in tags

Author: adrianarce-elemwave

src_main_pub/preprocess_geom.F90

@@ -450,4 +450,17 @@ def testCanExecuteFDTDFromFolderWithSpacesAndCanProcessAdditionalArguments(tmp_p
     solver.run()
     assert (Probe(solver.getSolvedProbeFilenames("outside")[0]) is not None)
     assert (solver.getVTKMap()[0] is not None)
-    
+
+def testCanAssignSameSurfaceImpedanceToMultipleGeometries(tmp_path):
+    fn = CASES_FOLDER + 'multipleAssigments/multipleSurfaceImpedance.fdtd.json'
+
+    solver = FDTD(fn, path_to_exe=SEMBA_EXE, run_in_folder=tmp_path)
+    solver.run()
+    assert (Probe(solver.getSolvedProbeFilenames("BulkProbeEntry")[0]) is not None)
+
+def testCanAssignSameDielectricMaterialToMultipleGeometries(tmp_path):
+    fn = CASES_FOLDER + 'multipleAssigments/multipleDielectricMaterial.fdtd.json'
+
+    solver = FDTD(fn, path_to_exe=SEMBA_EXE, run_in_folder=tmp_path)
+    solver.run()
+    assert (Probe(solver.getSolvedProbeFilenames("BulkProbeEntry")[0]) is not None)

test/pyWrapper/test_full_system.py

@@ -50,7 +50,7 @@ TEST(smbjson, read_towelhanger)          { EXPECT_EQ(0, test_read_towelhanger())
 TEST(smbjson, read_holland1981)          { EXPECT_EQ(0, test_read_holland1981()); }
 TEST(smbjson, read_connectedwires)       { EXPECT_EQ(0, test_read_connectedwires()); }
 TEST(smbjson, read_currentinjection)     { EXPECT_EQ(0, test_read_currentinjection()); }
-// TEST(smbjson, read_shieldedpair)         { EXPECT_EQ(0, test_read_shieldedpair()); }
+TEST(smbjson, read_shieldedpair)         { EXPECT_EQ(0, test_read_shieldedpair()); }
 TEST(smbjson, read_mtln)                 { EXPECT_EQ(0, test_read_mtln()); }
 TEST(smbjson, read_large_airplane_mtln)  { EXPECT_EQ(0, test_read_large_airplane_mtln()); }
 #endif

test/smbjson/smbjson_tests.h

@@ -3,8 +3,7 @@ integer function test_read_shieldedpair() bind (C) result(err)
    use smbjson_testingTools
 
    implicit none
-
-   character(len=*),parameter :: filename = PATH_TO_TEST_DATA//INPUT_EXAMPLES//INPUT_EXAMPLES//'shieldedPair.fdtd.json'
+   character(len=*),parameter :: filename = PATH_TO_TEST_DATA//INPUT_EXAMPLES//'shieldedPair.fdtd.json'
    type(Parseador) :: problem, expected
    type(parser_t) :: parser
    logical :: areSame
@@ -73,7 +72,7 @@ function expectedProblemDescription() result (expected)
       expected%pecRegs%Surfs(1)%Ytrancos = 1
       expected%pecRegs%Surfs(1)%Ztrancos = 1
       expected%pecRegs%Surfs(1)%Or = 3
-      expected%pecRegs%Surfs(1)%tag =  trim(adjustl(" "))
+      expected%pecRegs%Surfs(1)%tag =  trim(adjustl("material5@layer5"))
 
       ! Expected sources.
       allocate(expected%plnSrc%collection(1))