Merge pull request #193 from OpenSEMBA/feature/new_terminations

Feature/new terminations

Author: Alberto-o

doc/smbjson.md

@@ -453,7 +453,17 @@ Each entry in `terminations` is specified by a `type`
 
 + `short` if the wire is short-circuited with another wire or with any surface which might be present.
 + `open` if the wire does not end in an ohmic contact with any other structure.
-+ Different configurations of passive circuit elements R, L, and C can be defined with `series` (for RLC series circuits), `LCpRs` (LC parallel in series with a resistance) and `RLsCp` (for series RL in parallel with C). The are defined as follows:
++ Different configurations of passive circuit elements R, L, and C can be defined:
+  + `series` (for RLC series circuits), 
+  + `parallel` (for RLC parallel circuits), 
+  + `RsLCp` (LC parallel in series with R), 
+  + `RLsCp` (RL series in parallel with C), 
+  + `LsRCp` (RC parallel in series with L), 
+  + `CsLRp` (LR parallel in parallel with C),
+  + `RCsLp` (RC series in parallel with L), and 
+  + `LCsRp` (LC series in parallel with R). 
+
+The values are defined defined as follows:
   + `[resistance]` which defaults to `0.0`,
   + `[inductance]` which defaults to `0.0`,
   + `[capacitance]` which defaults to `1e22`.

src_json_parser/smbjson.F90

@@ -2754,8 +2754,18 @@ function readTerminationType(termination) result(res)
             res = TERMINATION_SHORT
          else if (type == J_MAT_TERM_TYPE_SERIES) then
             res = TERMINATION_SERIES
-         else if (type == J_MAT_TERM_TYPE_LCpRs) then
-            res = TERMINATION_LCpRs
+         else if (type == J_MAT_TERM_TYPE_PARALLEL) then
+            res = TERMINATION_PARALLEL
+         else if (type == J_MAT_TERM_TYPE_RsLCp) then
+            res = TERMINATION_RsLCp
+         else if (type == J_MAT_TERM_TYPE_LsRCp) then
+            res = TERMINATION_LsRCp
+         else if (type == J_MAT_TERM_TYPE_CsLRp) then
+            res = TERMINATION_CsLRp
+         else if (type == J_MAT_TERM_TYPE_RCsLp) then
+            res = TERMINATION_RCsLp
+         else if (type == J_MAT_TERM_TYPE_LCsRp) then
+            res = TERMINATION_LCsRp
          else if (type == J_MAT_TERM_TYPE_RLsCp) then
             res = TERMINATION_RLsCp
          else if (type == J_MAT_TERM_TYPE_CIRCUIT) then 

src_json_parser/smbjson_labels.F90

@@ -63,7 +63,13 @@ module smbjson_labels_mod
    character (len=*), parameter :: J_MAT_TERM_TYPE_OPEN = "open"
    character (len=*), parameter :: J_MAT_TERM_TYPE_SHORT = "short"
    character (len=*), parameter :: J_MAT_TERM_TYPE_SERIES = "series"
-   character (len=*), parameter :: J_MAT_TERM_TYPE_LCpRs = "LCpRs"
+   character (len=*), parameter :: J_MAT_TERM_TYPE_PARALLEL = "parallel"
+   character (len=*), parameter :: J_MAT_TERM_TYPE_LsRCp = "LsRCp"
+   character (len=*), parameter :: J_MAT_TERM_TYPE_CsLRp = "CsLRp"
+   character (len=*), parameter :: J_MAT_TERM_TYPE_RCsLp = "RCsLp"
+   character (len=*), parameter :: J_MAT_TERM_TYPE_LCsRp = "LCsRp"
+
+   character (len=*), parameter :: J_MAT_TERM_TYPE_RsLCp = "RsLCp"
    character (len=*), parameter :: J_MAT_TERM_TYPE_RLsCp = "RLsCp"
    character (len=*), parameter :: J_MAT_TERM_TYPE_CIRCUIT = "circuit"
 

src_mtln/mtln_types.F90

@@ -6,9 +6,14 @@ module mtln_types_mod
    integer, parameter :: TERMINATION_SHORT      =  1
    integer, parameter :: TERMINATION_OPEN       =  2
    integer, parameter :: TERMINATION_SERIES     =  3
-   integer, parameter :: TERMINATION_LCpRs      =  4
-   integer, parameter :: TERMINATION_RLsCp      =  5
-   integer, parameter :: TERMINATION_CIRCUIT      =  6
+   integer, parameter :: TERMINATION_PARALLEL   =  4
+   integer, parameter :: TERMINATION_RsLCp      =  5
+   integer, parameter :: TERMINATION_RLsCp      =  6
+   integer, parameter :: TERMINATION_LsRCp      =  7
+   integer, parameter :: TERMINATION_CsLRp      =  8
+   integer, parameter :: TERMINATION_RCsLp      =  9
+   integer, parameter :: TERMINATION_LCsRp      =  10
+   integer, parameter :: TERMINATION_CIRCUIT    =  11
 
    integer, parameter :: TERMINAL_NODE_SIDE_UNDEFINED = -1
    integer, parameter :: TERMINAL_NODE_SIDE_INI       =  1