Housecleaning minors.

doc/fdtdjson.md

@@ -351,7 +351,7 @@ doi: 10.1109/TEMC.1981.303899.
 Materials of this type must contain:
 
 + `<radius>` as a real number.
-+ `<resistancePerMeter>` as a real number.
++ `[resistancePerMeter]` as a real number. Defaults to `0.0`.
 + `[inductancePerMeter]` as a real number. Defaults to `0.0`.
 
 **Example:**
@@ -382,8 +382,8 @@ They must contain the following entries:
 
 `transferImpedancePerMeter` can contain:
 
-+ `[resistiveTerm]` defined by a real representing transfer impedance resistance. Defaults to `0.0`
-+ `[inductiveTerm]` defined by a real representing transfer impedance inductance. Defaults to `0.0`.
++ `[resistancePerMeter]` defined by a real representing transfer impedance resistance. Defaults to `0.0`
++ `[inductancePerMeter]` defined by a real representing transfer impedance inductance. Defaults to `0.0`.
 + `[direction]` which can be `both`, `inwards`, or `outwards`. Indicating the type of coupling considered. Defaults to `both` meaning that fields can couple from the exterior to interior and the other way round.
 
 **Example:**
@@ -403,7 +403,7 @@ They must contain the following entries:
         [-20.5e-12, 105.5e-12 ]
     ],
     "transferImpedancePerMeter" : {
-        "inductiveTerm" : 4.2e-9,
+        "inductancePerMeter" : 4.2e-9,
         "direction" : "inwards"
     }
 }
@@ -534,8 +534,8 @@ The most common situation will be having the connector of a shielded bundle. In
     "resistances": [100e-3],
     "transferImpedancesPerMeter" : [
         {
-        "resistiveTerm" : 3.33,
-        "inductiveTerm" : 2.6e-9,
+        "resistancePerMeter" : 3.33,
+        "inductancePerMeter" : 2.6e-9,
         "direction" : "inwards"
         }
     ]

src_json_parser/smbjson.F90

@@ -1941,7 +1941,8 @@ function readThinWire(cable) result(res)
          block
             type(json_value_ptr_t) :: m
             m = this%matTable%getId(cable%materialId)
-            radius = this%getRealAt(m%p, J_MAT_WIRE_RADIUS, default=0.0_RKIND)
+
+            radius = this%getRealAt(m%p, J_MAT_WIRE_RADIUS)
             resistance = this%getRealAt(m%p, J_MAT_WIRE_RESISTANCE, default=0.0_RKIND)
             inductance = this%getRealAt(m%p, J_MAT_WIRE_INDUCTANCE, default=0.0_RKIND)
             res%rad = radius 

src_json_parser/smbjson_labels.F90

@@ -123,8 +123,8 @@ module smbjson_labels_m
    character(len=*), parameter :: J_MAT_CONN_TRANSFER_IMPEDANCES = "transferImpedancesPerMeter"
 
    ! -- transferImpedancePerMeter
-   character(len=*), parameter :: J_MAT_TRANSFER_IMPEDANCE_RESISTANCE = "resistiveTerm"
-   character(len=*), parameter :: J_MAT_TRANSFER_IMPEDANCE_INDUCTANCE = "inductiveTerm"
+   character(len=*), parameter :: J_MAT_TRANSFER_IMPEDANCE_RESISTANCE = "resistancePerMeter"
+   character(len=*), parameter :: J_MAT_TRANSFER_IMPEDANCE_INDUCTANCE = "inductancePerMeter"
    character(len=*), parameter :: J_MAT_TRANSFER_IMPEDANCE_DIRECTION = "direction"
    character(len=*), parameter :: J_MAT_TRANSFER_IMPEDANCE_POLES = "poles"
    character(len=*), parameter :: J_MAT_TRANSFER_IMPEDANCE_RESIDUES = "residues"

src_main_pub/interpreta_switches.F90

@@ -1907,7 +1907,7 @@ subroutine buscaswitchficheroinput(l)
       !
       ! If no input is present we stop
       if (len(trim(adjustl(l%fichin))) <= 0) then
-         call stoponerror(l%layoutnumber, l%num_procs, 'ERROR! -> No input file was specified. Use -i ****.nfde', .true.); statuse = -1; goto 667
+         call stoponerror(l%layoutnumber, l%num_procs, 'ERROR! -> No input file was specified. Use -i ****.fdtd.json', .true.); statuse = -1; goto 667
       end if
 
       l%fileFDE = trim(adjustl(l%fichin))//NFDEEXTENSION

src_main_pub/semba_fdtd.F90

@@ -314,7 +314,11 @@ subroutine semba_init(this, input_flags)
 #else
 #ifdef CompilePrivateVersion
    if (trim(adjustl(this%l%extension))=='.nfde') then 
+#ifdef CompileWithMTLN
       NFDE_FILE => cargar_NFDE_FILE (this%l%filefde)
+#else
+      call WarnErrReport(".nfde files are not supported when compiling with MTLN.", .true.)
+#endif
    else
       allocate (NFDE_FILE)
    end if

testData/cases/bidirectionalShield/bidirectionalShield.fdtd.json

@@ -31,8 +31,8 @@
 				[-20.5e-12, 85.0e-12 ]
 			],
 			"transferImpedancePerMeter" : {
-				"resistiveTerm" : 0.0,
-				"inductiveTerm" : 4.0e-9,
+				"resistancePerMeter" : 0.0,
+				"inductancePerMeter" : 4.0e-9,
 				"direction": "both"
 			}
 		},

testData/cases/shieldedPair/shieldedPair.fdtd.json

@@ -31,8 +31,8 @@
 				[-20.5e-12, 85.0e-12 ]
 			],
 			"transferImpedancePerMeter" : {
-				"resistiveTerm" : 0.0,
-				"inductiveTerm" : 4.0e-9,
+				"resistancePerMeter" : 0.0,
+				"inductancePerMeter" : 4.0e-9,
 				"direction": "both"
 			}
 		},

testData/input_examples/mtln.fdtd.json

@@ -43,7 +43,7 @@
 			"inductancePerMeter":  [[8.802075200000001e-08]],
 			"capacitancePerMeter": [[5.5840010E-10]],
 			"transferImpedancePerMeter" : {
-				"inductiveTerm" : 8.9e-9,
+				"inductancePerMeter" : 8.9e-9,
 				"direction" : "inwards"
 			}
 		},
@@ -55,7 +55,7 @@
 			"inductancePerMeter": [[1.37228e-07]],
 			"capacitancePerMeter":[[3.2310005E-10]],
 			"transferImpedancePerMeter" : {
-				"inductiveTerm" : 7.4e-9,
+				"inductancePerMeter" : 7.4e-9,
 				"direction" : "inwards"
 			}
 		},
@@ -67,7 +67,7 @@
 			"inductancePerMeter":  [[9.1890502e-08]],
 			"capacitancePerMeter": [[4.7190007E-10]],
 			"transferImpedancePerMeter" : {
-				"inductiveTerm" : 3.0e-9,
+				"inductancePerMeter" : 3.0e-9,
 				"direction" : "inwards"
 			}
 		},
@@ -97,7 +97,7 @@
 				[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, -20.5e-12, 105.5e-12]
 			],
 			"transferImpedancePerMeter" : {
-				"inductiveTerm" : 4.2e-9,
+				"inductancePerMeter" : 4.2e-9,
 				"direction" : "inwards",
 				"__factor" : 4
 			}
@@ -116,7 +116,7 @@
 				[-20.5e-12, 105.5e-12 ]
 			],
 			"transferImpedancePerMeter" : {
-				"inductiveTerm" : 4.2e-9,
+				"inductancePerMeter" : 4.2e-9,
 				"direction" : "inwards"
 			}
 		},
@@ -142,7 +142,7 @@
 				[0.0, 0.0, 0.0, 0.0, -20.5e-12, 105.5e-12 ]
 			],
 			"transferImpedancePerMeter" : {
-				"inductiveTerm" : 4.2e-9,
+				"inductancePerMeter" : 4.2e-9,
 				"direction" : "inwards",
 				"__factor" : 3
 			}		
@@ -260,7 +260,7 @@
 			"type": "connector",
 			"resistances": [100.0e-3],
 			"transferImpedancesPerMeter" : [
-				{"resistiveTerm" : 3.33, "inductiveTerm" : 2.6e-9, "direction" : "inwards"}
+				{"resistancePerMeter" : 3.33, "inductancePerMeter" : 2.6e-9, "direction" : "inwards"}
 			]
 		},
 		{
@@ -269,7 +269,7 @@
 			"type": "connector",
 			"resistances": [19.0],
 			"transferImpedancesPerMeter" : [
-				{"resistiveTerm" : 609.3, "inductiveTerm" : 2.6e-9, "direction" : "inwards"}
+				{"resistancePerMeter" : 609.3, "inductancePerMeter" : 2.6e-9, "direction" : "inwards"}
 			]
 		}
 	],

testData/input_examples/shieldedPair.fdtd.json

@@ -31,8 +31,8 @@
 				[-20.5e-12, 85.0e-12 ]
 			],
 			"transferImpedancePerMeter" : {
-				"resistiveTerm" : 0.0,
-				"inductiveTerm" : 4.0e-9,
+				"resistancePerMeter" : 0.0,
+				"inductancePerMeter" : 4.0e-9,
 				"direction": "both"
 			}
 		},