Merge branch 'master' of https://github.com/IIT-EnergySystemModels/op…

…enTEPES

CHANGELOG.rst

@@ -1,8 +1,10 @@
 Change Log
 =============
 
-[4.17.9] - 2024-11-12
+[4.17.9] - 2024-11-19
 -----------------------
+- [FIXED] fix error in network map
+- [FIXED] fix error in computing cost recovery
 - [FIXED] fix error in computing pDemandElecPeak in InputData
 - [CHANGED] keep the model in memory
 - [CHANGED] default values of minimum output results

doc/rst/Download.rst

@@ -2,7 +2,7 @@
 
 Download & Installation
 =======================
-The **openTEPES** model has been developed using `Python 3.12.6 <https://www.python.org/>`_ and `Pyomo 6.8.0 <https://pyomo.readthedocs.io/en/stable/>`_ and it uses `Gurobi 11.0.3 <https://www.gurobi.com/products/gurobi-optimizer/>`_ as commercial MIP solver for which a free academic license is available.
+The **openTEPES** model has been developed using `Python 3.12.3 <https://www.python.org/>`_ and `Pyomo 6.8.2 <https://pyomo.readthedocs.io/en/stable/>`_ and it uses `Gurobi 12.0.0 <https://www.gurobi.com/products/gurobi-optimizer/>`_ as commercial MIP solver for which a free academic license is available.
 It uses Pyomo so that it is independent of the preferred solver. You can alternatively use one of the free solvers `HiGHS 1.8.0 <https://ergo-code.github.io/HiGHS/dev/interfaces/python/#python-getting-started>`_, `SCIP 9.1.1 <https://www.scipopt.org/>`_, `GLPK 5.0 <https://www.gnu.org/software/glpk/>`_,
 and `CBC 2.10.12 <https://github.com/coin-or/Cbc/releases>`_. List the serial solver interfaces under Pyomo with this call::
 

doc/rst/Projects.rst

@@ -4,6 +4,11 @@ Research projects
 =================
 The model has being used in these research projects:
 
+- `Analysis of energy scenarios for Spain 2030-2050. <https://www.iit.comillas.edu/publicacion/proyecto/en/Naturgy_Escenarios_2024/An%c3%a1lisis_de_escenarios_energ%c3%a9ticos_para_Espa%c3%b1a_2030-2050>`_, developed for **Naturgy Innovahub SLU**.
+  September 2024 - December 2024. `P. Linares <https://www.iit.comillas.edu/people/pedrol>`_, `J.P. Chaves <https://www.iit.comillas.edu/people/jchaves>`_, `A.F. Rodríguez Matas <https://www.iit.comillas.edu/people/afrmatas>`_
+
+    It aims to contribute to the design of robust investment strategies for Naturgy in the 2030-2050 horizon, with a case study for Spain.
+
 - `Quantifying the techno-economic benefits of distributed storage deployment and demand response. <https://www.iit.comillas.edu/publicacion/proyecto/en/SAMSO_BATERIAS_DR_2024/Cuantificaci%C3%B3n%20de%20los%20beneficios%20t%C3%A9cnico-econ%C3%B3micos%20del%20despliegue%20del%20almacenamiento%20distribuido%20y%20la%20respuesta%20de%20la%20demanda>`_, developed for **SAMSO, UNEF, AEPIBAL, PIMEC, OCTOPUS**.
   September 2024 - January 2025. `C. Mateo <https://www.iit.comillas.edu/people/cmateo>`_, `J.P. Chaves <https://www.iit.comillas.edu/people/jchaves>`_, `A. Ramos <https://www.iit.comillas.edu/people/aramos>`_, `F. Martín <https://www.iit.comillas.edu/people/fmartin>`_, `T. Gómez <https://www.iit.comillas.edu/people/tomas>`_, `M. Martínez <https://www.iit.comillas.edu/people/mmartinezv>`_
 

openTEPES/openTEPES.py

@@ -1,5 +1,5 @@
 """
-Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - November 12, 2024
+Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - November 19, 2024
 """
 
 # import dill as pickle
@@ -39,8 +39,8 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
     idxDict['y'  ] = 1
 
     #%% model declaration
-    mTEPES = ConcreteModel('Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.9 - November 12, 2024')
-    print(                 'Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.9 - November 12, 2024', file=open(_path+f'/openTEPES_version_{CaseName}.log','w'))
+    mTEPES = ConcreteModel('Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.9 - November 19, 2024')
+    print(                 'Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.9 - November 19, 2024', file=open(_path+f'/openTEPES_version_{CaseName}.log','w'))
 
     pIndOutputResults = [j for i,j in idxDict.items() if i == pIndOutputResults][0]
     pIndLogConsole    = [j for i,j in idxDict.items() if i == pIndLogConsole   ][0]

openTEPES/openTEPES_Main.py

@@ -660,7 +660,7 @@
 # For more information on this, and how to apply and follow the GNU AGPL, see
 # <https://www.gnu.org/licenses/>.
 
-# Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - November 12, 2024
+# Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - November 19, 2024
 # simplicity and transparency in power systems planning
 
 # Developed by
@@ -685,7 +685,7 @@
 # import pkg_resources
 from .openTEPES import openTEPES_run
 
-print('\033[1;32mOpen Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.9 - November 12, 2024\033[0m')
+print('\033[1;32mOpen Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.9 - November 19, 2024\033[0m')
 print('\033[34m#### Academic research license - for non-commercial use only ####\033[0m \n')
 
 parser = argparse.ArgumentParser(description='Introducing main parameters...')