Skip to content

Commit efbd7c3

Browse files
authored
Merge branch 'structure_dict_extension' into structure_dict_extension
2 parents 1f8fe71 + 97ff216 commit efbd7c3

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

pandapower/network_schema/ext_grid.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
nullable=True,
4343
required=False,
4444
description="maxium R/X ratio of short-circuit impedance",
45-
metadata={"sc": True},
45+
metadata={"sc": True, "3ph": True},
4646
),
4747
"rx_min": pa.Column(
4848
float,
4949
pa.Check.ge(0),
5050
nullable=True,
5151
required=False,
5252
description="minimum R/X ratio of short-circuit impedance",
53-
metadata={"sc": True},
53+
metadata={"sc": True, "3ph": True},
5454
),
5555
"r0x0_max": pa.Column(
5656
float,

pandapower/network_schema/load.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@
5050
"in_service": pa.Column(bool, description="specifies if the load is in service."),
5151
"type": pa.Column(
5252
pd.StringDtype,
53+
pa.Check.isin(["wye", "delta"]),
5354
nullable=True,
5455
required=False,
5556
description="Connection Type of 3 Phase Load(Valid for three phase load flow only) Naming convention: wye, delta",
57+
metadata={"3ph": True},
5658
),
5759
"controllable": pa.Column(
5860
pd.BooleanDtype,

pandapower/network_schema/trafo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@
7474
description="Vector Groups ( required for zero sequence model of transformer )",
7575
metadata={"sc": True, "3ph": True},
7676
),
77-
"shift_degree": pa.Column(float, description="transformer phase shift angle"),
77+
"shift_degree": pa.Column(float, description="transformer phase shift angle"), # Thomas: optional
7878
"tap_side": pa.Column(
7979
pd.StringDtype,
8080
pa.Check.isin(["hv", "lv"]),
8181
nullable=True,
8282
required=False,
8383
description="defines if tap changer is at the high- or low voltage side",
84-
),
84+
), # Thomas: null only if no tap_changer_type
8585
"tap_neutral": pa.Column(float, nullable=True, required=False, description="rated tap position"),
8686
"tap_min": pa.Column(float, nullable=True, required=False, description="minimum tap position"),
8787
"tap_max": pa.Column(float, nullable=True, required=False, description="maximum tap position"),

0 commit comments

Comments
 (0)