correction to make oos trafos in controllers work for vectorized form

e2nIEE · Dec 7, 2023 · 8c8e94c · 8c8e94c
1 parent a30254d
commit 8c8e94c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/pandapower/control/controller/trafo/ContinuousTapControl.py b/pandapower/control/controller/trafo/ContinuousTapControl.py
@@ -99,8 +99,7 @@ def is_converged(self, net):
 
         vm_pu = read_from_net(net, "res_bus", self.controlled_bus, "vm_pu", self._read_write_flag)
         # this is possible in case the trafo is set out of service by the connectivity check
-        if np.isnan(vm_pu):
-            return True
+        is_nan =  np.isnan(vm_pu)
         self.tap_pos = read_from_net(net, self.trafotable, self.controlled_tid, "tap_pos", self._read_write_flag)
         difference = 1 - self.vm_set_pu / vm_pu
 
@@ -114,4 +113,4 @@ def is_converged(self, net):
         else:
             converged = np.abs(difference) < self.tol
 
-        return np.all(converged)
+        return np.all(np.logical_or(converged, is_nan))
diff --git a/pandapower/control/controller/trafo/DiscreteTapControl.py b/pandapower/control/controller/trafo/DiscreteTapControl.py
@@ -118,8 +118,7 @@ def is_converged(self, net):
 
         vm_pu = read_from_net(net, "res_bus", self.controlled_bus, "vm_pu", self._read_write_flag)
         # this is possible in case the trafo is set out of service by the connectivity check
-        if np.isnan(vm_pu):
-            return True
+        is_nan = np.isnan(vm_pu)
         self.tap_pos = read_from_net(net, self.trafotable, self.controlled_tid, "tap_pos", self._read_write_flag)
 
         reached_limit = np.where(self.tap_side_coeff * self.tap_sign == 1,
@@ -130,5 +129,4 @@ def is_converged(self, net):
 
         converged = np.logical_or(reached_limit, np.logical_and(self.vm_lower_pu < vm_pu, vm_pu < self.vm_upper_pu))
 
-        return np.all(converged)
-
+        return np.all(np.logical_or(converged, is_nan))