fixing a bug in storage units

Signed-off-by: DONNOT Benjamin <benjamin.donnot@rte-france.com>

Author: BDonnot

lightsim2grid/lightSimBackend.py

@@ -1520,7 +1520,8 @@ def runpf(self, is_dc : bool=False) -> Tuple[bool, Union[Exception, None]]:
                 raise BackendError(f"At least one generator is disconnected (check gen {gen_disco})")
 
             if self.__has_storage:
-                sto_active = (np.abs(self.storage_p) > 0.)
+                # TODO speed optim here: self._grid.get_storage_target_p() is not "cached"
+                sto_active = (np.abs(self._grid.get_storage_target_p()) > 0.)
                 sto_act_disco = (((~np.isfinite(self.storage_v)) & sto_active).any() or 
                                  ((self.storage_v <= 0.) & sto_active).any()
                                 )

src/GridModel.h

@@ -545,6 +545,12 @@ class GridModel : public GenericContainer
 
         Eigen::Ref<const IntVect> get_all_shunt_buses() const {return shunts_.get_buses();}
 
+        Eigen::Ref<const RealVect>  get_shunt_target_p() const {return shunts_.get_target_p();}
+        Eigen::Ref<const RealVect>  get_load_target_p() const {return loads_.get_target_p();}
+        Eigen::Ref<const RealVect>  get_gen_target_p() const {return generators_.get_target_p();}
+        Eigen::Ref<const RealVect>  get_sgen_target_p() const {return sgens_.get_target_p();}
+        Eigen::Ref<const RealVect>  get_storage_target_p() const {return storages_.get_target_p();}
+
         // complete results (with theta)
         tuple4d get_loads_res_full() const {return loads_.get_res_full();}
         tuple4d get_shunts_res_full() const {return shunts_.get_res_full();}

src/element_container/OneSideContainer.h

@@ -60,6 +60,7 @@ class OneSideContainer : public GenericContainer
     int get_bus(int el_id) {return _get_bus(el_id, status_, bus_id_);}
     Eigen::Ref<const IntVect> get_buses() const {return bus_id_;}
 
+    Eigen::Ref<const RealVect> get_target_p() const {return p_mw_;}
     tuple3d get_res() const {return tuple3d(res_p_, res_q_, res_v_);}
     tuple4d get_res_full() const {return tuple4d(res_p_, res_q_, res_v_, res_theta_);}
 

src/main.cpp

@@ -916,6 +916,13 @@ PYBIND11_MODULE(lightsim2grid_cpp, m)
         .def("get_sgens_res_full", &GridModel::get_sgens_res_full, DocGridModel::_internal_do_not_use.c_str())
         .def("get_dclineor_res_full", &GridModel::get_dclineor_res_full, DocGridModel::_internal_do_not_use.c_str())
         .def("get_dclineex_res_full", &GridModel::get_dclineex_res_full, DocGridModel::_internal_do_not_use.c_str())
+
+        .def("get_shunt_target_p", &GridModel::get_shunt_target_p, DocGridModel::_internal_do_not_use.c_str())
+        .def("get_load_target_p", &GridModel::get_load_target_p, DocGridModel::_internal_do_not_use.c_str())
+        .def("get_gen_target_p", &GridModel::get_gen_target_p, DocGridModel::_internal_do_not_use.c_str())
+        .def("get_sgen_target_p", &GridModel::get_sgen_target_p, DocGridModel::_internal_do_not_use.c_str())
+        .def("get_storage_target_p", &GridModel::get_storage_target_p, DocGridModel::_internal_do_not_use.c_str())
+
 
         // do something with the grid
         .def("deactivate_result_computation", &GridModel::deactivate_result_computation, DocGridModel::deactivate_result_computation.c_str())