Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/3336.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added `CircuitImpedanceModel` to support arbitrary RLC circuits in `LinearLumpedElement`, with class methods `from_spice_file()` and `from_component_list()` for instantiation from a SPICE netlist or a component list.
1 change: 1 addition & 0 deletions changelog.d/3336.planned_deprecation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`RLCNetwork` (a deprecation warning is now issued). Use `CircuitImpedanceModel.from_component_list()` or `CircuitImpedanceModel.from_spice_file()` instead. `AdmittanceNetwork` may be renamed to `AdmittanceModel` in a future release.
37 changes: 37 additions & 0 deletions schemas/EMESimulation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1539,6 +1539,39 @@
],
"type": "object"
},
"CircuitImpedanceModel": {
"additionalProperties": false,
"properties": {
"a": {
"items": {
"minimum": 0,
"type": "number"
},
"type": "array"
},
"attrs": {
"additionalProperties": true,
"type": "object"
},
"b": {
"items": {
"minimum": 0,
"type": "number"
},
"type": "array"
},
"type": {
"const": "CircuitImpedanceModel",
"default": "CircuitImpedanceModel",
"type": "string"
}
},
"required": [
"a",
"b"
],
"type": "object"
},
"ClipOperation": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -6797,6 +6830,7 @@
"discriminator": {
"mapping": {
"AdmittanceNetwork": "#/$defs/AdmittanceNetwork",
"CircuitImpedanceModel": "#/$defs/CircuitImpedanceModel",
"RLCNetwork": "#/$defs/RLCNetwork"
},
"propertyName": "type"
Expand All @@ -6805,6 +6839,9 @@
{
"$ref": "#/$defs/AdmittanceNetwork"
},
{
"$ref": "#/$defs/CircuitImpedanceModel"
},
{
"$ref": "#/$defs/RLCNetwork"
}
Expand Down
37 changes: 37 additions & 0 deletions schemas/ModeSimulation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1741,6 +1741,39 @@
],
"type": "object"
},
"CircuitImpedanceModel": {
"additionalProperties": false,
"properties": {
"a": {
"items": {
"minimum": 0,
"type": "number"
},
"type": "array"
},
"attrs": {
"additionalProperties": true,
"type": "object"
},
"b": {
"items": {
"minimum": 0,
"type": "number"
},
"type": "array"
},
"type": {
"const": "CircuitImpedanceModel",
"default": "CircuitImpedanceModel",
"type": "string"
}
},
"required": [
"a",
"b"
],
"type": "object"
},
"ClipOperation": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -6284,6 +6317,7 @@
"discriminator": {
"mapping": {
"AdmittanceNetwork": "#/$defs/AdmittanceNetwork",
"CircuitImpedanceModel": "#/$defs/CircuitImpedanceModel",
"RLCNetwork": "#/$defs/RLCNetwork"
},
"propertyName": "type"
Expand All @@ -6292,6 +6326,9 @@
{
"$ref": "#/$defs/AdmittanceNetwork"
},
{
"$ref": "#/$defs/CircuitImpedanceModel"
},
{
"$ref": "#/$defs/RLCNetwork"
}
Expand Down
37 changes: 37 additions & 0 deletions schemas/Simulation.json
Original file line number Diff line number Diff line change
Expand Up @@ -2181,6 +2181,39 @@
],
"type": "object"
},
"CircuitImpedanceModel": {
"additionalProperties": false,
"properties": {
"a": {
"items": {
"minimum": 0,
"type": "number"
},
"type": "array"
},
"attrs": {
"additionalProperties": true,
"type": "object"
},
"b": {
"items": {
"minimum": 0,
"type": "number"
},
"type": "array"
},
"type": {
"const": "CircuitImpedanceModel",
"default": "CircuitImpedanceModel",
"type": "string"
}
},
"required": [
"a",
"b"
],
"type": "object"
},
"ClipOperation": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -9145,6 +9178,7 @@
"discriminator": {
"mapping": {
"AdmittanceNetwork": "#/$defs/AdmittanceNetwork",
"CircuitImpedanceModel": "#/$defs/CircuitImpedanceModel",
"RLCNetwork": "#/$defs/RLCNetwork"
},
"propertyName": "type"
Expand All @@ -9153,6 +9187,9 @@
{
"$ref": "#/$defs/AdmittanceNetwork"
},
{
"$ref": "#/$defs/CircuitImpedanceModel"
},
{
"$ref": "#/$defs/RLCNetwork"
}
Expand Down
37 changes: 37 additions & 0 deletions schemas/TerminalComponentModeler.json
Original file line number Diff line number Diff line change
Expand Up @@ -2181,6 +2181,39 @@
],
"type": "object"
},
"CircuitImpedanceModel": {
"additionalProperties": false,
"properties": {
"a": {
"items": {
"minimum": 0,
"type": "number"
},
"type": "array"
},
"attrs": {
"additionalProperties": true,
"type": "object"
},
"b": {
"items": {
"minimum": 0,
"type": "number"
},
"type": "array"
},
"type": {
"const": "CircuitImpedanceModel",
"default": "CircuitImpedanceModel",
"type": "string"
}
},
"required": [
"a",
"b"
],
"type": "object"
},
"ClipOperation": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -9319,6 +9352,7 @@
"discriminator": {
"mapping": {
"AdmittanceNetwork": "#/$defs/AdmittanceNetwork",
"CircuitImpedanceModel": "#/$defs/CircuitImpedanceModel",
"RLCNetwork": "#/$defs/RLCNetwork"
},
"propertyName": "type"
Expand All @@ -9327,6 +9361,9 @@
{
"$ref": "#/$defs/AdmittanceNetwork"
},
{
"$ref": "#/$defs/CircuitImpedanceModel"
},
{
"$ref": "#/$defs/RLCNetwork"
}
Expand Down
Loading
Loading