openTEPES 4.18.2__py3-none-any.whl → 4.18.3__py3-none-any.whl

openTEPES/openTEPES_ProblemSolving.py

@@ -1,5 +1,5 @@
 """
-Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - November 08, 2024
+Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - January 27, 2025
 """
 
 import time
@@ -56,16 +56,15 @@ def ProblemSolving(DirName, CaseName, SolverName, OptModel, mTEPES, pIndLogConso
         if os.path.exists(FileName):
             os.remove(FileName)
         Solver.options['log_file'               ] = _path+f'/openTEPES_highs_{CaseName}_{p}_{sc}_{st}.log'
-        Solver.options['log_to_console'         ] = 'true'
         Solver.options['solver'                 ] = 'simplex'
-        Solver.options['run_crossover'          ] = 'off'
+        Solver.options['run_crossover'          ] = 'on'
         Solver.options['mip_rel_gap'            ] = 0.01
         Solver.options['threads'                ] = int((psutil.cpu_count(logical=True) + psutil.cpu_count(logical=False))/2)
         Solver.options['time_limit'             ] =    36000
         Solver.options['simplex_iteration_limit'] = 36000000
-    if SolverName == 'gams':
+    if SolverName == 'gams' or SolverName == 'GAMS':
         solver_options = {
-            'file COPT / cplex.opt / ; put COPT putclose "LPMethod 4" / "RINSHeur 100" / ; GAMS_MODEL.OptFile = 1 ;'
+            'file COPT / cplex.opt / ; put COPT putclose "LPMethod 4" / "EpGap 0.01" / ; GAMS_MODEL.OptFile = 1 ;'
             'option SysOut  = off   ;',
             'option LP      = cplex ; option MIP     = cplex    ;',
             'option ResLim  = 36000 ; option IterLim = 36000000 ;',

{opentepes-4.18.2.dist-info → opentepes-4.18.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openTEPES
-Version: 4.18.2
+Version: 4.18.3
 Summary: Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES)
 Home-page: https://pascua.iit.comillas.edu/aramos/openTEPES/index.html
 Author: IIT-EnergySystemModels
@@ -66,7 +66,10 @@ The **openTEPES** model has been developed at the `Instituto de Investigación T
 The **openTEPES** model presents a decision support system for defining the **integrated generation, storage, and transmission resource planning** (IRP, GEP+SEP+TEP) of a **large-scale electric system** at a tactical level (i.e., time horizons of 10-20 years),
 defined as a set of **generation, storage, and (electricity, hydrogen, and heat) networks dynamic investment decisions for multiple future years**.
 
-It is integrated in the `open energy system modelling platform  <https://openenergymodels.net/>`_ helping modelling Europe's energy system.
+It is integrated into the `open energy system modelling platform <https://openenergymodels.net/>`_, helping model Europe's energy system and in the list of `energy models published under open source licenses <https://wiki.openmod-initiative.org/wiki/Open_Models>`_.
+It is also part of the Africa `open energy system modelling toolbox <https://africaenergymodels.net/>`_, which is a suite of open and linked state-of-the-art open-source energy system models for Africa.
+
+Scripts are provided to exchange information with Integrated Assessment Models (IAM) using their `nomenclature and data formats <https://nomenclature-iamc.readthedocs.io/en/stable/>`_.
 
 It has been used by the **Ministry for the Ecological Transition and the Demographic Challenge (MITECO)** to analyze the electricity sector in the latest Spanish `National Energy and Climate Plan (NECP) Update 2023-2030 <https://www.miteco.gob.es/content/dam/miteco/es/energia/files-1/pniec-2023-2030/PNIEC_2024_240924.pdf>`_ in September 2024.
 
@@ -74,7 +77,7 @@ Reference
 ############
 **A. Ramos, E. Quispe, S. Lumbreras** `“OpenTEPES: Open-source Transmission and Generation Expansion Planning” <https://www.sciencedirect.com/science/article/pii/S235271102200053X>`_ SoftwareX 18: June 2022 `10.1016/j.softx.2022.101070 <https://doi.org/10.1016/j.softx.2022.101070>`_.
 
-**openTEPES**: `summary presentation <https://pascua.iit.comillas.edu/aramos/openTEPES.pdf>`_ and `installation <https://pascua.iit.comillas.edu/aramos/openTEPES_installation.pdf>`_
+**openTEPES**: `summary presentation <https://pascua.iit.comillas.edu/aramos/openTEPES.pdf>`_, `présentation (French) <https://pascua.iit.comillas.edu/aramos/openTEPES_fr.pdf>`_, and `installation <https://pascua.iit.comillas.edu/aramos/openTEPES_installation.pdf>`_
 
 Description
 ############

{opentepes-4.18.2.dist-info → opentepes-4.18.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
-openTEPES/__init__.py,sha256=QGVjYBk-tvIK0QGDJpFU41UnmWDlethIi7LhVqv_huw,832
+openTEPES/__init__.py,sha256=PuLMxCWXTuXja-37mg32JjEBhTtCOXxynRhR9tbupTg,832
 openTEPES/openTEPES.mapbox_token,sha256=xsXNkwGp2vzXqQy2zVkyLhhNcNWniK2BMeOFpc5SZHI,93
-openTEPES/openTEPES.py,sha256=SfROIuJtiLpcrkuizmooHZ8yUndnEjspA1d08J1Tbpw,20736
-openTEPES/openTEPES_InputData.py,sha256=VuKwKbugL9z2jEXIvDrtcbt2L2_ZvZxf2YzcLdP7XqA,212075
-openTEPES/openTEPES_Main.py,sha256=vXh1GYdfn7JzIe7kXiSCl2S9RQdPem7HmUHcf8jacp0,39867
-openTEPES/openTEPES_ModelFormulation.py,sha256=U9HxoeqO96C-jgcYjX03Ie4zWCXT-hPp2zGIIXlAjV0,115918
-openTEPES/openTEPES_OutputResults.py,sha256=xO3BFeCYWMTBJJrCs-9rTWFeSd0zUb3FVjDIVR2Dap4,207496
-openTEPES/openTEPES_ProblemSolving.py,sha256=XRZolKfwqPMH61P3GKklGWoUQ_v9S8jlypaJKALo-Q8,14776
+openTEPES/openTEPES.py,sha256=LLzQlfp5VWwQaFTfG_-y-LC9IuA-qzIGMRhaAjhi0EM,21143
+openTEPES/openTEPES_InputData.py,sha256=blUzjw4zTp5SciPlGDGKuwoA_PzqkY4u5YY6WFDDiHE,213218
+openTEPES/openTEPES_Main.py,sha256=wWbl_KAYNzOhLtYqQR-UQwZ4l7hJvZzojhn3aSKBmIQ,39916
+openTEPES/openTEPES_ModelFormulation.py,sha256=mCyvXtiwNZ8ixsFXV7dGV9EeME1ZEjnHwrlmHOZ7CXg,117660
+openTEPES/openTEPES_OutputResults.py,sha256=lifyQkf2EO5BIvnyVOdNtNqoHa57TteY7hwgxia7lFU,211055
+openTEPES/openTEPES_ProblemSolving.py,sha256=zKic5bdkge5X4VCsPrDR7owZAPepupWZDhNVvzWBUuQ,14736
 openTEPES/openTEPES_gitinfo.py,sha256=6fA1fa-JcyusSc_HcjPiCgnV9zn-fZwdG-kK0a5Fxc8,2004
 openTEPES/.idea/.name,sha256=jiwfcnJ20wztcvpny4SHcqmAIWK-w5tCqN9TWf0GOkw,11
 openTEPES/.idea/misc.xml,sha256=m4-3O284ZBS8WZSQD0QWwk8YjuQYz92w6kr7NRFNips,298
@@ -28,8 +28,8 @@ openTEPES/9n/oT_Data_OperatingReserveUp_9n.csv,sha256=VqBDqfaIPiD1guy1rLNAYEEZYW
 openTEPES/9n/oT_Data_Option_9n.csv,sha256=2onSiuxVxB0WXX45pBWpfb6uoGY1o_FuAYKrp7w3cpQ,230
 openTEPES/9n/oT_Data_Parameter_9n.csv,sha256=Gn-pzaThuI_w9USJwZ-AGDy5VnXMuVnmiac3W1sm2ds,220
 openTEPES/9n/oT_Data_Period_9n.csv,sha256=NFbJq1PV7fhKMp7ocoy_hy42mKuVabBdPqe9Pt2IVQ4,26
-openTEPES/9n/oT_Data_RESEnergy_9n.csv,sha256=ixdok7qrTAC7AThKj9bzuIFNPkg_3xwQm1mBOWDcX7U,44
-openTEPES/9n/oT_Data_ReserveMargin_9n.csv,sha256=cvKu0ew_K8_xtyvlQAvGG-eS9UlPSKs9mUxMrmc50hw,50
+openTEPES/9n/oT_Data_RESEnergy_9n.csv,sha256=zOj39jlgP1Pj6oIWDY8Kr-ysvvKUhkap5zCZn9s68is,40
+openTEPES/9n/oT_Data_ReserveMargin_9n.csv,sha256=WCIVw1Yr64PzAOBRta-7h4Ri8G0kLNvdu7700sQr6Yg,46
 openTEPES/9n/oT_Data_Scenario_9n.csv,sha256=UGeFNxqb6ysUgpVrLESkfFGy-3X9nzJoeRooynFTTQQ,45
 openTEPES/9n/oT_Data_Stage_9n.csv,sha256=fHzcT28maF4tn7D92epcXLZqsQct_ZrmOfLGZj12B6Q,24
 openTEPES/9n/oT_Data_VariableEmissionCost_9n.csv,sha256=OVKIL2LhUakkInIKxvL8GjE7jcGQyod3ZOxG3LDtRZM,419537
@@ -335,8 +335,8 @@ openTEPES/sSEP/oT_Dict_Storage_sSEP.csv,sha256=H2rJXZvoMuT-25sI2GpG8IuiNKD-dxuty
 openTEPES/sSEP/oT_Dict_Technology_sSEP.csv,sha256=MCTpplzz7_eVPKQfOw35c86ib6CTtW6UK6JrbCJ8wls,170
 openTEPES/sSEP/oT_Dict_ZoneToArea_sSEP.csv,sha256=AUDCs5Bg6sw9f2pVjGP1o4IJjXFF_VrokOGf_V3QsEI,24
 openTEPES/sSEP/oT_Dict_Zone_sSEP.csv,sha256=TBud-fvbFbiAsuutxTYe8wWlv_x1P8oyWXILMpYiXJc,13
-opentepes-4.18.2.dist-info/entry_points.txt,sha256=gNNPrDaTsRuRJXI1FLNgqMX1CiJ45bEp1dEDH7ZB8Oc,49
-opentepes-4.18.2.dist-info/LICENSE,sha256=4O7bphXVzRuYavtsWzpLGuM3E-fp3HTRna7F4yIfnS4,35184
-opentepes-4.18.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-opentepes-4.18.2.dist-info/METADATA,sha256=0K3Xm4OnlFCgugK1j379l_i_iWFjqVd2xSWOFciWGo0,17788
-opentepes-4.18.2.dist-info/RECORD,,
+opentepes-4.18.3.dist-info/entry_points.txt,sha256=gNNPrDaTsRuRJXI1FLNgqMX1CiJ45bEp1dEDH7ZB8Oc,49
+opentepes-4.18.3.dist-info/LICENSE,sha256=4O7bphXVzRuYavtsWzpLGuM3E-fp3HTRna7F4yIfnS4,35184
+opentepes-4.18.3.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+opentepes-4.18.3.dist-info/METADATA,sha256=zxBf3NCfvcib0pJoHWv-Kg8bPMWiANOhW0qfo_odYiA,18389
+opentepes-4.18.3.dist-info/RECORD,,