Removes type in materialAssociations

OpenSEMBA · Dec 30, 2024 · a55c1f7 · a55c1f7
1 parent 0876369
commit a55c1f7
Show file tree

Hide file tree

Showing 28 changed files with 67 additions and 143 deletions.
diff --git a/testData/cases/coated_antenna/coated_antenna.fdtd.json b/testData/cases/coated_antenna/coated_antenna.fdtd.json
@@ -64,16 +64,14 @@
 
     "materialAssociations": [
         { 
-            "type": "cable",
-            "name" : "half_1",
+                        "name" : "half_1",
             "materialId": 1,
             "initialTerminalId": 2,
             "endTerminalId": 3,
             "elementIds": [2]
         },
         { 
-            "type": "cable",
-            "name" : "half_2",
+                        "name" : "half_2",
             "materialId": 1,
             "initialTerminalId": 3,
             "endTerminalId": 2,

diff --git a/testData/cases/holland/holland1981.fdtd.json b/testData/cases/holland/holland1981.fdtd.json
@@ -52,8 +52,7 @@
 
     "materialAssociations": [
         { 
-            "type": "cable",
-            "name" : "single_wire",
+                        "name" : "single_wire",
             "materialId": 1,
             "initialTerminalId": 2,
             "endTerminalId": 2,

diff --git a/testData/cases/holland_with_dielectric.fdtd.json b/testData/cases/holland_with_dielectric.fdtd.json
@@ -53,7 +53,6 @@
 
     "materialAssociations": [
         { 
-            "type": "cable",
             "name" : "single_wire",
             "materialId": 1,
             "initialTerminalId": 2,

diff --git a/testData/cases/line_multiline_junction.fdtd.json b/testData/cases/line_multiline_junction.fdtd.json
@@ -133,39 +133,34 @@
 	"materialAssociations": [
 		{
 			"name": "s1",
-			"type": "cable",
 			"elementIds": [ 1 ],
 			"materialId": 1,
 			"initialTerminalId": 4,
 			"endTerminalId": 6
 		},
 		{
 			"name": "s2",
-			"type": "cable",
 			"elementIds": [ 2 ],
 			"materialId": 1,
 			"initialTerminalId": 3,
 			"endTerminalId": 6
 		},
 		{
 			"name": "s3",
-			"type": "cable",
 			"elementIds": [ 3,4 ],
 			"materialId": 2,
 			"initialTerminalId": 5,
 			"endTerminalId": 5
 		},
 		{
 			"name": "s4",
-			"type": "cable",
 			"elementIds": [ 5 ],
 			"materialId": 1,
 			"initialTerminalId": 6,
 			"endTerminalId": 3
 		},
 		{
 			"name": "s5",
-			"type": "cable",
 			"elementIds": [ 6 ],
 			"materialId": 1,
 			"initialTerminalId": 6,

diff --git a/testData/cases/line_multiline_junction_with_wires.fdtd.json b/testData/cases/line_multiline_junction_with_wires.fdtd.json
@@ -133,39 +133,34 @@
 	"materialAssociations": [
 		{
 			"name": "s1",
-			"type": "cable",
 			"elementIds": [ 1 ],
 			"materialId": 1,
 			"initialTerminalId": 4,
 			"endTerminalId": 6
 		},
 		{
 			"name": "s2",
-			"type": "cable",
 			"elementIds": [ 2 ],
 			"materialId": 1,
 			"initialTerminalId": 3,
 			"endTerminalId": 6
 		},
 		{
 			"name": "s3",
-			"type": "cable",
 			"elementIds": [ 3,4 ],
 			"materialId": 2,
 			"initialTerminalId": 5,
 			"endTerminalId": 5
 		},
 		{
 			"name": "s4",
-			"type": "cable",
 			"elementIds": [ 5 ],
 			"materialId": 1,
 			"initialTerminalId": 6,
 			"endTerminalId": 3
 		},
 		{
 			"name": "s5",
-			"type": "cable",
 			"elementIds": [ 6 ],
 			"materialId": 1,
 			"initialTerminalId": 6,

diff --git a/testData/cases/multilines_4port_box.fdtd.json b/testData/cases/multilines_4port_box.fdtd.json
@@ -137,16 +137,14 @@
 	"materialAssociations": [
 		{
 			"name": "s1",
-			"type": "cable",
-			"elementIds": [ 1,2 ],
+						"elementIds": [ 1,2 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3
 		},
 		{
 			"name": "s2",
-			"type": "cable",
-			"elementIds": [ 3,4 ],
+						"elementIds": [ 3,4 ],
 			"materialId": 1,
 			"initialTerminalId": 4,
 			"endTerminalId": 2

diff --git a/testData/cases/multilines_4port_box_nobox.fdtd.json b/testData/cases/multilines_4port_box_nobox.fdtd.json
@@ -130,16 +130,14 @@
 	"materialAssociations": [
 		{
 			"name": "s1",
-			"type": "cable",
-			"elementIds": [ 1,2 ],
+						"elementIds": [ 1,2 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3
 		},
 		{
 			"name": "s2",
-			"type": "cable",
-			"elementIds": [ 3,4 ],
+						"elementIds": [ 3,4 ],
 			"materialId": 1,
 			"initialTerminalId": 4,
 			"endTerminalId": 2

diff --git a/testData/cases/multilines_balun.fdtd.json b/testData/cases/multilines_balun.fdtd.json
@@ -137,16 +137,14 @@
 	"materialAssociations": [
 		{
 			"name": "s1",
-			"type": "cable",
-			"elementIds": [ 1,2 ],
+						"elementIds": [ 1,2 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3
 		},
 		{
 			"name": "s2",
-			"type": "cable",
-			"elementIds": [ 3,4 ],
+						"elementIds": [ 3,4 ],
 			"materialId": 1,
 			"initialTerminalId": 4,
 			"endTerminalId": 2

diff --git a/testData/cases/multilines_opamp.fdtd.json b/testData/cases/multilines_opamp.fdtd.json
@@ -137,16 +137,14 @@
 	"materialAssociations": [
 		{
 			"name": "s1",
-			"type": "cable",
-			"elementIds": [ 1,2 ],
+						"elementIds": [ 1,2 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3
 		},
 		{
 			"name": "s2",
-			"type": "cable",
-			"elementIds": [ 3,4 ],
+						"elementIds": [ 3,4 ],
 			"materialId": 1,
 			"initialTerminalId": 4,
 			"endTerminalId": 2

diff --git a/testData/cases/opamp_saturation.fdtd.json b/testData/cases/opamp_saturation.fdtd.json
@@ -95,8 +95,7 @@
 	"materialAssociations": [
 		{
 			"name": "wire1",
-			"type": "cable",
-			"elementIds": [ 1, 2 ],
+						"elementIds": [ 1, 2 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3

diff --git a/testData/cases/paul_8_6_square.fdtd.json b/testData/cases/paul_8_6_square.fdtd.json
@@ -92,8 +92,7 @@
 	"materialAssociations": [
 		{
 			"name": "wire",
-			"type": "cable",
-			"elementIds": [ 1 ],
+						"elementIds": [ 1 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3

diff --git a/testData/cases/paul_8_6_triangle.fdtd.json b/testData/cases/paul_8_6_triangle.fdtd.json
@@ -92,8 +92,7 @@
 	"materialAssociations": [
 		{
 			"name": "wire",
-			"type": "cable",
-			"elementIds": [ 1 ],
+						"elementIds": [ 1 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3

diff --git a/testData/cases/paul_9_6.fdtd.json b/testData/cases/paul_9_6.fdtd.json
@@ -104,8 +104,7 @@
 	"materialAssociations": [
 		{
 			"name": "two_wires",
-			"type": "cable",
-			"elementIds": [ 1,2 ],
+						"elementIds": [ 1,2 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3

diff --git a/testData/cases/sgbc/sgbc.fdtd.json b/testData/cases/sgbc/sgbc.fdtd.json
@@ -51,8 +51,7 @@
 
     "materialAssociations": [
         {
-            "type": "bulk",
-            "materialId": 1,
+                        "materialId": 1,
             "elementIds": [ 1 ]
         },
         {

diff --git a/testData/cases/shieldedPair/shieldedPair.fdtd.json b/testData/cases/shieldedPair/shieldedPair.fdtd.json
@@ -167,24 +167,21 @@
 	"materialAssociations": [
 		{
 			"name": "line_0",
-			"type": "cable",
-			"elementIds": [ 1 ],
+						"elementIds": [ 1 ],
 			"materialId": 2,
 			"initialTerminalId": 6,
 			"endTerminalId": 6
 		},
 		{
 			"name": "line_1",
-			"type": "cable",
-			"elementIds": [ 6,7 ],
+						"elementIds": [ 6,7 ],
 			"materialId": 1,
 			"initialTerminalId": 3,
 			"endTerminalId": 3,
 			"containedWithinElementId": 1
 		},
 		{
-			"type": "bulk",
-			"materialId" : 5,
+						"materialId" : 5,
 			"elementIds": [5]
 
 		}

diff --git a/testData/cases/sphere/sphere.fdtd.json b/testData/cases/sphere/sphere.fdtd.json
@@ -40903,8 +40903,7 @@
     ],
     "materialAssociations": [
         {
-            "type": "bulk",
-            "materialId": 1,
+                        "materialId": 1,
             "elementIds": [
                 3
             ]

diff --git a/testData/cases/spice_connectors.fdtd.json b/testData/cases/spice_connectors.fdtd.json
@@ -92,8 +92,7 @@
 	"materialAssociations": [
 		{
 			"name": "wire",
-			"type": "cable",
-			"elementIds": [ 1 ],
+						"elementIds": [ 1 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 3

diff --git a/testData/cases/towelHanger/towelHanger.fdtd.json b/testData/cases/towelHanger/towelHanger.fdtd.json
@@ -69,16 +69,14 @@
 
     "materialAssociations": [
         { 
-            "type": "cable",
-            "name": "wire",
+                        "name": "wire",
             "materialId": 1,
             "initialTerminalId": 2,
             "endTerminalId": 3,
             "elementIds": [2]
         },
         { 
-            "type": "bulk",
-            "materialId" : 4,
+                        "materialId" : 4,
             "elementIds": [3]
         }
     ],

diff --git a/testData/cases/wire_panel.fdtd.json b/testData/cases/wire_panel.fdtd.json
@@ -115,8 +115,7 @@
 	"materialAssociations": [
 		{
 			"name": "panel",
-			"type": "cable",
-			"elementIds": [ 1,2,3,4 ],
+						"elementIds": [ 1,2,3,4 ],
 			"materialId": 1,
 			"initialTerminalId": 2,
 			"endTerminalId": 2

diff --git a/testData/input_examples/connectedWires.fdtd.json b/testData/input_examples/connectedWires.fdtd.json
@@ -65,16 +65,14 @@
 
     "materialAssociations": [
         { 
-            "type": "cable",
-            "name": "cable1",
+                        "name": "cable1",
             "materialId": 1,
             "initialTerminalId": 3,
             "endTerminalId": 2,
             "elementIds": [2]
         },
         { 
-            "type": "cable",
-            "name": "cable2",
+                        "name": "cable2",
             "materialId": 1,
             "initialTerminalId": 3,
             "endTerminalId": 3,

diff --git a/testData/input_examples/holland1981.fdtd.json b/testData/input_examples/holland1981.fdtd.json
@@ -52,8 +52,7 @@
 
     "materialAssociations": [
         { 
-            "type": "cable",
-            "name" : "single_wire",
+                        "name" : "single_wire",
             "materialId": 1,
             "initialTerminalId": 2,
             "endTerminalId": 2,