Skip to content
Merged
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
12 changes: 6 additions & 6 deletions src/power_grid_model_io/converters/pandapower_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@ def _create_pgm_input_lines(self):
in_service = self._get_pp_attr("line", "in_service", expected_type="bool", default=True)
length_km = self._get_pp_attr("line", "length_km", expected_type="f8")
parallel = self._get_pp_attr("line", "parallel", expected_type="u4", default=1)
c_nf_per_km = self._get_pp_attr("line", "c_nf_per_km", expected_type="f8")
c0_nf_per_km = self._get_pp_attr("line", "c0_nf_per_km", expected_type="f8", default=np.nan)
c_nf_per_km = self._get_pp_attr("line", "c_nf_per_km", expected_type="f8", default=0)
c0_nf_per_km = self._get_pp_attr("line", "c0_nf_per_km", expected_type="f8", default=0)
multiplier = length_km / parallel

pgm_lines = initialize_array(
Expand All @@ -426,12 +426,12 @@ def _create_pgm_input_lines(self):
pgm_lines["x1"] = self._get_pp_attr("line", "x_ohm_per_km", expected_type="f8") * multiplier
pgm_lines["c1"] = c_nf_per_km * length_km * parallel * 1e-9
# The formula for tan1 = R_1 / Xc_1 = (g * 1e-6) / (2 * pi * f * c * 1e-9) = g / (2 * pi * f * c * 1e-3)
pgm_lines["tan1"] = 0.0
pgm_lines["tan1"] = np.divide(
self._get_pp_attr("line", "g_us_per_km", expected_type="f8", default=0),
c_nf_per_km * (2 * np.pi * self.system_frequency * 1e-3),
where=c_nf_per_km != 0.0,
where=np.logical_not(np.isclose(c_nf_per_km, 0.0)),
)
pgm_lines["tan1"][np.equal(c_nf_per_km, 0.0)] = 0.0
pgm_lines["i_n"] = (
(self._get_pp_attr("line", "max_i_ka", expected_type="f8", default=np.nan) * 1e3)
* self._get_pp_attr("line", "df", expected_type="f8", default=1)
Expand All @@ -440,12 +440,12 @@ def _create_pgm_input_lines(self):
pgm_lines["r0"] = self._get_pp_attr("line", "r0_ohm_per_km", expected_type="f8", default=np.nan) * multiplier
pgm_lines["x0"] = self._get_pp_attr("line", "x0_ohm_per_km", expected_type="f8", default=np.nan) * multiplier
pgm_lines["c0"] = c0_nf_per_km * length_km * parallel * 1e-9
pgm_lines["tan0"] = 0.0
pgm_lines["tan0"] = np.divide(
self._get_pp_attr("line", "g0_us_per_km", expected_type="f8", default=0),
c0_nf_per_km * (2 * np.pi * self.system_frequency * 1e-3),
where=c0_nf_per_km != 0.0,
where=np.logical_not(np.isclose(c0_nf_per_km, 0.0)),
)
pgm_lines["tan0"][np.equal(c0_nf_per_km, 0.0)] = 0.0
assert ComponentType.line not in self.pgm_input_data
self.pgm_input_data[ComponentType.line] = pgm_lines

Expand Down
21 changes: 14 additions & 7 deletions tests/unit/converters/test_pandapower_converter_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -525,13 +525,13 @@ def test_create_pgm_input_lines(mock_init_array: MagicMock, two_pp_objs, convert
converter._get_pp_attr.assert_any_call("line", "parallel", expected_type="u4", default=1)
converter._get_pp_attr.assert_any_call("line", "r_ohm_per_km", expected_type="f8")
converter._get_pp_attr.assert_any_call("line", "x_ohm_per_km", expected_type="f8")
converter._get_pp_attr.assert_any_call("line", "c_nf_per_km", expected_type="f8")
converter._get_pp_attr.assert_any_call("line", "c_nf_per_km", expected_type="f8", default=0)
converter._get_pp_attr.assert_any_call("line", "g_us_per_km", expected_type="f8", default=0)
converter._get_pp_attr.assert_any_call("line", "max_i_ka", expected_type="f8", default=np.nan)
converter._get_pp_attr.assert_any_call("line", "df", expected_type="f8", default=1)
converter._get_pp_attr.assert_any_call("line", "r0_ohm_per_km", expected_type="f8", default=np.nan)
converter._get_pp_attr.assert_any_call("line", "x0_ohm_per_km", expected_type="f8", default=np.nan)
converter._get_pp_attr.assert_any_call("line", "c0_nf_per_km", expected_type="f8", default=np.nan)
converter._get_pp_attr.assert_any_call("line", "c0_nf_per_km", expected_type="f8", default=0)
converter._get_pp_attr.assert_any_call("line", "g0_us_per_km", expected_type="f8", default=0)
assert len(converter._get_pp_attr.call_args_list) == 15

Expand Down Expand Up @@ -566,7 +566,7 @@ def test_create_pgm_input_lines(mock_init_array: MagicMock, two_pp_objs, convert
)
pgm.assert_any_call(
"c1",
_get_pp_attr("line", "c_nf_per_km", expected_type="f8")
_get_pp_attr("line", "c_nf_per_km", expected_type="f8", default=0)
* _get_pp_attr("line", "length_km", expected_type="f8")
* _get_pp_attr("line", "parallel", expected_type="u4", default=1)
* 1e-9,
Expand All @@ -575,8 +575,8 @@ def test_create_pgm_input_lines(mock_init_array: MagicMock, two_pp_objs, convert
"tan1",
np.divide(
_get_pp_attr("line", "g_us_per_km", expected_type="f8", default=0),
_get_pp_attr("line", "c_nf_per_km", expected_type="f8") * (np.pi / 10),
where=_get_pp_attr("line", "c_nf_per_km", expected_type="f8") != 0.0,
_get_pp_attr("line", "c_nf_per_km", expected_type="f8", default=0) * (np.pi / 10),
where=np.logical_not(np.isclose(_get_pp_attr("line", "c_nf_per_km", expected_type="f8", default=0), 0.0)),
),
)
pgm.assert_any_call(
Expand All @@ -585,11 +585,18 @@ def test_create_pgm_input_lines(mock_init_array: MagicMock, two_pp_objs, convert
* _get_pp_attr("line", "df", expected_type="f8", default=1)
* _get_pp_attr("line", "parallel", expected_type="u4", default=1),
)
pgm.assert_any_call(
"tan0",
np.divide(
_get_pp_attr("line", "g0_us_per_km", expected_type="f8", default=0),
_get_pp_attr("line", "c0_nf_per_km", expected_type="f8", default=0) * (np.pi / 10),
where=np.logical_not(np.isclose(_get_pp_attr("line", "c0_nf_per_km", expected_type="f8", default=0), 0.0)),
),
)
pgm.assert_any_call("r0", ANY)
pgm.assert_any_call("x0", ANY)
pgm.assert_any_call("c0", ANY)
pgm.assert_any_call("tan0", ANY)
assert len(pgm.call_args_list) == 14
assert len(pgm.call_args_list) == 16

# result
assert converter.pgm_input_data[ComponentType.line] == mock_init_array.return_value
Expand Down
10 changes: 10 additions & 0 deletions tests/validation/converters/test_pandapower_converter_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,13 @@ def test_pgm_input_lines__cnf_zero():
pp_network.line.c0_nf_per_km = 0
data, _ = pp_converter.load_input_data(pp_network)
np.testing.assert_array_equal(data[ComponentType.line]["tan0"], 0)


@pytest.mark.filterwarnings("error")
def test_simple_example():
from pandapower.networks import example_simple

pp_net = example_simple()
pp_net["gen"] = pp_net["gen"].iloc[:0]
pp_converter = PandaPowerConverter()
data, _ = pp_converter.load_input_data(pp_net)
Loading