GridCalEngine 5.3.36__tar.gz → 5.3.38__tar.gz

{gridcalengine-5.3.36 → gridcalengine-5.3.38}/GridCalEngine/Compilers/circuit_to_bentayga.py

@@ -603,17 +603,6 @@ def get_snapshots_from_bentayga(circuit: MultiCircuit):
         data.Qmax_bus_ = btg_data.Qmax_bus
         data.Qmin_bus_ = btg_data.Qmin_bus
 
-        data.k_pf_tau = btg_data.control_indices.k_pf_tau
-        data.k_qf_m = btg_data.control_indices.k_qf_m
-        data.k_zero_beq = btg_data.control_indices.k_qf_beq
-        data.k_vf_beq = btg_data.control_indices.k_vf_beq
-        data.k_vt_m = btg_data.control_indices.k_v_m
-        data.k_qt_m = btg_data.control_indices.k_qt_m
-        data.k_pf_dp = btg_data.control_indices.k_pf_dp
-        data.i_vsc = btg_data.control_indices.i_vsc
-        data.i_vf_beq = btg_data.control_indices.iVfBeqBus
-        data.i_vt_m = btg_data.control_indices.iVtmaBus
-
         data_lst.append(data)
 
     return data_lst

{gridcalengine-5.3.36 → gridcalengine-5.3.38}/GridCalEngine/Compilers/circuit_to_data.py

@@ -1437,7 +1437,6 @@ def set_control_dev(k: int,
                     control_bus_idx: IntVec,
                     control_branch_idx: IntVec,
                     bus_dict: Dict[Bus, int],
-                    branch_dict: Dict[BRANCH_TYPES, int],
                     bus_data: BusData,
                     bus_voltage_used: BoolVec,
                     use_stored_guess: bool,
@@ -1453,7 +1452,6 @@ def set_control_dev(k: int,
     :param control_bus_idx: array to be filled in
     :param control_branch_idx: array to be filled in
     :param bus_dict: dictionary to be filled in
-    :param branch_dict: dictionary to be filled in
     :param bus_data: bus data
     :param bus_voltage_used: used bus voltage
     :param use_stored_guess:
@@ -1570,6 +1568,8 @@ def get_vsc_data(
         data.mttr[i] = elm.mttr
         f = bus_dict[elm.bus_from]
         t = bus_dict[elm.bus_to]
+        data.original_idx[i] = i
+
         data.F[i] = f
         data.T[i] = t
 
@@ -1592,7 +1592,6 @@ def get_vsc_data(
                             control_bus_idx=data.control1_bus_idx,
                             control_branch_idx=data.control1_branch_idx,
                             bus_dict=bus_dict,
-                            branch_dict=branch_dict,
                             bus_data=bus_data,
                             bus_voltage_used=bus_voltage_used,
                             use_stored_guess=use_stored_guess,
@@ -1604,7 +1603,6 @@ def get_vsc_data(
                             control_bus_idx=data.control2_bus_idx,
                             control_branch_idx=data.control2_branch_idx,
                             bus_dict=bus_dict,
-                            branch_dict=branch_dict,
                             bus_data=bus_data,
                             bus_voltage_used=bus_voltage_used,
                             use_stored_guess=use_stored_guess,
@@ -1629,7 +1627,6 @@ def get_vsc_data(
                             control_bus_idx=data.control1_bus_idx,
                             control_branch_idx=data.control1_branch_idx,
                             bus_dict=bus_dict,
-                            branch_dict=branch_dict,
                             bus_data=bus_data,
                             bus_voltage_used=bus_voltage_used,
                             use_stored_guess=use_stored_guess,
@@ -1642,7 +1639,6 @@ def get_vsc_data(
                             control_bus_idx=data.control2_bus_idx,
                             control_branch_idx=data.control2_branch_idx,
                             bus_dict=bus_dict,
-                            branch_dict=branch_dict,
                             bus_data=bus_data,
                             bus_voltage_used=bus_voltage_used,
                             use_stored_guess=use_stored_guess,
@@ -1692,14 +1688,15 @@ def get_hvdc_data(data: HvdcData,
         # generic stuff
         f = bus_dict[elm.bus_from]
         t = bus_dict[elm.bus_to]
+        data.original_idx[i] = i
+        data.dispatchable[i] = int(elm.dispatchable)
+        data.F[i] = f
+        data.T[i] = t
 
         # hvdc values
         data.names[i] = elm.name
         data.idtag[i] = elm.idtag
 
-        data.dispatchable[i] = int(elm.dispatchable)
-        data.F[i] = f
-        data.T[i] = t
 
         if time_series:
             data.active[i] = elm.active_prof[t_idx]
@@ -1785,10 +1782,8 @@ def get_hvdc_data(data: HvdcData,
         data.Vnf[i] = elm.bus_from.Vnom
         data.Vnt[i] = elm.bus_to.Vnom
 
-        data.Qmin_f[i] = elm.Qmin_f
-        data.Qmax_f[i] = elm.Qmax_f
-        data.Qmin_t[i] = elm.Qmin_t
-        data.Qmax_t[i] = elm.Qmax_t
+        (data.Qmin_f[i], data.Qmax_f[i],
+         data.Qmin_t[i], data.Qmax_t[i]) = elm.get_q_limits(P=data.Pset[i])
 
 
 def get_fluid_node_data(data: FluidNodeData,
@@ -2188,4 +2183,8 @@ def compile_numerical_circuit_at(circuit: MultiCircuit,
     nc.bus_dict = bus_dict
     nc.consolidate_information()
 
+    if nc.active_branch_data.any_pf_control is False:
+        if nc.vsc_data.nelm > 0:
+            nc.active_branch_data.any_pf_control = True
+
     return nc