GridCalEngine 5.0.0a13__tar.gz → 5.0.0a15__tar.gz

{GridCalEngine-5.0.0a13 → GridCalEngine-5.0.0a15}/GridCalEngine/Core/Compilers/circuit_to_data.py

@@ -47,6 +47,7 @@ def get_bus_data(circuit: MultiCircuit,
         bus_data.idtag[i] = bus.idtag
         bus_data.Vmin[i] = bus.Vmin
         bus_data.Vmax[i] = bus.Vmax
+        bus_data.Vnom[i] = bus.Vnom
         bus_data.Vbus[i] = bus.get_voltage_guess(None, use_stored_guess=use_stored_guess)
 
         bus_data.angle_min[i] = bus.angle_min

{GridCalEngine-5.0.0a13 → GridCalEngine-5.0.0a15}/GridCalEngine/Core/Compilers/circuit_to_newton_pa.py

@@ -840,7 +840,7 @@ def add_hvdc_data(circuit: MultiCircuit,
                             P=elm.Pset,
                             Vf=elm.Vset_f,
                             Vt=elm.Vset_t,
-                            r=elm.R,
+                            r=elm.r,
                             angle_droop=elm.angle_droop,
                             length=elm.length,
                             min_firing_angle_f=elm.min_firing_angle_f,

{GridCalEngine-5.0.0a13 → GridCalEngine-5.0.0a15}/GridCalEngine/Core/DataStructures/bus_data.py

@@ -35,6 +35,7 @@ class BusData:
         self.Vbus: np.ndarray = np.ones(nbus, dtype=complex)
         self.Vmin: np.ndarray = np.ones(nbus, dtype=float)
         self.Vmax: np.ndarray = np.ones(nbus, dtype=float)
+        self.Vnom: np.ndarray = np.ones(nbus, dtype=float)
         self.angle_min: np.ndarray = np.full(nbus, fill_value=-3.14, dtype=float)
         self.angle_max: np.ndarray = np.full(nbus, fill_value=3.14, dtype=float)
         self.bus_types: np.ndarray = np.empty(nbus, dtype=int)
@@ -60,6 +61,7 @@ class BusData:
         data.Vbus = self.Vbus[elm_idx]
         data.Vmin = self.Vmin[elm_idx]
         data.Vmax = self.Vmax[elm_idx]
+        data.Vnom = self.Vnom[elm_idx]
         data.angle_min = self.angle_min[elm_idx]
         data.angle_max = self.angle_max[elm_idx]
 
@@ -87,6 +89,7 @@ class BusData:
         data.Vbus = self.Vbus.copy()
         data.Vmin = self.Vmin.copy()
         data.Vmax = self.Vmax.copy()
+        data.Vnom = self.Vnom.copy()
         data.angle_min = self.angle_min.copy()
         data.angle_max = self.angle_max.copy()
 

GridCalEngine-5.0.0a15/GridCalEngine/__init__.py

@@ -0,0 +1,17 @@
+# GridCal
+# Copyright (C) 2015 - 2023 Santiago Peñate Vera
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+

{GridCalEngine-5.0.0a13 → GridCalEngine-5.0.0a15}/GridCalEngine/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.0.0a13"
+__GridCalEngine_VERSION__ = "5.0.0a15"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.0.0a13 → GridCalEngine-5.0.0a15}/GridCalEngine/api.py

@@ -15,30 +15,44 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from typing import Union
-import GridCalEngine as gce
+from GridCalEngine.basic_structures import *
+from GridCalEngine.grid_analysis import *
+from GridCalEngine.Simulations import *
+from GridCalEngine.IO import *
+from GridCalEngine.Core import *
+from GridCalEngine.Core.DataStructures.numerical_circuit import NumericalCircuit, compile_numerical_circuit_at
 
+from ortools.linear_solver import pywraplp
+from ortools.init import pywrapinit
 
-def open_file(filename: str) -> gce.MultiCircuit:
+# pywrapinit.CppBridge.InitLogging('SuggestedFix.py')
+cpp_flags = pywrapinit.CppFlags()
+cpp_flags.logtostderr = True
+cpp_flags.log_prefix = False
+pywrapinit.CppBridge.SetFlags(cpp_flags)
+
+
+def open_file(filename: str) -> MultiCircuit:
     """
     Open file
     :param filename: name of the file (.gridcal, .ejson, .m, etc.)
     :return: MultiCircuit instance
     """
-    return gce.FileOpen(file_name=filename).open()
+    return FileOpen(file_name=filename).open()
 
 
-def save_file(grid: gce.MultiCircuit, filename: str):
+def save_file(grid: MultiCircuit, filename: str):
     """
     Save file
     :param grid: MultiCircuit instance
     :param filename: name of the file (.gridcal, .ejson)
     """
-    gce.FileSave(circuit=grid, file_name=filename).save()
+    FileSave(circuit=grid, file_name=filename).save()
 
 
-def power_flow(grid: gce.MultiCircuit,
-               options: gce.PowerFlowOptions = gce.PowerFlowOptions(),
-               engine=gce.EngineType.GridCal) -> gce.PowerFlowResults:
+def power_flow(grid: MultiCircuit,
+               options: PowerFlowOptions = PowerFlowOptions(),
+               engine=EngineType.GridCal) -> PowerFlowResults:
     """
     Run power flow on the snapshot
     :param grid: MultiCircuit instance
@@ -46,17 +60,17 @@ def power_flow(grid: gce.MultiCircuit,
     :param engine: Engine to run with
     :return: PowerFlowResults instance
     """
-    driver = gce.PowerFlowDriver(grid=grid, options=options, engine=engine)
+    driver = PowerFlowDriver(grid=grid, options=options, engine=engine)
 
     driver.run()
 
     return driver.results
 
 
-def power_flow_ts(grid: gce.MultiCircuit,
-                  options: gce.PowerFlowOptions = gce.PowerFlowOptions(),
-                  time_indices: Union[gce.IntVec, None] = None,
-                  engine=gce.EngineType.GridCal) -> gce.PowerFlowResults:
+def power_flow_ts(grid: MultiCircuit,
+                  options: PowerFlowOptions = PowerFlowOptions(),
+                  time_indices: Union[IntVec, None] = None,
+                  engine=EngineType.GridCal) -> PowerFlowResults:
     """
     Run power flow on the time series
     :param grid: MultiCircuit instance
@@ -70,10 +84,10 @@ def power_flow_ts(grid: gce.MultiCircuit,
     ti = grid.get_all_time_indices() if time_indices is None else time_indices
 
     # create the driver
-    driver = gce.PowerFlowTimeSeriesDriver(grid=grid,
-                                           options=options,
-                                           time_indices=ti,
-                                           engine=engine)
+    driver = PowerFlowTimeSeriesDriver(grid=grid,
+                                       options=options,
+                                       time_indices=ti,
+                                       engine=engine)
     # run
     driver.run()
 

{GridCalEngine-5.0.0a13 → GridCalEngine-5.0.0a15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.0.0a13
+Version: 5.0.0a15
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.

GridCalEngine-5.0.0a13/GridCalEngine/__init__.py

@@ -1,34 +0,0 @@
-# GridCal
-# Copyright (C) 2015 - 2023 Santiago Peñate Vera
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-# from GridCalEngine.Replacements import *
-from GridCalEngine.basic_structures import *
-from GridCalEngine.grid_analysis import *
-from GridCalEngine.Simulations import *
-from GridCalEngine.IO import *
-from GridCalEngine.Core import *
-from GridCalEngine.Core.DataStructures.numerical_circuit import NumericalCircuit, compile_numerical_circuit_at
-
-# from ortools.linear_solver import pywraplp
-# from ortools.init import pywrapinit
-#
-#
-# # pywrapinit.CppBridge.InitLogging('SuggestedFix.py')
-# cpp_flags = pywrapinit.CppFlags()
-# cpp_flags.logtostderr = True
-# cpp_flags.log_prefix = False
-# pywrapinit.CppBridge.SetFlags(cpp_flags)