Merge branch 'devel'

SanPen · Jan 5, 2024 · 8cc1271 · 8cc1271
2 parents 4c08bd1 + 75fa2ae
commit 8cc1271
Show file tree

Hide file tree

Showing 266 changed files with 39,934 additions and 3,750 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,13 @@
-dist: focal   # required for Python >= 3.7
+dist: jammy   # ubuntu distro 22.04 name (jammy jellyfish)
 services:
   - xvfb  # this is necessary for travis-ci to work with Qt
 language: python
 python:
-  #- "3.6"
-  - "3.7"
-  - "3.8"
+  - "3.10"
+  - "3.11"
 # command to install dependencies
 install:
-  - pip install -r requirements_nose.txt
+  - pip install -r requirements.txt
 # command to run tests
 script:
   - cd src/tests

diff --git a/Grids_and_profiles/grids/IEEE25.gridcal b/Grids_and_profiles/grids/IEEE25.gridcal
diff --git a/Grids_and_profiles/grids/ding0_test_network_2_mvlv.gridcal b/Grids_and_profiles/grids/ding0_test_network_2_mvlv.gridcal
diff --git a/Grids_and_profiles/grids/hydro_grid1.gridcal b/Grids_and_profiles/grids/hydro_grid1.gridcal
diff --git a/Grids_and_profiles/grids/hydro_grid2.gridcal b/Grids_and_profiles/grids/hydro_grid2.gridcal
diff --git a/Grids_and_profiles/grids/hydro_grid3.gridcal b/Grids_and_profiles/grids/hydro_grid3.gridcal
diff --git a/doc/index.rst b/doc/index.rst
@@ -45,14 +45,29 @@ Contents
     rst_source/getting_started
     rst_source/tutorials/tutorials_module
     rst_source/data_sheets
-    rst_source/theory/models
+    rst_source/theory_index
     rst_source/gui
     rst_source/development
     rst_source/benchmarks
     rst_source/other_data_models
     rst_source/change_log
     rst_source/api/auto/modules
 
+Example Files
+----------------
+
+Below you can find the link to some files that you can download of finished systems:
+
+ - **Distribution Grid** can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles/grids/Some%20distribution%20grid.gridcal>`__.
+ - **Line HVDC Grid** can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles/grids/LineHVDCGrid.gridcal>`__.
+ - **Iwamoto's 11 Bus** can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles/grids/Iwamoto's%2011%20Bus.gridcal>`__.
+ - **Illinois 200 Bus** can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles/grids/Illinois%20200%20Bus.gridcal>`__.
+ - **IEEE 57 & IEEE &14 DC Grid** can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles/grids/IEEE57%2BIEEE14%20DC%20grid.gridcal>`__.
+ - **IEEE 39 Grid** can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles/grids/IEEE39.gridcal>`__.
+ - **IEEE 9 Grid** can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles/grids/IEEE%209%20Bus.gridcal>`__.
+ - **IEEE 30 Grid** can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles/grids/IEEE%2030%20Bus.gridcal>`__.
+
+More resources can be found `here <https://github.com/SanPen/GridCal/blob/master/Grids_and_profiles>`__.
 
 Disclaimer
 ----------

diff --git a/doc/rst_source/api/auto/modules.rst b/doc/rst_source/api/auto/modules.rst
@@ -1,7 +1,7 @@
-GridCalEngine API documentation
-===================================
+GridCal
+=======
 
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 4
 
-   GridCalEngine
+   GridCal
diff --git a/doc/rst_source/figures/fluid_node_diagram.dia b/doc/rst_source/figures/fluid_node_diagram.dia
diff --git a/doc/rst_source/figures/fluid_node_diagram.png b/doc/rst_source/figures/fluid_node_diagram.png
diff --git a/doc/rst_source/figures/investments/Figure_1_w_capex-e-6.png b/doc/rst_source/figures/investments/Figure_1_w_capex-e-6.png
diff --git a/doc/rst_source/figures/investments/Figure_1_w_capex_e-4.png b/doc/rst_source/figures/investments/Figure_1_w_capex_e-4.png
diff --git a/doc/rst_source/figures/investments/Figure_1_w_capex_e-5.png b/doc/rst_source/figures/investments/Figure_1_w_capex_e-5.png
diff --git a/doc/rst_source/figures/investments/Figure_1_w_capex_e-5_v2.png b/doc/rst_source/figures/investments/Figure_1_w_capex_e-5_v2.png
diff --git a/doc/rst_source/figures/investments/Figure_1_wo_capex.png b/doc/rst_source/figures/investments/Figure_1_wo_capex.png
diff --git a/...nvestments/ding0_test_network_2_mvlv_HYPEROPT_10x_3900iterations_normalized.png b/...nvestments/ding0_test_network_2_mvlv_HYPEROPT_10x_3900iterations_normalized.png
diff --git a/...source/figures/investments/ding0_test_network_2_mvlv_INDEPENDENT_normalized.png b/...source/figures/investments/ding0_test_network_2_mvlv_INDEPENDENT_normalized.png
diff --git a/...s/investments/ding0_test_network_2_mvlv_MVRSM_10x_3900iterations_normalized.png b/...s/investments/ding0_test_network_2_mvlv_MVRSM_10x_3900iterations_normalized.png
diff --git a/doc/rst_source/other_data_models.rst b/doc/rst_source/other_data_models.rst
@@ -2590,36 +2590,38 @@ Bus
 
 .. table::
 
-    ==========  ==========  ====  =========  =========  ===============================================================================  =======
-       name     class_type  unit  mandatory  max_chars                                   descriptions                                    comment
-    ==========  ==========  ====  =========  =========  ===============================================================================  =======
-    idtag       str               False                 Unique ID                                                                               
-    name        str               False                 Name of the bus                                                                         
-    code        str               False                 Some code to further identify the bus                                                   
-    active      bool              False                 Is the bus active? used to disable the bus.                                             
-    is_slack    bool              False                 Force the bus to be of slack type.                                                      
-    is_dc       bool              False                 Is this bus of DC type?.                                                                
-    is_tr_bus   bool              False                 Is this bus part of a composite transformer, such as  a 3-winding transformer?.         
-    Vnom        float       kV    False                 Nominal line voltage of the bus.                                                        
-    Vm0         float       p.u.  False                 Voltage module guess.                                                                   
-    Va0         float       rad.  False                 Voltage angle guess.                                                                    
-    Vmin        float       p.u.  False                 Lower range of allowed voltage module.                                                  
-    Vmax        float       p.u.  False                 Higher range of allowed voltage module.                                                 
-    angle_min   float       rad.  False                 Lower range of allowed voltage angle.                                                   
-    angle_max   float       rad.  False                 Higher range of allowed voltage angle.                                                  
-    r_fault     float       p.u.  False                 Resistance of the fault.This is used for short circuit studies.                         
-    x_fault     float       p.u.  False                 Reactance of the fault.This is used for short circuit studies.                          
-    x           float       px    False                 x position in pixels.                                                                   
-    y           float       px    False                 y position in pixels.                                                                   
-    h           float       px    False                 height of the bus in pixels.                                                            
-    w           float       px    False                 Width of the bus in pixels.                                                             
-    country     Country           False                 Country of the bus                                                                      
-    area        Area              False                 Area of the bus                                                                         
-    zone        Zone              False                 Zone of the bus                                                                         
-    substation  Substation        False                 Substation of the bus.                                                                  
-    longitude   float       deg   False                 longitude of the bus.                                                                   
-    latitude    float       deg   False                 latitude of the bus.                                                                    
-    ==========  ==========  ====  =========  =========  ===============================================================================  =======
+    ===================  ==========  ======  =========  =========  ===============================================================================  =======
+           name          class_type   unit   mandatory  max_chars                                   descriptions                                    comment
+    ===================  ==========  ======  =========  =========  ===============================================================================  =======
+    idtag                str                 False                 Unique ID                                                                               
+    name                 str                 False                 Name of the bus                                                                         
+    code                 str                 False                 Some code to further identify the bus                                                   
+    active               bool                False                 Is the bus active? used to disable the bus.                                             
+    is_slack             bool                False                 Force the bus to be of slack type.                                                      
+    is_dc                bool                False                 Is this bus of DC type?.                                                                
+    is_tr_bus            bool                False                 Is this bus part of a composite transformer, such as  a 3-winding transformer?.         
+    Vnom                 float       kV      False                 Nominal line voltage of the bus.                                                        
+    Vm0                  float       p.u.    False                 Voltage module guess.                                                                   
+    Va0                  float       rad.    False                 Voltage angle guess.                                                                    
+    Vmin                 float       p.u.    False                 Lower range of allowed voltage module.                                                  
+    Vmax                 float       p.u.    False                 Higher range of allowed voltage module.                                                 
+    voltage_module_cost  float       €/unit  False                 Cost of over and under voltages                                                         
+    angle_min            float       rad.    False                 Lower range of allowed voltage angle.                                                   
+    angle_max            float       rad.    False                 Higher range of allowed voltage angle.                                                  
+    voltage_angle_cost   float       €/unit  False                 Cost of over and under angles                                                           
+    r_fault              float       p.u.    False                 Resistance of the fault.This is used for short circuit studies.                         
+    x_fault              float       p.u.    False                 Reactance of the fault.This is used for short circuit studies.                          
+    x                    float       px      False                 x position in pixels.                                                                   
+    y                    float       px      False                 y position in pixels.                                                                   
+    h                    float       px      False                 height of the bus in pixels.                                                            
+    w                    float       px      False                 Width of the bus in pixels.                                                             
+    country              Country             False                 Country of the bus                                                                      
+    area                 Area                False                 Area of the bus                                                                         
+    zone                 Zone                False                 Zone of the bus                                                                         
+    substation           Substation          False                 Substation of the bus.                                                                  
+    longitude            float       deg     False                 longitude of the bus.                                                                   
+    latitude             float       deg     False                 latitude of the bus.                                                                    
+    ===================  ==========  ======  =========  =========  ===============================================================================  =======
 
 
 Connectivity Node

diff --git a/doc/rst_source/theory/investments_evaluation.rst b/doc/rst_source/theory/investments_evaluation.rst
@@ -0,0 +1,20 @@
+Investments evaluation
+_______________________________________
+Documentar grid de pruebas
+
+Objective function
+
+.. math::
+    f = \sum overaloadcost + \sum voltagecost + \sum losses +\sum capex+ \sum opex
+Añadir pruebas diferentes weight CAPEX
+Añadir figures
+
+
+.. figure:: ../figures/investments/Figure_1_w_capex-e-6.png
+    :alt: Results1
+    :scale: 50 %
+
+
+.. math::
+    f = w_1\frac{\sum overaloadcost}{||overloadcost||} + w_2\frac{\sum voltagecost}{||overvoltagecost||}
+    + w_3\frac{\sum losses}{||losses||} + w_4\frac{\sum capex}{||capex||} + w_5\frac{\sum opex}{||opex||}
diff --git a/doc/rst_source/theory/models.rst b/doc/rst_source/theory/models.rst
@@ -15,3 +15,4 @@ such that you can extend on them.
     branch_model
     xfo_sc
     simulations
+
diff --git a/doc/rst_source/theory/opf/nonconvex_acopf/main.aux b/doc/rst_source/theory/opf/nonconvex_acopf/main.aux
@@ -0,0 +1,24 @@
+\relax 
+\providecommand\babel@aux[2]{}
+\@nameuse{bbl@beforestart}
+\bibstyle{unsrtnat}
+\citation{chatzivasileiadis2018optimization}
+\citation{ergun2019optimal}
+\citation{zimmerman2016matpower}
+\babel@aux{english}{}
+\@writefile{toc}{\contentsline {section}{\numberline {1}Introduction}{1}{}\protected@file@percent }
+\@writefile{toc}{\contentsline {section}{\numberline {2}ACOPF}{1}{}\protected@file@percent }
+\newlabel{eq:sbus}{{4}{1}}
+\citation{nocedal1999numerical}
+\@writefile{toc}{\contentsline {section}{\numberline {3}IPM}{3}{}\protected@file@percent }
+\newlabel{eq:block1}{{20}{3}}
+\newlabel{eq:block2}{{23}{3}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.1}Equalities}{3}{}\protected@file@percent }
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.2}Inequalities}{3}{}\protected@file@percent }
+\bibdata{references}
+\bibcite{chatzivasileiadis2018optimization}{{1}{2018}{{Chatzivasileiadis}}{{}}}
+\bibcite{ergun2019optimal}{{2}{2019}{{Ergun et~al.}}{{Ergun, Dave, Van~Hertem, and Geth}}}
+\bibcite{zimmerman2016matpower}{{3}{2016}{{Zimmerman and Murillo-Sanchez}}{{}}}
+\bibcite{nocedal1999numerical}{{4}{1999}{{Nocedal and Wright}}{{}}}
+\@writefile{toc}{\contentsline {section}{\numberline {4}Conclusion}{4}{}\protected@file@percent }
+\gdef \@abspage@last{4}
diff --git a/doc/rst_source/theory/opf/nonconvex_acopf/main.bbl b/doc/rst_source/theory/opf/nonconvex_acopf/main.bbl
@@ -0,0 +1,31 @@
+\begin{thebibliography}{4}
+\providecommand{\natexlab}[1]{#1}
+\providecommand{\url}[1]{\texttt{#1}}
+\expandafter\ifx\csname urlstyle\endcsname\relax
+  \providecommand{\doi}[1]{doi: #1}\else
+  \providecommand{\doi}{doi: \begingroup \urlstyle{rm}\Url}\fi
+
+\bibitem[Chatzivasileiadis(2018)]{chatzivasileiadis2018optimization}
+Spyros Chatzivasileiadis.
+\newblock Optimization in modern power systems.
+\newblock \emph{Lecture Notes. Tech. Univ. of Denmark. Available online:
+  https://arxiv. org/pdf/1811.00943. pdf}, 2018.
+
+\bibitem[Ergun et~al.(2019)Ergun, Dave, Van~Hertem, and Geth]{ergun2019optimal}
+Hakan Ergun, Jaykumar Dave, Dirk Van~Hertem, and Frederik Geth.
+\newblock Optimal power flow for ac--dc grids: Formulation, convex relaxation,
+  linear approximation, and implementation.
+\newblock \emph{IEEE transactions on power systems}, 34\penalty0 (4):\penalty0
+  2980--2990, 2019.
+
+\bibitem[Zimmerman and Murillo-Sanchez(2016)]{zimmerman2016matpower}
+Ray~D Zimmerman and Carlos~E Murillo-Sanchez.
+\newblock Matpower 6.0 users manual.
+\newblock \emph{Power Systems Engineering Research Center}, 9, 2016.
+
+\bibitem[Nocedal and Wright(1999)]{nocedal1999numerical}
+Jorge Nocedal and Stephen~J Wright.
+\newblock \emph{Numerical optimization}.
+\newblock Springer, 1999.
+
+\end{thebibliography}
diff --git a/doc/rst_source/theory/opf/nonconvex_acopf/main.blg b/doc/rst_source/theory/opf/nonconvex_acopf/main.blg
@@ -0,0 +1,48 @@
+This is BibTeX, Version 0.99d
+Capacity: max_strings=200000, hash_size=200000, hash_prime=170003
+The top-level auxiliary file: main.aux
+Reallocating 'name_of_file' (item size: 1) to 9 items.
+The style file: unsrtnat.bst
+Reallocating 'name_of_file' (item size: 1) to 11 items.
+Database file #1: references.bib
+You've used 4 entries,
+            2481 wiz_defined-function locations,
+            575 strings with 5093 characters,
+and the built_in function-call counts, 1350 in all, are:
+= -- 109
+> -- 64
+< -- 3
++ -- 26
+- -- 18
+* -- 91
+:= -- 225
+add.period$ -- 12
+call.type$ -- 4
+change.case$ -- 7
+chr.to.int$ -- 4
+cite$ -- 4
+duplicate$ -- 74
+empty$ -- 127
+format.name$ -- 26
+if$ -- 280
+int.to.chr$ -- 1
+int.to.str$ -- 5
+missing$ -- 5
+newline$ -- 28
+num.names$ -- 12
+pop$ -- 35
+preamble$ -- 1
+purify$ -- 4
+quote$ -- 0
+skip$ -- 46
+stack$ -- 0
+substring$ -- 39
+swap$ -- 8
+text.length$ -- 0
+text.prefix$ -- 0
+top$ -- 0
+type$ -- 25
+warning$ -- 0
+while$ -- 10
+width$ -- 0
+write$ -- 57