GridCalEngine 5.3.11__tar.gz → 5.3.12__tar.gz

{gridcalengine-5.3.11 → gridcalengine-5.3.12}/GridCalEngine/Devices/Branches/line_locations.py

@@ -68,7 +68,7 @@ class LineLocations(EditableDevice):
         """
         Constructor
         :param name: Name
-        :param idtag: unique identifyer
+        :param idtag: unique identifier
         :param code: secondary code
         """
         EditableDevice.__init__(self,

{gridcalengine-5.3.11 → gridcalengine-5.3.12}/GridCalEngine/Devices/Branches/transformer_type.py

@@ -283,7 +283,7 @@ def get_impedances(VH_bus: float, VL_bus: float, Sn: float, HV: float, LV: float
     :return: Zseries and Yshunt in system per unit
     """
 
-    # Series impedance
+    # Series impedance -------------------------------------------------------------------------------------------------
     zsc = Vsc / 100.0
     rsc = (Pcu / 1000.0) / Sn
     if rsc < zsc:
@@ -294,38 +294,36 @@ def get_impedances(VH_bus: float, VL_bus: float, Sn: float, HV: float, LV: float
     # series impedance in p.u. of the machine
     zs = rsc + 1j * xsc
 
-    # Shunt impedance (leakage)
+    # convert impedances from machine per unit to ohms (HV side)
+    z_base_hv = (HV * HV) / Sn
+    z_series_hv = zs * GR_hv1 * z_base_hv  # Ohm
+    z_base_hv_sys = (VH_bus * VH_bus) / Sbase  # convert impedances from ohms to system per unit
+
+    # convert impedances from machine per unit to ohms (LV side)
+    z_base_lv = (LV * LV) / Sn
+    z_series_lv = zs * (1.0 - GR_hv1) * z_base_lv  # Ohm
+    z_base_lv_sys = (VL_bus * VL_bus) / Sbase  # convert impedances from ohms to system per unit
+
+    z_series = (z_series_hv / z_base_hv_sys) + (z_series_lv / z_base_lv_sys)
+
+    # Shunt impedance (leakage) ----------------------------------------------------------------------------------------
     if Pfe > 0.0 and I0 > 0.0:
 
-        # rfe = Sn / (Pfe / 1000.0)
         rm = Sbase / (Pfe / 1000.0)
-        I0 = I0 * Sn / Sbase
-        zm = 1.0 / (I0 / 100.0)
+        zm = (100.0 * Sbase) / (I0 * Sn)
 
         if zm < rm:  # only with this is possible to perform xm, otherwise we get div0 or sqrt(neg)
-            inside_sqrt = (-zm ** 2 * rm ** 2) / (zm ** 2 - rm ** 2)
-            xm = sqrt(inside_sqrt)
+            xm = sqrt((-zm ** 2 * rm ** 2) / (zm ** 2 - rm ** 2))
         else:
             xm = 0.0
     else:
         rm = 0.0
         xm = 0.0
 
-    # convert impedances from machine per unit to ohms
-    z_base_hv = (HV * HV) / Sn
-    z_base_lv = (LV * LV) / Sn
-
-    z_series_hv = zs * GR_hv1 * z_base_hv  # Ohm
-    z_series_lv = zs * (1.0 - GR_hv1) * z_base_lv  # Ohm
-
-    # convert impedances from ohms to system per unit
-    z_base_hv_sys = (VH_bus * VH_bus) / Sbase
-    z_base_lv_sys = (VL_bus * VL_bus) / Sbase
-
-    z_series = z_series_hv / z_base_hv_sys + z_series_lv / z_base_lv_sys
+    g = 1.0 / rm if rm > 0.0 else 0.0
+    b = 1.0 / xm if xm > 0.0 else 0.0
 
-    g = 1 / rm if rm > 0.0 else 0.0
-    b = 1 / xm if xm > 0.0 else 0.0
+    # observe that we don't need to convert y_shunt to the system base since it is already
     y_shunt = g - 1j * b
 
     return z_series, y_shunt

{gridcalengine-5.3.11 → gridcalengine-5.3.12}/GridCalEngine/Devices/multi_circuit.py

@@ -1827,6 +1827,18 @@ class MultiCircuit(Assets):
         """
         logger = Logger()
 
+        if self.Sbase!= grid2.Sbase:
+            logger.add_error(msg="Different Sbase",
+                             device_class="time",
+                             value=grid2.Sbase,
+                             expected_value=self.Sbase)
+
+        if self.fBase != grid2.fBase:
+            logger.add_error(msg="Different fBase",
+                             device_class="time",
+                             value=grid2.fBase,
+                             expected_value=self.fBase)
+
         if self.get_time_number() != grid2.get_time_number():
             nt = 0
             logger.add_error(msg="Different number of time steps",

{gridcalengine-5.3.11 → gridcalengine-5.3.12}/GridCalEngine/IO/gridcal/generic_io_functions.py

@@ -10,8 +10,10 @@ def parse_config_df(df, data=None):
     if data is None:
         data = dict()
 
-    if 'baseMVA' in df.index:
-        data["baseMVA"] = float(df.at['name', 'Value'])
+    if 'BaseMVA' in df.index:
+        data["baseMVA"] = float(df.at['BaseMVA', 'Value'])
+    elif 'baseMVA' in df.index:
+        data["baseMVA"] = float(df.at['baseMVA', 'Value'])
     else:
         data["baseMVA"] = 100
 

{gridcalengine-5.3.11 → gridcalengine-5.3.12}/GridCalEngine/IO/gridcal/remote.py

@@ -3,8 +3,6 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 import os
-import requests
-import asyncio
 from typing import Dict, Union, Any
 from uuid import uuid4, getnode
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
@@ -13,6 +11,14 @@ from GridCalEngine.basic_structures import Logger
 from GridCalEngine.IO.gridcal.pack_unpack import gather_model_as_jsons
 from GridCalEngine.IO.file_system import get_create_gridcal_folder
 
+try:
+    import requests
+
+    REQUESTS_AVAILABLE = True
+except AttributeError as e:
+    print(f"GridCalEngine/IO/gridcal/remote.py: Error with requests -> {e}")
+    REQUESTS_AVAILABLE = False
+
 
 class RemoteInstruction:
     """
@@ -142,32 +148,36 @@ def get_certificate(base_url: str, certificate_path: str, pwd: str, logger: Logg
     :return: ok?
     """
     # Make a GET request to the root endpoint
-    try:
-        response = requests.get(f"{base_url}/get_cert",
-                                headers={"API-Key": pwd},
-                                verify=False,
-                                timeout=2)
-
-        # Save the certificate to a file
-
-        with open(certificate_path, "wb") as cert_file:
-            cert_file.write(response.content)
-
-        # Check if the request was successful
-        if response.status_code == 200:
-            # Print the response body
-            # print("Response Body:", response.json())
-            # self.data_model.parse_data(data=response.json())
-            return True
-        else:
-            # Print error message
-            logger.add_error(msg=f"Response error", value=response.text)
+    if REQUESTS_AVAILABLE:
+        try:
+            response = requests.get(f"{base_url}/get_cert",
+                                    headers={"API-Key": pwd},
+                                    verify=False,
+                                    timeout=2)
+
+            # Save the certificate to a file
+
+            with open(certificate_path, "wb") as cert_file:
+                cert_file.write(response.content)
+
+            # Check if the request was successful
+            if response.status_code == 200:
+                # Print the response body
+                # print("Response Body:", response.json())
+                # self.data_model.parse_data(data=response.json())
+                return True
+            else:
+                # Print error message
+                logger.add_error(msg=f"Response error", value=response.text)
+                return False
+        except ConnectionError as e:
+            logger.add_error(msg=f"Connection error", value=str(e))
             return False
-    except ConnectionError as e:
-        logger.add_error(msg=f"Connection error", value=str(e))
-        return False
-    except Exception as e:
-        logger.add_error(msg=f"General exception error", value=str(e))
+        except Exception as e:
+            logger.add_error(msg=f"General exception error", value=str(e))
+            return False
+    else:
+        logger.add_error(msg=f"requests not available due to an error on import")
         return False
 
 
@@ -195,8 +205,8 @@ def gather_model_as_jsons_for_communication(circuit: MultiCircuit,
 
 
 async def send_json_data(json_data: Dict[str, Union[str, Dict[str, Dict[str, str]]]],
-                   endpoint_url: str,
-                   certificate: str) -> Any:
+                         endpoint_url: str,
+                         certificate: str) -> Any:
     """
     Send a file along with instructions about the file
     :param json_data: Json with te model
@@ -205,12 +215,15 @@ async def send_json_data(json_data: Dict[str, Union[str, Dict[str, Dict[str, str
     :return service response
     """
 
-    response = requests.post(
-        url=endpoint_url,
-        json=json_data,
-        stream=True,
-        verify=certificate
-    )
-
-    # return server response
-    return response.json()
+    if REQUESTS_AVAILABLE:
+        response = requests.post(
+            url=endpoint_url,
+            json=json_data,
+            stream=True,
+            verify=certificate
+        )
+
+        # return server response
+        return response.json()
+    else:
+        print(f"Requests not available due to an error on import")

{gridcalengine-5.3.11 → gridcalengine-5.3.12}/GridCalEngine/Simulations/PowerFlow/NumericalMethods/levenberg_marquadt_fx.py

@@ -98,8 +98,8 @@ def levenberg_marquardt_fx(problem: PfFormulationTemplate,
                     lbmda = 1e-3 * HtH.diagonal().max()
 
                 # compute system matrix A = H^T·H - lambda·I
-                Idn = sp.diags(np.ones(H.shape[0]))
-                A = (HtH + lbmda * Idn).tocsc()
+                Idn = sp.diags(np.full(H.shape[0], lbmda))
+                A = (HtH + Idn).tocsc()
 
             # right-hand side
             # H^t·dz

{gridcalengine-5.3.11 → gridcalengine-5.3.12}/GridCalEngine/__version__.py

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

{gridcalengine-5.3.11 → gridcalengine-5.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.3.11
+Version: 5.3.12
 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.