Skip to content

Commit 2c8e313

Browse files
authored
Merge branch 'PowerGridModel:main' into pp_converter
2 parents 02f7fa0 + 2cd812f commit 2c8e313

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/power_grid_model_io/converters/pandapower_converter.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ def _create_pgm_input_lines(self):
429429
pgm_lines["x1"] = self._get_pp_attr("line", "x_ohm_per_km", expected_type="f8") * multiplier
430430
pgm_lines["c1"] = c_nf_per_km * length_km * parallel * 1e-9
431431
# The formula for tan1 = R_1 / Xc_1 = (g * 1e-6) / (2 * pi * f * c * 1e-9) = g / (2 * pi * f * c * 1e-3)
432-
pgm_lines["tan1"] = 0.0
433432
pgm_lines["tan1"] = np.divide(
434433
self._get_pp_attr("line", "g_us_per_km", expected_type="f8", default=0),
435434
c_nf_per_km * (2 * np.pi * self.system_frequency * 1e-3),
@@ -443,7 +442,6 @@ def _create_pgm_input_lines(self):
443442
pgm_lines["r0"] = self._get_pp_attr("line", "r0_ohm_per_km", expected_type="f8", default=np.nan) * multiplier
444443
pgm_lines["x0"] = self._get_pp_attr("line", "x0_ohm_per_km", expected_type="f8", default=np.nan) * multiplier
445444
pgm_lines["c0"] = c0_nf_per_km * length_km * parallel * 1e-9
446-
pgm_lines["tan0"] = 0.0
447445
pgm_lines["tan0"] = np.divide(
448446
self._get_pp_attr("line", "g0_us_per_km", expected_type="f8", default=0),
449447
c0_nf_per_km * (2 * np.pi * self.system_frequency * 1e-3),

tests/unit/converters/test_pandapower_converter_input.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ def test_create_pgm_input_lines(mock_init_array: MagicMock, two_pp_objs, convert
596596
pgm.assert_any_call("r0", ANY)
597597
pgm.assert_any_call("x0", ANY)
598598
pgm.assert_any_call("c0", ANY)
599-
assert len(pgm.call_args_list) == 16
599+
assert len(pgm.call_args_list) == 14
600600

601601
# result
602602
assert converter.pgm_input_data[ComponentType.line] == mock_init_array.return_value

0 commit comments

Comments
 (0)