GridCalEngine 5.1.36__tar.gz → 5.1.37__tar.gz

{GridCalEngine-5.1.36 → GridCalEngine-5.1.37}/GridCalEngine/Devices/Branches/line.py

@@ -394,33 +394,43 @@ class Line(BranchParent):
         elm.temperature_prof = self.temp_oper_prof
         return elm
 
-    def fill_design_properties(self, r_ohm, x_ohm, c_nf, length, Imax, freq, Sbase):
+    def fill_design_properties(self, r_ohm, x_ohm, c_nf, length, Imax, freq, Sbase, apply_to_profile: bool = True,):
         """
         Fill R, X, B from not-in-per-unit parameters
-        :param r_ohm: Resistance per km in OHM
-        :param x_ohm: Reactance per km in OHM
-        :param c_nf: Capacitance per km in nF
+        :param r_ohm: Resistance per km in OHM/km
+        :param x_ohm: Reactance per km in OHM/km
+        :param c_nf: Capacitance per km in nF/km
         :param length: lenght in kn
         :param Imax: Maximum current in kA
         :param freq: System frequency in Hz
         :param Sbase: Base power in MVA (take always 100 MVA)
+        :param apply_to_profile: modify the profile is checked
         """
-        R = r_ohm * length
-        X = x_ohm * length
-        # impedance = 1 / (2 * pi * f * c), susceptance = (2 * pi * f * c)
-        B = (2 * np.pi * freq * c_nf * 1e-9) * length
+        r_ohm_total = r_ohm * length
+        x_ohm_total = x_ohm * length
+        # impedance = 1 / (2 * pi * f * c),
+        # susceptance = (2 * pi * f * c)
+        b_siemens_total = (2 * np.pi * freq * c_nf * 1e-9) * length
 
         Vf = self.get_max_bus_nominal_voltage()
 
         Zbase = (Vf * Vf) / Sbase
         Ybase = 1.0 / Zbase
 
-        self.R = np.round(R / Zbase, 6)
-        self.X = np.round(X / Zbase, 6)
-        self.B = np.round(B / Ybase, 6)
-        self.rate = np.round(Imax * Vf * 1.73205080757, 6)  # nominal power in MVA = kA * kV * sqrt(3)
+        self.R = np.round(r_ohm_total / Zbase, 6)
+        self.X = np.round(x_ohm_total / Zbase, 6)
+        self.B = np.round(b_siemens_total / Ybase, 6)
+
+        old_rate = float(self.rate)
+        new_rate = np.round(Imax * Vf * 1.73205080757, 6)  # nominal power in MVA = kA * kV * sqrt(3)
+
+        self.rate = new_rate
         self.length = length
 
+        if apply_to_profile:
+            prof_old = self.rate_prof.toarray()
+            self.rate_prof.set(prof_old * new_rate / old_rate)
+
     def get_virtual_taps(self) -> Tuple[float, float]:
         """
         Get the branch virtual taps

{GridCalEngine-5.1.36 → GridCalEngine-5.1.37}/GridCalEngine/Devices/Branches/overhead_line_type.py

@@ -123,12 +123,12 @@ class OverheadLineType(EditableDevice):
 
         self.register(key='earth_resistivity', units='Ohm/m3', tpe=float, definition='Earth resistivity')
         self.register(key='frequency', units='Hz', tpe=float, definition='Frequency')
-        self.register(key='R1', units='Ohm/km', tpe=float, definition='Positive sequence resistance')
-        self.register(key='X1', units='Ohm/km', tpe=float, definition='Positive sequence reactance')
-        self.register(key='Bsh1', units='uS/km', tpe=float, definition='Positive sequence shunt susceptance')
-        self.register(key='R0', units='Ohm/km', tpe=float, definition='Zero-sequence resistance')
-        self.register(key='X0', units='Ohm/km', tpe=float, definition='Zero sequence reactance')
-        self.register(key='Bsh0', units='uS/km', tpe=float, definition='Zero sequence shunt susceptance')
+        self.register(key='R1', units='Ohm/Km', tpe=float, definition='Positive sequence resistance')
+        self.register(key='X1', units='Ohm/Km', tpe=float, definition='Positive sequence reactance')
+        self.register(key='Bsh1', units='uS/Km', tpe=float, definition='Positive sequence shunt susceptance')
+        self.register(key='R0', units='Ohm/Km', tpe=float, definition='Zero-sequence resistance')
+        self.register(key='X0', units='Ohm/Km', tpe=float, definition='Zero sequence reactance')
+        self.register(key='Bsh0', units='uS/Km', tpe=float, definition='Zero sequence shunt susceptance')
         self.register(key='Imax', units='kA', tpe=float, definition='Current rating of the tower', old_names=['rating'])
         self.register(key='Vnom', units='kV', tpe=float, definition='Voltage rating of the line')
 
@@ -382,9 +382,9 @@ def z_ii(r_i, x_i, h_i, gmr_i, f, rho):
     """
     w = 2 * pi * f  # rad
 
-    mu_0 = 4 * pi * 1e-4  # H/km
+    mu_0 = 4 * pi * 1e-4  # H/Km
 
-    mu_0_2pi = 2e-4  # H/km
+    mu_0_2pi = 2e-4  # H/Km
 
     p = sqrt(rho / (1j * w * mu_0))
 
@@ -408,9 +408,9 @@ def z_ij(x_i, x_j, h_i, h_j, d_ij, f, rho):
     """
     w = 2 * pi * f  # rad
 
-    mu_0 = 4 * pi * 1e-4  # H/km
+    mu_0 = 4 * pi * 1e-4  # H/Km
 
-    mu_0_2pi = 2e-4  # H/km
+    mu_0_2pi = 2e-4  # H/Km
 
     p = sqrt(rho / (1j * w * mu_0))
 
@@ -585,11 +585,11 @@ def calc_y_matrix(wires: list, f=50, rho=100):
     # dictionary with the wire indices per phase
     phases_set = set()
 
-    # 1 / (2 * pi * e0) in km/F
+    # 1 / (2 * pi * e0) in Km/F
     e_air = 1.00058986
-    e_0 = 8.854187817e-9  # F/km
+    e_0 = 8.854187817e-9  # F/Km
     e = e_0 * e_air
-    one_two_pi_e0 = 1 / (2 * pi * e)  # km/F
+    one_two_pi_e0 = 1 / (2 * pi * e)  # Km/F
 
     phases_abcn = np.zeros(n, dtype=int)
 

{GridCalEngine-5.1.36 → GridCalEngine-5.1.37}/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.1.36"
+__GridCalEngine_VERSION__ = "5.1.37"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.36 → GridCalEngine-5.1.37}/PKG-INFO

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