add new validation test + cleanup

Signed-off-by: Martijn Govers <[email protected]>

Author: mgovers

src/power_grid_model_io/converters/pandapower_converter.py

@@ -2026,35 +2026,26 @@ def _pp_trafos_output_3ph(self):  # pylint: disable=too-many-statements
             loading_a_percent = np.sqrt(3) * np.maximum(ui_from[:, 0], ui_to[:, 0]) / pgm_input_transformers["sn"]
             loading_b_percent = np.sqrt(3) * np.maximum(ui_from[:, 1], ui_to[:, 1]) / pgm_input_transformers["sn"]
             loading_c_percent = np.sqrt(3) * np.maximum(ui_from[:, 2], ui_to[:, 2]) / pgm_input_transformers["sn"]
-            # To make it consistent with PandaPower, overall loading will be calculated as max of above 3.
-            loading = np.maximum(np.maximum(loading_a_percent, loading_b_percent), loading_c_percent)
         elif self.trafo_loading == "power":
-            loading_a_percent = (
-                np.maximum(
-                    pgm_output_transformers["s_from"][:, 0],
-                    pgm_output_transformers["s_to"][:, 0],
-                )
-                / (pgm_input_transformers["sn"] / 3)
-            )
-            loading_b_percent = (
-                np.maximum(
-                    pgm_output_transformers["s_from"][:, 1],
-                    pgm_output_transformers["s_to"][:, 1],
-                )
-                / (pgm_input_transformers["sn"] / 3)
-            )
-            loading_c_percent = (
-                np.maximum(
-                    pgm_output_transformers["s_from"][:, 2],
-                    pgm_output_transformers["s_to"][:, 2],
-                )
-                / (pgm_input_transformers["sn"] / 3)
-            )
-            # To make it consistent with PandaPower, overall loading will be calculated as max of above 3.
-            loading = np.maximum(np.maximum(loading_a_percent, loading_b_percent), loading_c_percent)
+            loading_a_percent = np.maximum(
+                pgm_output_transformers["s_from"][:, 0],
+                pgm_output_transformers["s_to"][:, 0],
+            ) / (pgm_input_transformers["sn"] / 3)
+            loading_b_percent = np.maximum(
+                pgm_output_transformers["s_from"][:, 1],
+                pgm_output_transformers["s_to"][:, 1],
+            ) / (pgm_input_transformers["sn"] / 3)
+            loading_c_percent = np.maximum(
+                pgm_output_transformers["s_from"][:, 2],
+                pgm_output_transformers["s_to"][:, 2],
+            ) / (pgm_input_transformers["sn"] / 3)
         else:
             raise ValueError(f"Invalid transformer loading type: {str(self.trafo_loading)}")
 
+        # PGM returns the average loading over the cable, but PandaPower returns the maximum of the per-phase loading.
+        # To make it consistent with PandaPower, overall loading will be calculated as max of above 3.
+        loading = np.maximum(np.maximum(loading_a_percent, loading_b_percent), loading_c_percent)
+
         pp_output_trafos_3ph = pd.DataFrame(
             columns=[
                 "p_a_hv_mw",

tests/data/pandapower/pp_validation.py

@@ -192,3 +192,48 @@ def pp_net_3ph() -> pp.pandapowerNet:
     # )
 
     return net
+
+
+def pp_net_3ph_minimal_trafo():
+    net = pp.create_empty_network("test", f_hz=50)
+    pp.create_bus(net, 11, "source")
+    pp.create_bus(net, 11, "TF_HT")
+    pp.create_bus(net, 0.4, "TF_LT")
+
+    pp.create_ext_grid(net, 0, 1.0, 0, s_sc_max_mva=100, rx_max=0.1, x0x_max=1, r0x0_max=0.1)
+    pp.create_line_from_parameters(
+        net,
+        0,
+        1,
+        2,
+        0.33,
+        0.34,
+        0.001,
+        600,
+        r0_ohm_per_km=0.66,
+        x0_ohm_per_km=0.65,
+        c0_nf_per_km=0.001,
+        g_us_per_km=0,
+        g0_us_per_km=0,
+    )
+    pp.create_transformer_from_parameters(
+        net,
+        1,
+        2,
+        1,
+        11,
+        0.415,
+        0,
+        4,
+        0,
+        0.01,
+        -30,
+        vector_group="Dyn",
+        vk0_percent=4,
+        vkr0_percent=0,
+        mag0_percent=100,
+        mag0_rx=0,
+        si0_hv_partial=0.9,
+    )
+    pp.create_asymmetric_load(net, 2, 0.2, 0.19, 0.195, 0.05, 0.045, 0.035, 0, type="wye")
+    return net

tests/unit/converters/test_pandapower_converter_output.py

@@ -1034,7 +1034,10 @@ def test_output_trafos_3ph__power(converter):
         converter._pp_trafos_output_3ph()
 
         # retrieval
-        mock_pgm_array.__getitem__.assert_any_call("loading")
+        assert "loading" not in mock_pgm_array.__getitem__.call_args_list, (
+            "The convention for loading differs between PGM and PP and the PGM loading therefore should not be used "
+            "for conversion to PP."
+        )
 
         # result
         converter.pp_output_data.__setitem__.assert_called_once_with("res_trafo_3ph", mock_pp_df.return_value)

tests/validation/converters/test_pandapower_converter_output.py

@@ -15,7 +15,7 @@
 from power_grid_model_io.converters import PandaPowerConverter
 from power_grid_model_io.converters.pandapower_converter import PandaPowerData
 
-from ...data.pandapower.pp_validation import pp_net, pp_net_3ph
+from ...data.pandapower.pp_validation import pp_net, pp_net_3ph, pp_net_3ph_minimal_trafo
 from ..utils import component_attributes_df, load_json_single_dataset
 
 pp = pytest.importorskip("pandapower", reason="pandapower is not installed")
@@ -51,10 +51,8 @@ def load_and_convert_pgm_data_3ph() -> PandaPowerData:
     """
     Load and convert the power_grid_model results
     """
-    data, extra_info = load_json_single_dataset(PGM_ASYM_OUTPUT_FILE, data_type="asym_output")
-    # trafo_loading = "power", as validation data is based on power based loading
+    data, _ = load_json_single_dataset(PGM_ASYM_OUTPUT_FILE, data_type="asym_output")
     converter = PandaPowerConverter(trafo_loading="power")
-    # if pp_input_data is not present in converter, some convert functions may fail.
     converter.load_input_data(load_validation_data_3ph(), make_extra_info=False)
     return converter.convert(data=data)
 
@@ -129,6 +127,74 @@ def test_generate_output_3ph():  # TODO: REMOVE THIS FUNCTION
         json_converter.save(data=output_data_asym, extra_info=extra_info)
 
 
+def test_output_trafos_3ph__power__with_comparison():
+    import numpy as np
+
+    def check_result(net):
+        v_hv = net.trafo.vn_hv_kv
+        v_lv = net.trafo.vn_lv_kv
+        i_max_hv = np.divide(net.trafo.sn_mva, v_hv * np.sqrt(3)) * 1e3
+        i_max_lv = np.divide(net.trafo.sn_mva, v_lv * np.sqrt(3)) * 1e3
+
+        i_a_hv = net.res_trafo_3ph.loc[:, "i_a_hv_ka"] * 1000
+        i_b_hv = net.res_trafo_3ph.loc[:, "i_b_hv_ka"] * 1000
+        i_c_hv = net.res_trafo_3ph.loc[:, "i_c_hv_ka"] * 1000
+
+        i_a_lv = net.res_trafo_3ph.loc[:, "i_a_lv_ka"] * 1000
+        i_b_lv = net.res_trafo_3ph.loc[:, "i_b_lv_ka"] * 1000
+        i_c_lv = net.res_trafo_3ph.loc[:, "i_c_lv_ka"] * 1000
+
+        np.testing.assert_allclose(
+            np.maximum(i_a_hv / i_max_hv, i_a_lv / i_max_lv) * 100, net.res_trafo_3ph.loading_a_percent
+        )
+        np.testing.assert_allclose(
+            np.maximum(i_b_hv / i_max_hv, i_b_lv / i_max_lv) * 100, net.res_trafo_3ph.loading_b_percent
+        )
+        np.testing.assert_allclose(
+            np.maximum(i_c_hv / i_max_hv, i_c_lv / i_max_lv) * 100, net.res_trafo_3ph.loading_c_percent
+        )
+
+    def compare_result(actual, expected, *, rtol):
+        np.testing.assert_allclose(actual.trafo.vn_hv_kv, expected.trafo.vn_hv_kv, rtol=rtol)
+        np.testing.assert_allclose(actual.trafo.vn_lv_kv, expected.trafo.vn_lv_kv, rtol=rtol)
+        np.testing.assert_allclose(actual.trafo.sn_mva, expected.trafo.sn_mva, rtol=rtol)
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loc[:, "i_a_hv_ka"], expected.res_trafo_3ph.loc[:, "i_a_hv_ka"], rtol=rtol
+        )
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loc[:, "i_b_hv_ka"], expected.res_trafo_3ph.loc[:, "i_b_hv_ka"], rtol=rtol
+        )
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loc[:, "i_c_hv_ka"], expected.res_trafo_3ph.loc[:, "i_c_hv_ka"], rtol=rtol
+        )
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loc[:, "i_a_lv_ka"], expected.res_trafo_3ph.loc[:, "i_a_lv_ka"], rtol=rtol
+        )
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loc[:, "i_b_lv_ka"], expected.res_trafo_3ph.loc[:, "i_b_lv_ka"], rtol=rtol
+        )
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loc[:, "i_c_lv_ka"], expected.res_trafo_3ph.loc[:, "i_c_lv_ka"], rtol=rtol
+        )
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loading_a_percent, expected.res_trafo_3ph.loading_a_percent, rtol=rtol
+        )
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loading_b_percent, expected.res_trafo_3ph.loading_b_percent, rtol=rtol
+        )
+        np.testing.assert_allclose(
+            actual.res_trafo_3ph.loading_c_percent, expected.res_trafo_3ph.loading_c_percent, rtol=rtol
+        )
+
+    pgm_net = pp_net_3ph_minimal_trafo()
+    pp_net = pp_net_3ph_minimal_trafo()
+    pp.runpp_pgm(pgm_net, symmetric=False)
+    pp.runpp_3ph(pp_net)
+    check_result(pgm_net)
+    check_result(pp_net)
+    compare_result(pgm_net, pp_net, rtol=0.04)
+
+
 def test_output_data(output_data: Tuple[PandaPowerData, PandaPowerData]):
     """
     Unit test to preload the expected and actual data
@@ -166,6 +232,7 @@ def test_attributes(output_data: Tuple[PandaPowerData, PandaPowerData], componen
     # Assert
     pd.testing.assert_series_equal(actual_values, expected_values, atol=5e-4, rtol=1e-4)
 
+
 # The following test only works for those components where valid data is returned by
 # load_and_convert_pgm_data_3ph. since this is failing for trafo_output_3ph (returning
 # from first "if", this function's output is not being tested currently.