LightSim2Grid 0.9.0__tar.gz → 0.9.2__tar.gz

{lightsim2grid-0.9.0 → lightsim2grid-0.9.2/LightSim2Grid.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: LightSim2Grid
-Version: 0.9.0
+Version: 0.9.2
 Summary: LightSim2Grid implements a c++ backend targeting the Grid2Op platform.
-Home-page: https://github.com/BDonnot/lightsim2grid/
+Home-page: https://github.com/grid2op/lightsim2grid/
 Author: Benjamin Donnot
 Author-email: benjamin.donnot@rte-france.com
 License: MPL 2.0
@@ -272,7 +272,7 @@ If you use this package in one of your work, please cite:
     year = {2020},
     publisher = {GitHub},
     journal = {GitHub repository},
-    howpublished = {\url{https://GitHub.com/bdonnot/lightsim2grid}},
+    howpublished = {\url{https://GitHub.com/Grid2Op/lightsim2grid}},
 }
 ```
 
@@ -328,7 +328,7 @@ using the Newton-Raphson algorithm, with a single slack bus, without enforcing q
 **NB** to run these tests you need to install grid2op from source otherwise all the test of the LightSim2gridBackend 
 will fail. In order to do so you can do:
 ```
-git clone https://github.com/rte-france/Grid2Op.git
+git clone https://github.com/Grid2Op/grid2op.git
 cd Grid2Op
 pip3 install -U -e .
 cd ..

{lightsim2grid-0.9.0 → lightsim2grid-0.9.2}/LightSim2Grid.egg-info/SOURCES.txt

@@ -497,6 +497,7 @@ lightsim2grid/gridmodel/from_pandapower/_aux_add_slack.py
 lightsim2grid/gridmodel/from_pandapower/_aux_add_storage.py
 lightsim2grid/gridmodel/from_pandapower/_aux_add_trafo.py
 lightsim2grid/gridmodel/from_pandapower/_aux_check_legit.py
+lightsim2grid/gridmodel/from_pandapower/_my_const.py
 lightsim2grid/gridmodel/from_pandapower/_pp_bus_to_ls_bus.py
 lightsim2grid/gridmodel/from_pandapower/initGridModel.py
 lightsim2grid/gridmodel/from_pypowsybl/__init__.py

{lightsim2grid-0.9.0/LightSim2Grid.egg-info → lightsim2grid-0.9.2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: LightSim2Grid
-Version: 0.9.0
+Version: 0.9.2
 Summary: LightSim2Grid implements a c++ backend targeting the Grid2Op platform.
-Home-page: https://github.com/BDonnot/lightsim2grid/
+Home-page: https://github.com/grid2op/lightsim2grid/
 Author: Benjamin Donnot
 Author-email: benjamin.donnot@rte-france.com
 License: MPL 2.0
@@ -272,7 +272,7 @@ If you use this package in one of your work, please cite:
     year = {2020},
     publisher = {GitHub},
     journal = {GitHub repository},
-    howpublished = {\url{https://GitHub.com/bdonnot/lightsim2grid}},
+    howpublished = {\url{https://GitHub.com/Grid2Op/lightsim2grid}},
 }
 ```
 
@@ -328,7 +328,7 @@ using the Newton-Raphson algorithm, with a single slack bus, without enforcing q
 **NB** to run these tests you need to install grid2op from source otherwise all the test of the LightSim2gridBackend 
 will fail. In order to do so you can do:
 ```
-git clone https://github.com/rte-france/Grid2Op.git
+git clone https://github.com/Grid2Op/grid2op.git
 cd Grid2Op
 pip3 install -U -e .
 cd ..

{lightsim2grid-0.9.0 → lightsim2grid-0.9.2}/README.md

@@ -213,7 +213,7 @@ If you use this package in one of your work, please cite:
     year = {2020},
     publisher = {GitHub},
     journal = {GitHub repository},
-    howpublished = {\url{https://GitHub.com/bdonnot/lightsim2grid}},
+    howpublished = {\url{https://GitHub.com/Grid2Op/lightsim2grid}},
 }
 ```
 
@@ -269,7 +269,7 @@ using the Newton-Raphson algorithm, with a single slack bus, without enforcing q
 **NB** to run these tests you need to install grid2op from source otherwise all the test of the LightSim2gridBackend 
 will fail. In order to do so you can do:
 ```
-git clone https://github.com/rte-france/Grid2Op.git
+git clone https://github.com/Grid2Op/grid2op.git
 cd Grid2Op
 pip3 install -U -e .
 cd ..

{lightsim2grid-0.9.0 → lightsim2grid-0.9.2}/lightsim2grid/__init__.py

@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: MPL-2.0
 # This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
 
-__version__ = "0.9.0"
+__version__ = "0.9.2"
 
 __all__ = ["newtonpf", "SolverType", "ErrorType", "solver", "compilation_options"]
 

{lightsim2grid-0.9.0 → lightsim2grid-0.9.2}/lightsim2grid/elements/__init__.py

@@ -6,29 +6,33 @@
 # SPDX-License-Identifier: MPL-2.0
 # This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
 
-__all__ = ["DataGen",
+__all__ = ["GeneratorContainer",
            "GenInfo",
-           "DataSGen",
+           "SGenContainer",
            "SGenInfo",
-           "DataLoad",
+           "LoadContainer",
            "LoadInfo",
-           "DataShunt",
+           "ShuntContainer",
            "ShuntInfo",
-           "DataTrafo",
+           "TrafoContainer",
            "TrafoInfo",
-           "DataLine",
+           "LineContainer",
            "LineInfo",
+           "DCLineContainer",
+           "DCLineInfo",
            ]
 
-from lightsim2grid_cpp import DataGen
+from lightsim2grid_cpp import GeneratorContainer
 from lightsim2grid_cpp import GenInfo
-from lightsim2grid_cpp import DataSGen
+from lightsim2grid_cpp import SGenContainer
 from lightsim2grid_cpp import SGenInfo
-from lightsim2grid_cpp import DataLoad
+from lightsim2grid_cpp import LoadContainer
 from lightsim2grid_cpp import LoadInfo
-from lightsim2grid_cpp import DataShunt
+from lightsim2grid_cpp import ShuntContainer
 from lightsim2grid_cpp import ShuntInfo
-from lightsim2grid_cpp import DataTrafo
+from lightsim2grid_cpp import TrafoContainer
 from lightsim2grid_cpp import TrafoInfo
-from lightsim2grid_cpp import DataLine
+from lightsim2grid_cpp import LineContainer
 from lightsim2grid_cpp import LineInfo
+from lightsim2grid_cpp import DCLineContainer
+from lightsim2grid_cpp import DCLineInfo

lightsim2grid-0.9.2/lightsim2grid/gridmodel/from_pandapower/_aux_add_line.py

@@ -0,0 +1,73 @@
+# Copyright (c) 2020-2023, RTE (https://www.rte-france.com)
+# See AUTHORS.txt
+# This Source Code Form is subject to the terms of the Mozilla Public License, version 2.0.
+# If a copy of the Mozilla Public License, version 2.0 was not distributed with this file,
+# you can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+# This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
+
+import numpy as np
+from packaging import version
+import pandapower as pp
+
+from ._pp_bus_to_ls_bus import pp_bus_to_ls
+from ._my_const import _MIN_PP_VERSION_ADV_GRID_MODEL
+
+def _aux_add_line(converter, model, pp_net, pp_to_ls=None):
+    """
+    Add the lines of the pp_net into the lightsim2grid "model"
+
+    Parameters
+    ----------
+    converter
+    model
+    pp_net
+
+    Returns
+    -------
+
+    """
+    if "parallel" in pp_net.line and np.any(pp_net.line["parallel"].values != 1):
+        raise RuntimeError("Cannot handle 'parallel' lines columns. Please duplicate the rows if that is the case. "
+                           "Some pp_net.line[\"parallel\"] != 1 it is not handled by lightsim yet.")
+
+    #### find the right powerline parameters
+    if version.parse(pp.__version__) >= _MIN_PP_VERSION_ADV_GRID_MODEL:
+        # new pandapower with support for different h at both side
+        line_r, line_x, line_h_or, line_h_ex = \
+            converter.get_line_param(
+                pp_net.line["r_ohm_per_km"].values * pp_net.line["length_km"].values,
+                pp_net.line["x_ohm_per_km"].values * pp_net.line["length_km"].values,
+                pp_net.line["g_us_per_km"].values * pp_net.line["length_km"].values,
+                pp_net.line["c_nf_per_km"].values * pp_net.line["length_km"].values,
+                pp_net.bus.loc[pp_net.line["from_bus"]]["vn_kv"], 
+                pp_net.bus.loc[pp_net.line["to_bus"]]["vn_kv"], 
+                )
+
+        ### add them to the grid
+        model.init_powerlines_full(line_r, line_x, line_h_or, line_h_ex,
+                                   pp_bus_to_ls(pp_net.line["from_bus"].values, pp_to_ls),
+                                   pp_bus_to_ls(pp_net.line["to_bus"].values, pp_to_ls)
+                                  )
+        
+    else:
+        # legacy pandapower, when they did not support lines with different h both side
+        line_r, line_x, line_h = \
+            converter.get_line_param_legacy(
+                pp_net.line["r_ohm_per_km"].values * pp_net.line["length_km"].values,
+                pp_net.line["x_ohm_per_km"].values * pp_net.line["length_km"].values,
+                pp_net.line["g_us_per_km"].values * pp_net.line["length_km"].values,
+                pp_net.line["c_nf_per_km"].values * pp_net.line["length_km"].values,
+                pp_net.bus.loc[pp_net.line["from_bus"]]["vn_kv"], 
+                pp_net.bus.loc[pp_net.line["to_bus"]]["vn_kv"], 
+                )
+
+        ### add them to the grid
+        model.init_powerlines(line_r, line_x, line_h,
+                              pp_bus_to_ls(pp_net.line["from_bus"].values, pp_to_ls),
+                              pp_bus_to_ls(pp_net.line["to_bus"].values, pp_to_ls)
+                              )
+    for line_id, is_connected in enumerate(pp_net.line["in_service"].values):
+        if not is_connected:
+            # powerline is deactivated
+            model.deactivate_powerline(line_id)

{lightsim2grid-0.9.0 → lightsim2grid-0.9.2}/lightsim2grid/gridmodel/from_pandapower/_aux_add_trafo.py

@@ -8,8 +8,11 @@
 
 import warnings
 import numpy as np
-from ._pp_bus_to_ls_bus import pp_bus_to_ls
+import pandapower as pp
+from packaging import version
 
+from ._pp_bus_to_ls_bus import pp_bus_to_ls
+from ._my_const import _MIN_PP_VERSION_ADV_GRID_MODEL
 
 def _aux_add_trafo(converter, model, pp_net, pp_to_ls):
     """
@@ -69,30 +72,57 @@ def _aux_add_trafo(converter, model, pp_net, pp_to_ls):
     tap_angles_ = np.deg2rad(tap_angles_)
 
     # compute physical parameters
-    trafo_r, trafo_x, trafo_b = \
-        converter.get_trafo_param(tap_step_pct,
-                                  tap_pos,
-                                  tap_angles_,  # in radian !
-                                  is_tap_hv_side,
-                                  pp_net.bus.loc[pp_net.trafo["hv_bus"]]["vn_kv"],
-                                  pp_net.bus.loc[pp_net.trafo["lv_bus"]]["vn_kv"],
-                                  pp_net.trafo["vk_percent"].values,
-                                  pp_net.trafo["vkr_percent"].values,
-                                  pp_net.trafo["sn_mva"].values,
-                                  pp_net.trafo["pfe_kw"].values,
-                                  pp_net.trafo["i0_percent"].values,
-                                  )
-
-    # initialize the grid
-    model.init_trafo(trafo_r,
-                     trafo_x,
-                     trafo_b,
-                     tap_step_pct,
-                     tap_pos,
-                     shift_,
-                     is_tap_hv_side,
-                     pp_bus_to_ls(pp_net.trafo["hv_bus"].values, pp_to_ls),
-                     pp_bus_to_ls(pp_net.trafo["lv_bus"].values, pp_to_ls))
+    if version.parse(pp.__version__) >= _MIN_PP_VERSION_ADV_GRID_MODEL:
+        # TODO
+        trafo_r, trafo_x, trafo_b = \
+            converter.get_trafo_param(tap_step_pct,
+                                      tap_pos,
+                                      tap_angles_,  # in radian !
+                                      is_tap_hv_side,
+                                      pp_net.bus.loc[pp_net.trafo["hv_bus"]]["vn_kv"],
+                                      pp_net.bus.loc[pp_net.trafo["lv_bus"]]["vn_kv"],
+                                      pp_net.trafo["vk_percent"].values,
+                                      pp_net.trafo["vkr_percent"].values,
+                                      pp_net.trafo["sn_mva"].values,
+                                      pp_net.trafo["pfe_kw"].values,
+                                      pp_net.trafo["i0_percent"].values,
+                                      )
+
+        # initialize the grid
+        model.init_trafo(trafo_r,
+                        trafo_x,
+                        trafo_b,
+                        tap_step_pct,
+                        tap_pos,
+                        shift_,
+                        is_tap_hv_side,
+                        pp_bus_to_ls(pp_net.trafo["hv_bus"].values, pp_to_ls),
+                        pp_bus_to_ls(pp_net.trafo["lv_bus"].values, pp_to_ls))
+    else:
+        trafo_r, trafo_x, trafo_b = \
+            converter.get_trafo_param_legacy(tap_step_pct,
+                                             tap_pos,
+                                             tap_angles_,  # in radian !
+                                             is_tap_hv_side,
+                                             pp_net.bus.loc[pp_net.trafo["hv_bus"]]["vn_kv"],
+                                             pp_net.bus.loc[pp_net.trafo["lv_bus"]]["vn_kv"],
+                                             pp_net.trafo["vk_percent"].values,
+                                             pp_net.trafo["vkr_percent"].values,
+                                             pp_net.trafo["sn_mva"].values,
+                                             pp_net.trafo["pfe_kw"].values,
+                                             pp_net.trafo["i0_percent"].values,
+                                             )
+
+        # initialize the grid
+        model.init_trafo(trafo_r,
+                        trafo_x,
+                        trafo_b,
+                        tap_step_pct,
+                        tap_pos,
+                        shift_,
+                        is_tap_hv_side,
+                        pp_bus_to_ls(pp_net.trafo["hv_bus"].values, pp_to_ls),
+                        pp_bus_to_ls(pp_net.trafo["lv_bus"].values, pp_to_ls))
 
     for tr_id, is_connected in enumerate(pp_net.trafo["in_service"].values):
         if not is_connected:

lightsim2grid-0.9.2/lightsim2grid/gridmodel/from_pandapower/_my_const.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+# See AUTHORS.txt
+# This Source Code Form is subject to the terms of the Mozilla Public License, version 2.0.
+# If a copy of the Mozilla Public License, version 2.0 was not distributed with this file,
+# you can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+# This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
+
+from packaging import version
+# pandapower version with more advanced grid modelling
+_MIN_PP_VERSION_ADV_GRID_MODEL = version.parse("2.15")