Merge branch 'refs/heads/devel'

# Conflicts:
#	.idea/workspace.xml

Author: SanPen

Grids_and_profiles/grids/fubm_caseHVDC_vt_mod.gridcal

@@ -210,9 +210,10 @@ def accept_click(self) -> None:
         if length != 0.0:
 
             if self.selected_template is not None:
-                self.line.set_length(val=length, update_electrical_values=False)
+                self.line.disable_auto_updates()
+                self.line.set_length(val=length)
                 self.line.apply_template(obj=self.selected_template, Sbase=self.Sbase)
-
+                self.line.enable_auto_updates()
             else:
                 wf = 2 * np.pi * self.frequency
                 self.line.fill_design_properties(

Grids_and_profiles/grids/fubm_caseHVDC_vt_mod6.gridcal

@@ -105,15 +105,19 @@ def run(self) -> None:
                                 previous_circuit=self._previous_circuit,
                                 options=self.options)
 
-        try:
+        if self.options.crash_on_errors:
             self.circuit = file_handler.open(text_func=self.progress_text.emit,
                                              progress_func=self.progress_signal.emit)
-        except ValueError as e:
-            self.valid = False
-            self.logger.add_error(msg=str(e))
-            self.progress_text.emit('Error loading')
-            self.done_signal.emit()
-            return
+        else:
+            try:
+                self.circuit = file_handler.open(text_func=self.progress_text.emit,
+                                                 progress_func=self.progress_signal.emit)
+            except ValueError as e:
+                self.valid = False
+                self.logger.add_error(msg=str(e))
+                self.progress_text.emit('Error loading')
+                self.done_signal.emit()
+                return
 
         self.json_files = file_handler.json_files
 

src/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_editor.py

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

src/GridCal/Session/file_handler.py

@@ -299,7 +299,7 @@ def get_power(self, Sbase: float, theta: Vec) -> Tuple[Vec, Vec, Vec, Vec, Vec,
                 else:
                     Losses[i] = 0
                     Pf[i] = 0
-                    Pt[0] = 0
+                    Pt[i] = 0
 
                 # compute loading
                 loading[i] = Pf[i] / (self.rate[i] + 1e-20)

src/GridCal/__version__.py

@@ -210,8 +210,6 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None,
 
         self.dc_link_voltage = float(dc_link_voltage)
 
-        # self.n_lines = int(n_lines)
-
         self.angle_droop = float(angle_droop)
 
         self.loss_factor = float(loss_factor)
@@ -245,11 +243,11 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None,
 
         self.control_mode: HvdcControlType = control_mode
 
-        self._Pset_prof: Vec = Profile(default_value=Pset, data_type=float)
-        self._active_prof: IntVec = Profile(default_value=active, data_type=bool)
-        self._Vset_f_prof: Vec = Profile(default_value=Vset_f, data_type=float)
-        self._Vset_t_prof: Vec = Profile(default_value=Vset_t, data_type=float)
-        self._angle_droop_prof: Vec = Profile(default_value=angle_droop, data_type=float)
+        self._Pset_prof: Profile = Profile(default_value=Pset, data_type=float)
+        self._active_prof: Profile = Profile(default_value=active, data_type=bool)
+        self._Vset_f_prof: Profile = Profile(default_value=Vset_f, data_type=float)
+        self._Vset_t_prof: Profile = Profile(default_value=Vset_t, data_type=float)
+        self._angle_droop_prof: Profile = Profile(default_value=angle_droop, data_type=float)
 
         # Line locations
         self._locations: LineLocations = LineLocations()

src/GridCalEngine/DataStructures/hvdc_data.py

@@ -103,17 +103,17 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None, cn_from: Connectivi
         self.fault_pos = float(fault_pos)
 
         # total impedance and admittance in p.u.
-        self.R = float(r)
-        self.X = float(x)
-        self.B = float(b)
+        self._R = float(r)
+        self._X = float(x)
+        self._B = float(b)
 
-        self.R0 = float(r0)
-        self.X0 = float(x0)
-        self.B0 = float(b0)
+        self._R0 = float(r0)
+        self._X0 = float(x0)
+        self._B0 = float(b0)
 
-        self.R2 = float(r2)
-        self.X2 = float(x2)
-        self.B2 = float(b2)
+        self._R2 = float(r2)
+        self._X2 = float(x2)
+        self._B2 = float(b2)
 
         # Conductor base and operating temperatures in ºC
         self.temp_base = float(temp_base)
@@ -146,7 +146,6 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None, cn_from: Connectivi
         self.register(key='tolerance', units='%', tpe=float,
                       definition='Tolerance expected for the impedance values % is expected '
                                  'for transformers0% for lines.')
-
         self.register(key='length', units='km', tpe=float, definition='Length of the line (not used for calculation)')
         self.register(key='temp_base', units='ºC', tpe=float, definition='Base temperature at which R was measured.')
         self.register(key='temp_oper', units='ºC', tpe=float, definition='Operation temperature to modify R.',
@@ -179,6 +178,78 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None, cn_from: Connectivi
                       definition='Possible sequence line types (>1 to denote association), - to denote no association',
                       display=False)
 
+    @property
+    def R(self):
+        return self._R
+
+    @R.setter
+    def R(self, value):
+        self._R = float(value)
+
+    @property
+    def X(self):
+        return self._X
+
+    @X.setter
+    def X(self, value):
+        self._X = float(value)
+
+    @property
+    def B(self):
+        return self._B
+
+    @B.setter
+    def B(self, value):
+        self._B = float(value)
+
+    @property
+    def R0(self):
+        return self._R0
+
+    @R0.setter
+    def R0(self, value):
+        self._R0 = float(value)
+
+    @property
+    def X0(self):
+        return self._X0
+
+    @X0.setter
+    def X0(self, value):
+        self._X0 = float(value)
+
+    @property
+    def B0(self):
+        return self._B0
+
+    @B0.setter
+    def B0(self, value):
+        self._B0 = float(value)
+
+    @property
+    def R2(self):
+        return self._R2
+
+    @R2.setter
+    def R2(self, value):
+        self._R2 = float(value)
+
+    @property
+    def X2(self):
+        return self._X2
+
+    @X2.setter
+    def X2(self, value):
+        self._X2 = float(value)
+
+    @property
+    def B2(self):
+        return self._B2
+
+    @B2.setter
+    def B2(self, value):
+        self._B2 = float(value)
+
     @property
     def length(self) -> float:
         """
@@ -194,18 +265,17 @@ def length(self, val: float):
         :param val:
         :return:
         """
-        self.set_length(val, update_electrical_values=True)
+        self.set_length(val)
 
-    def set_length(self, val: float, update_electrical_values: bool = True):
+    def set_length(self, val: float):
         """
 
         :param val:
-        :param update_electrical_values:
         :return:
         """
         if isinstance(val, float):
             if val > 0.0:
-                if self._length != 0 and update_electrical_values:
+                if self._length != 0 and self.auto_update_enabled:
                     factor = np.round(val / self._length, 6)  # new length / old length
 
                     self.R *= factor
@@ -218,6 +288,7 @@ def set_length(self, val: float, update_electrical_values: bool = True):
                     self.X2 *= factor
                     self.B2 *= factor
 
+                # set the value
                 self._length = val
             else:
                 print('The length cannot be zero, ignoring value')
@@ -408,7 +479,7 @@ def get_equivalent_transformer(self) -> Transformer2W:
         elm.temperature_prof = self.temp_oper_prof
         return elm
 
-    def fill_design_properties(self, r_ohm, x_ohm, c_nf, length, Imax, freq, Sbase, apply_to_profile: bool = True,):
+    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/km

src/GridCalEngine/Devices/Branches/hvdc_line.py

@@ -20,7 +20,7 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None, cn_from: Connectivi
                  r=1e-20, x=1e-20, rate=1.0, active=True, tolerance=0, cost=100.0,
                  mttf=0, mttr=0, r_fault=0.0, x_fault=0.0, fault_pos=0.5,
                  temp_base=20, temp_oper=20, alpha=0.00330,
-                 template=None, contingency_factor=1.0, protection_rating_factor: float = 1.4,
+                 contingency_factor=1.0, protection_rating_factor: float = 1.4,
                  contingency_enabled=True, monitor_loading=True,
                  r0=1e-20, x0=1e-20,  r2=1e-20, x2=1e-20,
                  capex=0, opex=0, build_status: BuildStatus = BuildStatus.Commissioned):
@@ -45,7 +45,6 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None, cn_from: Connectivi
         :param temp_base: Base temperature at which `r` is measured in °C
         :param temp_oper: Operating temperature in °C
         :param alpha: Thermal constant of the material in °C
-        :param template: Basic branch template
         :param contingency_factor: Rating factor in case of contingency
         :param protection_rating_factor: Rating factor before the protections tripping
         :param contingency_enabled: enabled for contingencies (Legacy)

src/GridCalEngine/Devices/Branches/line.py

@@ -13,7 +13,7 @@
 class Switch(BranchParent):
     """
     The **Switch** class represents the connections between nodes (i.e.
-    :ref:`buses<bus>`) in **GridCal**. A Switch is an devices that cuts or allows the flow.
+    :ref:`buses<bus>`) in **GridCal**. A Switch is a devices that cuts or allows the flow.
     """
 
     def __init__(self, bus_from: Bus = None, bus_to: Bus = None,
@@ -22,7 +22,6 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None,
                  rate=1.0,
                  active=True,
                  contingency_factor=1.0, protection_rating_factor: float = 1.4,
-                 # is_open=False,
                  retained=True,
                  normal_open=False,
                  rated_current=0.0):
@@ -81,7 +80,7 @@ def __init__(self, bus_from: Bus = None, bus_to: Bus = None,
 
         self.register(key='normal_open', units="", tpe=bool,
                       definition='Normal position of the switch')
-        self.register(key='rated_current', units="KA", tpe=float,
+        self.register(key='rated_current', units="kA", tpe=float,
                       definition='Rated current of the switch device.')
 
     def copy(self, bus_dict=None):