LightSim2Grid 0.12.0__tar.gz → 0.12.1__tar.gz

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1/LightSim2Grid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LightSim2Grid
-Version: 0.12.0
+Version: 0.12.1
 Summary: LightSim2Grid implements a c++ backend targeting the Grid2Op platform.
 Home-page: https://github.com/grid2op/lightsim2grid/
 Author: Benjamin Donnot
@@ -356,13 +356,13 @@ cd ..
 
 Some tests are performed automatically on standard platform each time modifications are made in the lightsim2grid code.
 
-These tests include, for now, compilation on gcc (version 8, 12 and 13) and clang (version 11, 16 and 17).
+These tests include, for now, compilation on gcc (version 8, 14 and 15) and clang (version 11, 20 and 21).
 
 **NB** Intermediate versions of clang and gcc (*eg* gcc 9 or clang 12) are not tested regularly, but lightsim2grid used to work on these. 
-We suppose that if it works on *eg* clang 10 and clang 14 then it compiles also on all intermediate versions.
+We suppose that if it works on *eg* clang 11 and clang 21 then it compiles also on all intermediate versions.
 
 **NB** Package might work (we never tested it) on earlier version of these compilers. 
-The only "real" requirement for lightsim2grid is to have a compiler supporting c++11
+The only "real" requirement for lightsim2grid is to have a compiler supporting c++14
 (at least).
 
 ### Known issues

{lightsim2grid-0.12.0/LightSim2Grid.egg-info → lightsim2grid-0.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LightSim2Grid
-Version: 0.12.0
+Version: 0.12.1
 Summary: LightSim2Grid implements a c++ backend targeting the Grid2Op platform.
 Home-page: https://github.com/grid2op/lightsim2grid/
 Author: Benjamin Donnot
@@ -356,13 +356,13 @@ cd ..
 
 Some tests are performed automatically on standard platform each time modifications are made in the lightsim2grid code.
 
-These tests include, for now, compilation on gcc (version 8, 12 and 13) and clang (version 11, 16 and 17).
+These tests include, for now, compilation on gcc (version 8, 14 and 15) and clang (version 11, 20 and 21).
 
 **NB** Intermediate versions of clang and gcc (*eg* gcc 9 or clang 12) are not tested regularly, but lightsim2grid used to work on these. 
-We suppose that if it works on *eg* clang 10 and clang 14 then it compiles also on all intermediate versions.
+We suppose that if it works on *eg* clang 11 and clang 21 then it compiles also on all intermediate versions.
 
 **NB** Package might work (we never tested it) on earlier version of these compilers. 
-The only "real" requirement for lightsim2grid is to have a compiler supporting c++11
+The only "real" requirement for lightsim2grid is to have a compiler supporting c++14
 (at least).
 
 ### Known issues

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/README.md

@@ -282,13 +282,13 @@ cd ..
 
 Some tests are performed automatically on standard platform each time modifications are made in the lightsim2grid code.
 
-These tests include, for now, compilation on gcc (version 8, 12 and 13) and clang (version 11, 16 and 17).
+These tests include, for now, compilation on gcc (version 8, 14 and 15) and clang (version 11, 20 and 21).
 
 **NB** Intermediate versions of clang and gcc (*eg* gcc 9 or clang 12) are not tested regularly, but lightsim2grid used to work on these. 
-We suppose that if it works on *eg* clang 10 and clang 14 then it compiles also on all intermediate versions.
+We suppose that if it works on *eg* clang 11 and clang 21 then it compiles also on all intermediate versions.
 
 **NB** Package might work (we never tested it) on earlier version of these compilers. 
-The only "real" requirement for lightsim2grid is to have a compiler supporting c++11
+The only "real" requirement for lightsim2grid is to have a compiler supporting c++14
 (at least).
 
 ### Known issues

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/lightsim2grid/__init__.py

@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: MPL-2.0
 # This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
 
-__version__ = "0.12.0"
+__version__ = "0.12.1"
 
 __all__ = [
     "newtonpf",

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/lightsim2grid/contingencyAnalysis.py

@@ -122,6 +122,16 @@ class __ContingencyAnalysis(object):
         raise RuntimeError("Impossible to add new topologies like this. Please use `add_single_contingency` "
                            "or `add_multiple_contingencies`.")
 
+    @property
+    def init_from_n_powerflow(self):
+        return self.computer.init_from_n_powerflow
+    
+    @init_from_n_powerflow.setter
+    def init_from_n_powerflow(self, val):
+        if bool(val) != val:
+            raise ValueError("The `init_from_n_powerflow` attribute must be a boolean.")
+        self.computer.init_from_n_powerflow = bool(val)
+        
     # TODO implement that !
     def __update_grid(self, backend_act):
         raise NotImplementedError("TODO !")

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/lightsim2grid/gridmodel/from_pandapower/_aux_add_trafo.py

@@ -80,7 +80,7 @@ def _aux_add_trafo(
         if np.any(pp_net.trafo3w["tap_changer_type"].values == "Ideal"):
             raise RuntimeError("Ideal phase shifters are not modeled. Please remove all 3-winding trafos "
                                "with \"tap_changer_type\" set to \"Ideal\".")
-
+            
     tap_angles_ = 1.0 * pp_net.trafo["tap_step_degree"].values
     if np.any(~np.isfinite(tap_angles_)):
         warnings.warn("There were some Nan in the pp_net.trafo[\"tap_step_degree\"], they have been replaced by 0")
@@ -93,7 +93,7 @@ def _aux_add_trafo(
     trafo_model_is_t = True
     if "_options" in pp_net and "trafo_model" in pp_net._options:
         trafo_model_is_t = pp_net._options["trafo_model"] == "t"
-        
+    
     # compute physical parameters
     if version.parse(pp.__version__) >= _MIN_PP_VERSION_ADV_GRID_MODEL and pp_orig_file == "pandapower_v3":
         # use pandapower version 3 converter in this case.
@@ -133,6 +133,7 @@ def _aux_add_trafo(
                                           )
 
     # initialize the grid
+    do_ignore_tap_side_for_phase_shift = True
     model.init_trafo_pandapower(trafo_r,
                                 trafo_x,
                                 trafo_b,
@@ -141,7 +142,8 @@ def _aux_add_trafo(
                                 shift_,
                                 is_tap_hv_side,
                                 pp_bus_to_ls(pp_net.trafo["hv_bus"].values, pp_to_ls),
-                                pp_bus_to_ls(pp_net.trafo["lv_bus"].values, pp_to_ls))
+                                pp_bus_to_ls(pp_net.trafo["lv_bus"].values, pp_to_ls),
+                                do_ignore_tap_side_for_phase_shift)
 
     for tr_id, is_connected in enumerate(pp_net.trafo["in_service"].values):
         if not is_connected:

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/lightsim2grid/gridmodel/from_pypowsybl/_from_pypowsybl.py

@@ -369,7 +369,8 @@ def init(net : pypo.network.Network,
                                "of the net (once per unit). Please upgrade pypowsybl."
                                "NB: phase tap change are handled by lightsim2grid)")
         shift_ = np.zeros(df_trafo.shape[0])
-    is_tap_hv_side = np.zeros(df_trafo.shape[0], dtype=bool)  # TODO    
+    # tap is side 2 in IIDM
+    is_tap_side1 = np.zeros(df_trafo.shape[0], dtype=bool)   
     trafo_r = df_trafo_pu["r"].values
     trafo_x = df_trafo_pu["x"].values
     trafo_h = (df_trafo_pu["g"].values + 1j * df_trafo_pu["b"].values)
@@ -398,9 +399,11 @@ def init(net : pypo.network.Network,
                      trafo_h,
                      ratio,
                      shift_,  # in degree !
-                     is_tap_hv_side,
+                     is_tap_side1,
                      tor_bus,
-                     tex_bus)    
+                     tex_bus,
+                     False,  # ignore_tap_side_for_phase_shift is False for pypowsybl
+                     )    
     for t_id, (is_or_disc, is_ex_disc) in enumerate(zip(tor_disco, tex_disco)):
         if is_or_disc or is_ex_disc:
             model.deactivate_trafo(t_id)

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/lightsim2grid/lightSimBackend.py

@@ -1119,7 +1119,6 @@ class LightSimBackend(Backend):
                 
         if "pp_orig_file" in loader_kwargs and str(loader_kwargs["pp_orig_file"]) == loader_kwargs["pp_orig_file"]:
             pp_orig_file = str(loader_kwargs["pp_orig_file"])
-            
         self._grid = init_from_pandapower(self._init_pp_backend._grid,
                                           self._init_pp_backend.n_sub,
                                           self.n_busbar_per_sub,
@@ -1459,7 +1458,12 @@ class LightSimBackend(Backend):
             # self.init_pp_backend.close()  # should not close it, the same init_pp_backend is used when copied
             self._init_pp_backend = None
         self._reset_res_pointers()
-        self._fill_nans()
+        try:
+            self._fill_nans()
+        except AttributeError:
+            # some attributes are not completely filled
+            
+            pass
         self._grid = None
         self.__me_at_init = None
 

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/setup.py

@@ -14,7 +14,7 @@ import warnings
 from pybind11.setup_helpers import Pybind11Extension, build_ext
 
 
-__version__ = "0.12.0"
+__version__ = "0.12.1"
 KLU_SOLVER_AVAILABLE = False
 
 # Try to link against SuiteSparse (if available)
@@ -240,8 +240,12 @@ if "PATH_CKTSO" in os.environ:
     libcktso_path = None
     if include_cktso:
         if sys.platform.startswith("linux") or sys.platform.startswith("darwin"):
-            libcktso_path = os.path.join(path_cktso, "ubuntu1804_x64_gcc750/libcktso.so")  # TODO CHANGE THAT !
-            if not os.path.exists(libcktso_path):
+            include_cktso = False
+            for el in ["ubuntu2004_x64_gcc940", "ubuntu1804_x64_gcc750"]:
+                libcktso_path = os.path.join(path_cktso, f"{el}/libcktso.so")  # TODO CHANGE THAT !
+                if os.path.exists(libcktso_path):
+                    include_cktso = True
+            if not include_cktso:
                 print(f"WARNING: cannot locate the CKTSO shared object that should be at: {libcktso_path}")
                 include_cktso = False
                 libcktso_path = None

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/src/ChooseSolver.hpp

@@ -85,14 +85,27 @@ class ChooseSolver final
             return res;
         }
         
-        bool is_dc(const SolverType & type){
-            bool res;
+        bool is_dc(const SolverType & type) const noexcept{
+            bool res = false;
             res = (type == SolverType::DC) || 
                   (type == SolverType::KLUDC) || 
                   (type == SolverType::NICSLUDC) ||
                   (type == SolverType::CKTSODC);
             return res;
         }
+        bool is_fdpf(const SolverType & type) const noexcept{
+            bool res = false;
+            res = (type == SolverType::FDPF_XB_SparseLU) || 
+                  (type == SolverType::FDPF_BX_SparseLU) || 
+                  (type == SolverType::FDPF_XB_KLU) ||
+                  (type == SolverType::FDPF_BX_KLU) ||
+                  (type == SolverType::FDPF_XB_NICSLU) ||
+                  (type == SolverType::FDPF_BX_NICSLU) ||
+                  (type == SolverType::FDPF_XB_CKTSO) ||
+                  (type == SolverType::FDPF_BX_CKTSO)
+                  ;
+            return res;
+        }
         SolverType get_type() const {return _solver_type;}
 
         // TODO DO that for all solvers

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/src/GridModel.cpp

@@ -218,7 +218,7 @@ void GridModel::set_orig_to_ls(const IntVect & orig_to_ls){
     }
 }
 
-void GridModel::set_ls_to_orig_internal(const IntVect & ls_to_orig){
+void GridModel::set_ls_to_orig_internal(const IntVect & ls_to_orig) noexcept{
     if(ls_to_orig.size() == 0){
         _ls_to_orig = IntVect();
         _orig_to_ls = IntVect();
@@ -354,12 +354,12 @@ void GridModel::check_solution_q_values_onegen(CplxVect & res,
     if(check_q_limits)
     {
         // i need to check the reactive can be absorbed / produced by the generator
-        real_type new_q = my_zero_;
+        real_type new_q = BaseConstants::my_zero_;
         real_type react_this_bus = std::imag(res.coeff(gen.bus_id));
         if((react_this_bus >= gen.min_q_mvar) && (react_this_bus <= gen.max_q_mvar))
         {
             // this generator is able to handle all reactive
-            new_q = my_zero_;
+            new_q = BaseConstants::my_zero_;
         }else if(react_this_bus < gen.min_q_mvar){
             // generator cannot absorb enough reactive power
             new_q = react_this_bus - gen.min_q_mvar; //ex. need -50, qmin is -30, remains: (-50) - (-30) = -20 MVAr
@@ -370,7 +370,7 @@ void GridModel::check_solution_q_values_onegen(CplxVect & res,
         res.coeffRef(gen.bus_id) = {std::real(res.coeff(gen.bus_id)), new_q};
     }else{
         // the q value for the bus at which the generator is connected will be 0
-        res.coeffRef(gen.bus_id) = {std::real(res.coeff(gen.bus_id)), my_zero_};
+        res.coeffRef(gen.bus_id) = {std::real(res.coeff(gen.bus_id)), BaseConstants::my_zero_};
     }
 }
 
@@ -390,7 +390,7 @@ void GridModel::check_solution_q_values(CplxVect & res, bool check_q_limits) con
         {
             // slack bus, by definition, can handle all active value
             // This is probably not the case with distributed slack !
-            res.coeffRef(gen.bus_id) = {my_zero_, std::imag(res.coeff(gen.bus_id))};
+            res.coeffRef(gen.bus_id) = {BaseConstants::my_zero_, std::imag(res.coeff(gen.bus_id))};
         }
     }
 
@@ -433,7 +433,7 @@ CplxVect GridModel::check_solution(const CplxVect & V_proposed, bool check_q_lim
                                                    id_me_to_ac_solver_,
                                                    static_cast<int>(V_proposed.size())
                                                    );
-    if(abs(sn_mva_- 1.) > _tol_equal_float) res *= sn_mva_;
+    if(abs(sn_mva_- 1.) > BaseConstants::_tol_equal_float) res *= sn_mva_;
 
     // now check reactive values for buses where there are generators and active values of slack bus
     check_solution_q_values(res, check_q_limits);
@@ -442,7 +442,7 @@ CplxVect GridModel::check_solution(const CplxVect & V_proposed, bool check_q_lim
     for(int bus_id = 0; bus_id < nb_bus; ++bus_id)
     {
         if(substations_.is_bus_connected(GlobalBusId(bus_id))) continue;
-        res.coeffRef(bus_id) = my_zero_;
+        res.coeffRef(bus_id) = BaseConstants::my_zero_;
     }
     return res;
 };
@@ -543,7 +543,7 @@ CplxVect GridModel::pre_process_solver(
     CplxVect V = CplxVect::Constant(nb_bus_solver, init_vm_pu_);
     for(int bus_solver_id = 0; bus_solver_id < nb_bus_solver; ++bus_solver_id){
         GlobalBusId bus_me_id = id_solver_to_me[bus_solver_id]; 
-        if(bus_me_id.cast_int() == _deactivated_bus_id){
+        if(bus_me_id.cast_int() == BaseConstants::_deactivated_bus_id){
             //TODO DEBUG MODE : only in debug mode
             std::ostringstream exc_;
             exc_ << "GridModel::pre_process_solver: the bus with solver id ";
@@ -574,12 +574,12 @@ CplxVect GridModel::_get_results_back_to_orig_nodes(const CplxVect & res_tmp,
                                                     std::vector<SolverBusId> & id_me_to_solver,
                                                     int size)
 {
-    CplxVect res = CplxVect::Constant(size, {init_vm_pu_, my_zero_});
+    CplxVect res = CplxVect::Constant(size, {init_vm_pu_, BaseConstants::my_zero_});
     const int nb_bus = static_cast<int>(substations_.nb_bus());
     for (int bus_id_me=0; bus_id_me < nb_bus; ++bus_id_me){
         if(!substations_.is_bus_connected(GlobalBusId(bus_id_me))) continue;  // nothing is done if the bus is connected
         SolverBusId bus_id_solver = id_me_to_solver[bus_id_me];
-        if(bus_id_solver.cast_int() == _deactivated_bus_id){
+        if(bus_id_solver.cast_int() == BaseConstants::_deactivated_bus_id){
             std::ostringstream exc_;
             exc_ << "GridModel::_get_results_back_to_orig_nodes: the bus with id ";
             exc_ << bus_id_me;
@@ -622,7 +622,7 @@ void GridModel::init_converter_bus_id(std::vector<SolverBusId>& id_me_to_solver,
     //TODO get disconnected bus !!! (and have some conversion for it)
     //1. init the conversion bus
     const int nb_bus_init = static_cast<int>(substations_.nb_bus());
-    id_me_to_solver = std::vector<SolverBusId>(nb_bus_init, SolverBusId(_deactivated_bus_id));  // by default, if a bus is disconnected, then it has a -1 there
+    id_me_to_solver = std::vector<SolverBusId>(nb_bus_init, SolverBusId(BaseConstants::_deactivated_bus_id));  // by default, if a bus is disconnected, then it has a -1 there
     id_solver_to_me = std::vector<GlobalBusId>();
     id_solver_to_me.reserve(nb_bus_init);
     int bus_id_solver = 0;
@@ -648,12 +648,12 @@ void GridModel::init_slack_bus(const CplxVect & Sbus,
                                const GlobalBusIdVect & slack_bus_id_me,
                                SolverBusIdVect & slack_bus_id_solver)
 {
-    slack_bus_id_solver = SolverBusIdVect::Constant(slack_bus_id_me.size(), SolverBusId(_deactivated_bus_id));
+    slack_bus_id_solver = SolverBusIdVect::Constant(slack_bus_id_me.size(), SolverBusId(BaseConstants::_deactivated_bus_id));
 
     size_t i = 0;
     for(const GlobalBusId & el: slack_bus_id_me) {
         SolverBusId tmp = id_me_to_solver[el.cast_int()];
-        if(tmp.cast_int() == _deactivated_bus_id){
+        if(tmp.cast_int() == BaseConstants::_deactivated_bus_id){
             std::ostringstream exc_;
             exc_ << "GridModel::init_slack_bus: One of the slack bus is disconnected.";
             exc_ << " You can check bus with global id GlobalBusId : ";
@@ -667,7 +667,7 @@ void GridModel::init_slack_bus(const CplxVect & Sbus,
         ++i;
     }
     
-    if(is_in_vect(_deactivated_bus_id, slack_bus_id_solver)){
+    if(GenericContainer::is_in_vect(BaseConstants::_deactivated_bus_id, slack_bus_id_solver)){
         // TODO improve error message with the gen_id
         // TODO DEBUG MODE: only check that in debug mode
         throw std::runtime_error("GridModel::init_Sbus: One of the slack bus is disconnected !");
@@ -710,7 +710,7 @@ void GridModel::fillSbus_me(CplxVect & Sbus, bool ac, const std::vector<SolverBu
     storages_.fillSbus(Sbus, id_me_to_solver, ac);
     generators_.fillSbus(Sbus, id_me_to_solver, ac);
     dc_lines_.fillSbus(Sbus, id_me_to_solver, ac);
-    if (abs(sn_mva_ - 1.0) > _tol_equal_float) Sbus /= sn_mva_;
+    if (abs(sn_mva_ - 1.0) > BaseConstants::_tol_equal_float) Sbus /= sn_mva_;
     // in dc mode, this is used for the phase shifter, this should not be divided by sn_mva_ !
     trafos_.hack_Sbus_for_dc_phase_shifter(Sbus, ac, id_me_to_solver);
 }
@@ -743,7 +743,7 @@ void GridModel::fillpv_pq(const std::vector<SolverBusId>& id_me_to_solver,
     dc_lines_.fillpv(bus_pv, has_bus_been_added, slack_bus_id_solver, id_me_to_solver);
 
     for(int bus_id = 0; bus_id< nb_bus; ++bus_id){
-        if(is_in_vect(bus_id, slack_bus_id_solver)) continue;  // slack bus is not PQ either
+        if(GenericContainer::is_in_vect(bus_id, slack_bus_id_solver)) continue;  // slack bus is not PQ either
         if(has_bus_been_added[bus_id]) continue; // a pv bus cannot be PQ
         bus_pq.push_back(bus_id);
         has_bus_been_added[bus_id] = true;  // don't add it a second time

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/src/GridModel.hpp

@@ -41,7 +41,7 @@
 #include "ChooseSolver.hpp"
 
 //TODO implement a BFS check to make sure the Ymatrix is "connected" [one single component]
-class GridModel final : public GenericContainer
+class GridModel final
 {
     public:
         typedef Eigen::Array<int, Eigen::Dynamic, Eigen::RowMajor> IntVectRowMaj;
@@ -53,7 +53,6 @@ class GridModel final : public GenericContainer
                 std::vector<int>, // ls_to_orig
                 real_type,  // init_vm_pu
                 real_type, //sn_mva
-                // std::vector<real_type>,  // bus_vn_kv
                 std::vector<bool>,  // bus_status
                 SubstationContainer::StateRes,
                 // powerlines
@@ -188,8 +187,12 @@ class GridModel final : public GenericContainer
         // solver "control"
         void change_solver(const SolverType & type){
             solver_control_.tell_all_changed();
+            
+            if(_solver.is_fdpf(type)) init_fdpf_coeffs();
+
             if(_solver.is_dc(type)) _dc_solver.change_solver(type);
             else _solver.change_solver(type);
+            
         }
         std::vector<SolverType> available_solvers() {return _solver.available_solvers(); }
         SolverType get_solver_type() const {return _solver.get_type(); }
@@ -241,10 +244,11 @@ class GridModel final : public GenericContainer
                                    const RealVect & trafo_shift_degree,
                                    const std::vector<bool> & trafo_tap_hv,  // is tap on high voltage (true) or low voltate
                                    const Eigen::VectorXi & bus1_id,
-                                   const Eigen::VectorXi & bus2_id
+                                   const Eigen::VectorXi & bus2_id,
+                                   bool ignore_tap_side_for_shift
                                    ){
             trafos_.init(trafo_r, trafo_x, trafo_b, trafo_tap_step_pct, trafo_tap_pos, trafo_shift_degree,
-                         trafo_tap_hv, bus1_id, bus2_id);
+                         trafo_tap_hv, bus1_id, bus2_id, ignore_tap_side_for_shift);
         }
         void init_trafo(const RealVect & trafo_r,
                         const RealVect & trafo_x,
@@ -253,10 +257,11 @@ class GridModel final : public GenericContainer
                         const RealVect & trafo_shift_degree,
                         const std::vector<bool> & trafo_tap_hv,  // is tap on high voltage (true) or low voltate
                         const Eigen::VectorXi & bus1_id,
-                        const Eigen::VectorXi & bus2_id
+                        const Eigen::VectorXi & bus2_id,
+                        bool ignore_tap_side_for_shift
                            ){
             trafos_.init(trafo_r, trafo_x, trafo_b, trafo_ratio, trafo_shift_degree,
-                         trafo_tap_hv, bus1_id, bus2_id);
+                         trafo_tap_hv, bus1_id, bus2_id, ignore_tap_side_for_shift);
         }
 
         void init_generators(const RealVect & generators_p,
@@ -448,7 +453,7 @@ class GridModel final : public GenericContainer
                 solver_control_.need_recompute_sbus();
                 solver_control_.need_recompute_ybus();
                 solver_control_.ybus_change_sparsity_pattern();
-                _generic_deactivate(global_bus_id, substations_);
+                GenericContainer::_generic_deactivate(global_bus_id, substations_);
             }
         }
         void deactivate_bus_python(int global_bus_id) {
@@ -463,7 +468,7 @@ class GridModel final : public GenericContainer
                 solver_control_.need_recompute_sbus();
                 solver_control_.need_recompute_ybus();
                 solver_control_.ybus_change_sparsity_pattern();
-                _generic_reactivate(global_bus_id, substations_); 
+                GenericContainer::_generic_reactivate(global_bus_id, substations_); 
             }
         }
         void reactivate_bus_python(int global_bus_id) {
@@ -608,8 +613,16 @@ class GridModel final : public GenericContainer
         void change_ratio_trafo(int trafo_id, real_type new_ratio){
             trafos_.change_ratio(trafo_id, new_ratio, solver_control_);
         }
-        void change_shift_trafo(int trafo_id, real_type new_shift){
-            trafos_.change_shift(trafo_id, new_shift, solver_control_);
+
+        /**
+         * The shift is in radian (not degree !)
+         */
+        void change_shift_trafo(int trafo_id, real_type new_shift_rad){
+            trafos_.change_shift(trafo_id, new_shift_rad, solver_control_);
+        }
+        void change_shift_trafo_deg(int trafo_id, real_type new_shift_deg){
+            real_type new_shift_rad = new_shift_deg / BaseConstants::my_180_pi_;
+            change_shift_trafo(trafo_id, new_shift_rad);
         }
 
         //load
@@ -1176,11 +1189,6 @@ class GridModel final : public GenericContainer
         real_type get_computation_time() const{ return _solver.get_computation_time();}
         real_type get_dc_computation_time() const{ return _dc_solver.get_computation_time();}
 
-    // private:
-    //     using GenericContainer::update_bus_status;  // to silence clang warnings (overload-virtual)
-    // public:
-    //     void update_bus_status(int nb_bus_before,
-    //                            Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, 2, Eigen::RowMajor> > active_bus);
         // part dedicated to grid2op backend, optimized for grid2op data representation (for speed)
         // this is not recommended to use it outside of its intended usage within grid2op !
         void update_gens_p(Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, Eigen::RowMajor> > has_changed,
@@ -1311,39 +1319,32 @@ class GridModel final : public GenericContainer
                                     const SolverControl & solver_control);
 
         //for FDPF
-    private:
-        using GenericContainer::fillBp_Bpp;  // silence clang warning overload-virtual
-    public:
         void fillBp_Bpp(Eigen::SparseMatrix<real_type> & Bp, 
                         Eigen::SparseMatrix<real_type> & Bpp, 
                         FDPFMethod xb_or_bx) const;
-
-    private:
-        using GenericContainer::fillBf_for_PTDF;  // silence clang warning overload-virtual
-    public:
+        void init_fdpf_coeffs(){
+            powerlines_.init_fdpf_coeffs();
+            trafos_.init_fdpf_coeffs();
+        }
         void fillBf_for_PTDF(Eigen::SparseMatrix<real_type> & Bf, bool transpose=false) const;
 
         Eigen::SparseMatrix<real_type> debug_get_Bp_python(FDPFMethod xb_or_bx){
             Eigen::SparseMatrix<real_type> Bp;
             Eigen::SparseMatrix<real_type> Bpp;
+            init_fdpf_coeffs();
             fillBp_Bpp(Bp, Bpp, xb_or_bx);
             return Bp;
         }
         Eigen::SparseMatrix<real_type> debug_get_Bpp_python(FDPFMethod xb_or_bx){
             Eigen::SparseMatrix<real_type> Bp;
             Eigen::SparseMatrix<real_type> Bpp;
+            init_fdpf_coeffs();
             fillBp_Bpp(Bp, Bpp, xb_or_bx);
             return Bpp;
         }
 
     protected:
-        void set_ls_to_orig_internal(const IntVect & ls_to_orig);  // set both _ls_to_orig and _orig_to_ls
-
-        // compute admittance matrix
-        // dc powerflow
-        // void init_dcY(Eigen::SparseMatrix<real_type> & dcYbus);
-
-        // ac powerflows
+        void set_ls_to_orig_internal(const IntVect & ls_to_orig) noexcept;  // set both _ls_to_orig and _orig_to_ls
 
         // init the Ybus matrix (its size, it is filled up elsewhere) and also the 
         // converter from "my bus id" to the "solver bus id" (id_me_to_solver and id_solver_to_me)
@@ -1468,9 +1469,6 @@ class GridModel final : public GenericContainer
             }
             return res;
         }
-
-    private:
-        using GenericContainer::fillYbus;  // to silence the overload-virtual warning in clang
     
     protected:
         void fillYbus(Eigen::SparseMatrix<cplx_type> & res, bool ac, const std::vector<SolverBusId>& id_me_to_solver);

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/src/batch_algorithm/BaseBatchSolverSynch.hpp

@@ -217,7 +217,7 @@ class BaseBatchSolverSynch : protected BaseConstants
             int tmp;
             for(Eigen::Index bus_id_grid = 0; bus_id_grid < nb_total_bus; ++bus_id_grid){
                 tmp = static_cast<int>(id_me_to_ac_solver[bus_id_grid]);
-                if(tmp == GridModel::_deactivated_bus_id) continue;
+                if(tmp == BaseConstants::_deactivated_bus_id) continue;
                 Vinit_solver[tmp] = Vinit[bus_id_grid];
             }
             return Vinit_solver;

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/src/batch_algorithm/ContingencyAnalysis.cpp

@@ -219,7 +219,9 @@ void ContingencyAnalysis::compute(const CplxVect & Vinit, int max_iter, real_typ
         bus_pq_,
         max_iter,
         tol);
-
+    // check if we init the n-1 cases with results from the n cases
+    // or not
+    if(_init_from_n_powerflow) Vinit_solver = _solver.get_V();
     // end of pre processing
     _timer_pre_proc = timer_preproc.duration();
     if(!conv) return;

{lightsim2grid-0.12.0 → lightsim2grid-0.12.1}/src/batch_algorithm/ContingencyAnalysis.hpp

@@ -25,7 +25,8 @@ class ContingencyAnalysis final: public BaseBatchSolverSynch
                             _li_coeffs(),
                             _timer_total(0.),
                             _timer_modif_Ybus(0.),
-                            _timer_pre_proc(0.)
+                            _timer_pre_proc(0.),
+                            _init_from_n_powerflow(false)
                             { }
 
         ~ContingencyAnalysis() noexcept = default;
@@ -34,6 +35,9 @@ class ContingencyAnalysis final: public BaseBatchSolverSynch
         ContingencyAnalysis & operator=(ContingencyAnalysis&&) = delete;
         ContingencyAnalysis & operator=(const ContingencyAnalysis&) = delete;
 
+        bool get_init_from_n_powerflow() const noexcept {return _init_from_n_powerflow;}
+        void set_init_from_n_powerflow(bool do_it) noexcept {_init_from_n_powerflow = do_it;}
+
         // utilities to add defaults to simulate
         void add_all_n1(){
             for(int l_id = 0; l_id < n_total_; ++l_id){
@@ -173,6 +177,7 @@ class ContingencyAnalysis final: public BaseBatchSolverSynch
         // sometimes, when i perform some disconnection, I make the graph non connexe
         // in this case, well, i don't use the results of the simulation
         bool check_invertible(const Eigen::SparseMatrix<cplx_type> & Ybus) const;
+
     private:
         // li_default
         std::set<std::set<int> > _li_defaults;  // do not use unordered_set here, we rely on the order for different functions !
@@ -182,5 +187,7 @@ class ContingencyAnalysis final: public BaseBatchSolverSynch
         double _timer_total;  // total time spent in "compute"
         double _timer_modif_Ybus;  // time to update the Ybus between the defaults simulation
         double _timer_pre_proc;  // time to compute the coefficients of the Ybus
+
+        bool _init_from_n_powerflow;
 };
 #endif  //COMPUTERS_H