openTEPES 4.18.4__py3-none-any.whl → 4.18.5__py3-none-any.whl

openTEPES/9n_PTDF/oT_Dict_NodeToZone_9n_PTDF.csv

@@ -0,0 +1,10 @@
+Node,Zone
+Node_1,Zone1
+Node_2,Zone2
+Node_3,Zone3
+Node_4,Zone4
+Node_5,Zone5
+Node_6,Zone6
+Node_7,Zone7
+Node_8,Zone8
+Node_9,Zone9

openTEPES/9n_PTDF/oT_Dict_Node_9n_PTDF.csv

@@ -0,0 +1,10 @@
+Node
+Node_1
+Node_2
+Node_3
+Node_4
+Node_5
+Node_6
+Node_7
+Node_8
+Node_9

openTEPES/9n_PTDF/oT_Dict_Period_9n_PTDF.csv

@@ -0,0 +1,2 @@
+Period
+2030

openTEPES/9n_PTDF/oT_Dict_Region_9n_PTDF.csv

@@ -0,0 +1,31 @@
+Region
+AT
+BE
+BG
+CH
+CY
+CZ
+DE
+DK
+EE
+EL
+ES
+FI
+FR
+HR
+HU
+IE
+IT
+LT
+LU
+LV
+MT
+NL
+NO
+PL
+PT
+RO
+SE
+SI
+SK
+UK

openTEPES/9n_PTDF/oT_Dict_Scenario_9n_PTDF.csv

@@ -0,0 +1,2 @@
+Scenario
+sc01

openTEPES/9n_PTDF/oT_Dict_Stage_9n_PTDF.csv

@@ -0,0 +1,2 @@
+Stage
+st1

openTEPES/9n_PTDF/oT_Dict_Storage_9n_PTDF.csv

@@ -0,0 +1,3 @@
+StorageType
+Daily
+Weekly

openTEPES/9n_PTDF/oT_Dict_Technology_9n_PTDF.csv

@@ -0,0 +1,7 @@
+Technology
+Nuclear
+Coal
+Gas
+Oil
+RES
+ESS

openTEPES/9n_PTDF/oT_Dict_ZoneToArea_9n_PTDF.csv

@@ -0,0 +1,10 @@
+Zone,Area
+Zone1,Area1
+Zone2,Area1
+Zone3,Area1
+Zone4,Area1
+Zone5,Area1
+Zone6,Area1
+Zone7,Area1
+Zone8,Area1
+Zone9,Area1

openTEPES/9n_PTDF/oT_Dict_Zone_9n_PTDF.csv

@@ -0,0 +1,10 @@
+Zone
+Zone1
+Zone2
+Zone3
+Zone4
+Zone5
+Zone6
+Zone7
+Zone8
+Zone9

openTEPES/RTS-GMLC_6y/oT_Dict_AreaToRegion_RTS-GMLC_6y.csv

@@ -1,4 +1,4 @@
-Area,Region
-Area_1,Region_1
-Area_2,Region_1
-Area_3,Region_1
+Area,Region
+Area_1,Region_1
+Area_2,Region_1
+Area_3,Region_1

openTEPES/RTS-GMLC_6y/oT_Dict_Area_RTS-GMLC_6y.csv

@@ -1,4 +1,4 @@
-Area
-Area_1
-Area_2
-Area_3
+Area
+Area_1
+Area_2
+Area_3

openTEPES/RTS-GMLC_6y/oT_Dict_Circuit_RTS-GMLC_6y.csv

@@ -1,5 +1,5 @@
-Circuit
-eac1
-eac2
-eac3
-eac4
+Circuit
+eac1
+eac2
+eac3
+eac4

openTEPES/RTS-GMLC_6y/oT_Dict_Line_RTS-GMLC_6y.csv

@@ -1,3 +1,3 @@
-LineType
-AC
-DC
+LineType
+AC
+DC

openTEPES/RTS-GMLC_6y/oT_Dict_NodeToZone_RTS-GMLC_6y.csv

@@ -1,74 +1,74 @@
-Node,Zone
-Node_101,Zone_11
-Node_102,Zone_12
-Node_103,Zone_11
-Node_104,Zone_11
-Node_105,Zone_11
-Node_106,Zone_12
-Node_107,Zone_12
-Node_108,Zone_12
-Node_109,Zone_13
-Node_110,Zone_13
-Node_111,Zone_13
-Node_112,Zone_13
-Node_113,Zone_14
-Node_114,Zone_16
-Node_115,Zone_16
-Node_116,Zone_16
-Node_117,Zone_17
-Node_118,Zone_17
-Node_119,Zone_15
-Node_120,Zone_15
-Node_121,Zone_17
-Node_122,Zone_17
-Node_123,Zone_15
-Node_124,Zone_16
-Node_201,Zone_21
-Node_202,Zone_22
-Node_203,Zone_21
-Node_204,Zone_21
-Node_205,Zone_21
-Node_206,Zone_22
-Node_207,Zone_22
-Node_208,Zone_22
-Node_209,Zone_23
-Node_210,Zone_23
-Node_211,Zone_23
-Node_212,Zone_23
-Node_213,Zone_24
-Node_214,Zone_26
-Node_215,Zone_26
-Node_216,Zone_26
-Node_217,Zone_27
-Node_218,Zone_27
-Node_219,Zone_25
-Node_220,Zone_25
-Node_221,Zone_27
-Node_222,Zone_27
-Node_223,Zone_25
-Node_224,Zone_26
-Node_301,Zone_31
-Node_302,Zone_32
-Node_303,Zone_31
-Node_304,Zone_31
-Node_305,Zone_31
-Node_306,Zone_32
-Node_307,Zone_32
-Node_308,Zone_32
-Node_309,Zone_33
-Node_310,Zone_33
-Node_311,Zone_33
-Node_312,Zone_33
-Node_313,Zone_34
-Node_314,Zone_36
-Node_315,Zone_36
-Node_316,Zone_36
-Node_317,Zone_37
-Node_318,Zone_37
-Node_319,Zone_35
-Node_320,Zone_35
-Node_321,Zone_37
-Node_322,Zone_37
-Node_323,Zone_35
-Node_324,Zone_36
-Node_325,Zone_35
+Node,Zone
+Node_101,Zone_11
+Node_102,Zone_12
+Node_103,Zone_11
+Node_104,Zone_11
+Node_105,Zone_11
+Node_106,Zone_12
+Node_107,Zone_12
+Node_108,Zone_12
+Node_109,Zone_13
+Node_110,Zone_13
+Node_111,Zone_13
+Node_112,Zone_13
+Node_113,Zone_14
+Node_114,Zone_16
+Node_115,Zone_16
+Node_116,Zone_16
+Node_117,Zone_17
+Node_118,Zone_17
+Node_119,Zone_15
+Node_120,Zone_15
+Node_121,Zone_17
+Node_122,Zone_17
+Node_123,Zone_15
+Node_124,Zone_16
+Node_201,Zone_21
+Node_202,Zone_22
+Node_203,Zone_21
+Node_204,Zone_21
+Node_205,Zone_21
+Node_206,Zone_22
+Node_207,Zone_22
+Node_208,Zone_22
+Node_209,Zone_23
+Node_210,Zone_23
+Node_211,Zone_23
+Node_212,Zone_23
+Node_213,Zone_24
+Node_214,Zone_26
+Node_215,Zone_26
+Node_216,Zone_26
+Node_217,Zone_27
+Node_218,Zone_27
+Node_219,Zone_25
+Node_220,Zone_25
+Node_221,Zone_27
+Node_222,Zone_27
+Node_223,Zone_25
+Node_224,Zone_26
+Node_301,Zone_31
+Node_302,Zone_32
+Node_303,Zone_31
+Node_304,Zone_31
+Node_305,Zone_31
+Node_306,Zone_32
+Node_307,Zone_32
+Node_308,Zone_32
+Node_309,Zone_33
+Node_310,Zone_33
+Node_311,Zone_33
+Node_312,Zone_33
+Node_313,Zone_34
+Node_314,Zone_36
+Node_315,Zone_36
+Node_316,Zone_36
+Node_317,Zone_37
+Node_318,Zone_37
+Node_319,Zone_35
+Node_320,Zone_35
+Node_321,Zone_37
+Node_322,Zone_37
+Node_323,Zone_35
+Node_324,Zone_36
+Node_325,Zone_35

openTEPES/RTS-GMLC_6y/oT_Dict_Region_RTS-GMLC_6y.csv

@@ -1,2 +1,2 @@
-Region
-Region_1
+Region
+Region_1

openTEPES/RTS-GMLC_6y/oT_Dict_Scenario_RTS-GMLC_6y.csv

@@ -1,2 +1,2 @@
-Scenario
-sc01
+Scenario
+sc01

openTEPES/RTS-GMLC_6y/oT_Dict_Storage_RTS-GMLC_6y.csv

@@ -1,3 +1,3 @@
-StorageType
-Daily
-Weekly
+StorageType
+Daily
+Weekly

openTEPES/RTS-GMLC_6y/oT_Dict_Technology_RTS-GMLC_6y.csv

@@ -1,10 +1,10 @@
-Technology
-Oil
-Coal
-NG
-Sync_Cond
-Nuclear
-Hydro
-Solar
-Wind
-Storage
+Technology
+Oil
+Coal
+NG
+Sync_Cond
+Nuclear
+Hydro
+Solar
+Wind
+Storage

openTEPES/RTS-GMLC_6y/oT_Dict_ZoneToArea_RTS-GMLC_6y.csv

@@ -1,22 +1,22 @@
-Zone,Area
-Zone_11,Area_1
-Zone_12,Area_1
-Zone_13,Area_1
-Zone_14,Area_1
-Zone_16,Area_1
-Zone_17,Area_1
-Zone_15,Area_1
-Zone_21,Area_2
-Zone_22,Area_2
-Zone_23,Area_2
-Zone_24,Area_2
-Zone_26,Area_2
-Zone_27,Area_2
-Zone_25,Area_2
-Zone_31,Area_3
-Zone_32,Area_3
-Zone_33,Area_3
-Zone_34,Area_3
-Zone_36,Area_3
-Zone_37,Area_3
-Zone_35,Area_3
+Zone,Area
+Zone_11,Area_1
+Zone_12,Area_1
+Zone_13,Area_1
+Zone_14,Area_1
+Zone_16,Area_1
+Zone_17,Area_1
+Zone_15,Area_1
+Zone_21,Area_2
+Zone_22,Area_2
+Zone_23,Area_2
+Zone_24,Area_2
+Zone_26,Area_2
+Zone_27,Area_2
+Zone_25,Area_2
+Zone_31,Area_3
+Zone_32,Area_3
+Zone_33,Area_3
+Zone_34,Area_3
+Zone_36,Area_3
+Zone_37,Area_3
+Zone_35,Area_3

openTEPES/RTS-GMLC_6y/oT_Dict_Zone_RTS-GMLC_6y.csv

@@ -1,22 +1,22 @@
-Zone
-Zone_11
-Zone_12
-Zone_13
-Zone_14
-Zone_16
-Zone_17
-Zone_15
-Zone_21
-Zone_22
-Zone_23
-Zone_24
-Zone_26
-Zone_27
-Zone_25
-Zone_31
-Zone_32
-Zone_33
-Zone_34
-Zone_36
-Zone_37
-Zone_35
+Zone
+Zone_11
+Zone_12
+Zone_13
+Zone_14
+Zone_16
+Zone_17
+Zone_15
+Zone_21
+Zone_22
+Zone_23
+Zone_24
+Zone_26
+Zone_27
+Zone_25
+Zone_31
+Zone_32
+Zone_33
+Zone_34
+Zone_36
+Zone_37
+Zone_35

openTEPES/__init__.py

@@ -14,7 +14,7 @@ Open Generation, Storage, and Transmission Operation and Expansion Planning Mode
         >>> import openTEPES as oT
         >>> oT.routine("9n", "C:\\Users\\UserName\\Documents\\GitHub\\openTEPES", "glpk")
 """
-__version__ = "4.18.4"
+__version__ = "4.18.5"
 
 from .openTEPES_Main             import main
 from .openTEPES                  import *

openTEPES/openTEPES.py

@@ -1,5 +1,5 @@
 """
-Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - April 03, 2025
+Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - June 20, 2025
 """
 
 # 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.18.4 - April 03, 2025')
-    print(                 'Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.18.4 - April 03, 2025', file=open(f'{_path}/openTEPES_version_{CaseName}.log','w'))
+    mTEPES = ConcreteModel('Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.18.5 - June 23, 2025')
+    print(                 'Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.18.5 - June 23, 2025', file=open(f'{_path}/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]
@@ -100,12 +100,12 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
             if sum(1 for rs,h in mTEPES.r2p):
                 mTEPES.npc  = [(n,h ) for n,h  in mTEPES.n*mTEPES.h  if sum(1 for rs in mTEPES.rs if (rs,h) in mTEPES.r2p) and mTEPES.n.ord(n) % sum(mTEPES.pReservoirTimeStep[rs] for rs in mTEPES.rs if (rs,h) in mTEPES.r2p) == 0]
             else:
-                mTEPES.npc  = []
+                mTEPES.npc = []
             mTEPES.nrsc     = [(n,rs) for n,rs in mTEPES.n*mTEPES.rs if mTEPES.n.ord(n) %     mTEPES.pReservoirTimeStep[rs] == 0]
             mTEPES.nrcc     = [(n,rs) for n,rs in mTEPES.n*mTEPES.rn if mTEPES.n.ord(n) %     mTEPES.pReservoirTimeStep[rs] == 0]
             mTEPES.nrso     = [(n,rs) for n,rs in mTEPES.n*mTEPES.rs if mTEPES.n.ord(n) %     mTEPES.pWaterOutTimeStep [rs] == 0]
 
-        if len(mTEPES.st):
+        if mTEPES.st:
 
             # load levels up to the current stage for emission and RES energy constraints
             # if (p != mTEPES.p.first() or sc != mTEPES.sc.first()) and st == mTEPES.First_st:
@@ -153,6 +153,9 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
                 if  (max([mTEPES.pRESEnergy[p,ar] for ar in mTEPES.ar]) == 0
                 and (min([mTEPES.pEmission [p,ar] for ar in mTEPES.ar]) == math.inf or sum(mTEPES.pEmissionRate[nr] for nr in mTEPES.nr) == 0)):
 
+                    if (p,sc) == mTEPES.ps.last() and st == mTEPES.Last_st and mTEPES.NoRepetition == 0:
+                        mTEPES.NoRepetition = 1
+
                     # Writing LP file
                     if pIndLogConsole == 1:
                         StartTime         = time.time()
@@ -177,6 +180,9 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
 
                     if st == mTEPES.Last_st and mTEPES.NoRepetition == 0:
 
+                        if (p,sc) == mTEPES.ps.last():
+                            mTEPES.NoRepetition = 1
+
                         mTEPES.del_component(mTEPES.st)
                         mTEPES.del_component(mTEPES.n )
                         mTEPES.del_component(mTEPES.n2)
@@ -203,7 +209,7 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
                             mTEPES.nrcc     = [(n,rs) for n,rs in mTEPES.n*mTEPES.rn if mTEPES.n.ord(n) %     mTEPES.pReservoirTimeStep[rs] == 0]
                             mTEPES.nrso     = [(n,rs) for n,rs in mTEPES.n*mTEPES.rs if mTEPES.n.ord(n) %     mTEPES.pWaterOutTimeStep [rs] == 0]
 
-                        # Writing LP file
+                        # Writing an LP file
                         if pIndLogConsole == 1:
                             StartTime         = time.time()
                             mTEPES.write(f'{_path}/openTEPES_{CaseName}_{p}_{sc}_{st}.lp', io_options={'symbolic_solver_labels': True})
@@ -211,7 +217,7 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
                             StartTime         = time.time()
                             print('Writing LP file                        ... ', round(WritingLPFileTime), 's')
 
-                        # there are investment decisions (it is an expansion and operation model) or there are system emission constraints
+                        # there are investment decisions (it is an expansion and operation model), or there are system emission constraints
                         ProblemSolving(DirName, CaseName, SolverName, mTEPES, mTEPES, pIndLogConsole, p, sc, st)
 
                         # deactivate the constraints of the previous period and scenario
@@ -256,7 +262,7 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
                             mTEPES.nrcc     = [(n,rs) for n,rs in mTEPES.n*mTEPES.rn if mTEPES.n.ord(n) %     mTEPES.pReservoirTimeStep[rs] == 0]
                             mTEPES.nrso     = [(n,rs) for n,rs in mTEPES.n*mTEPES.rs if mTEPES.n.ord(n) %     mTEPES.pWaterOutTimeStep [rs] == 0]
 
-                        # Writing LP file
+                        # Writing an LP file
                         if pIndLogConsole == 1:
                             StartTime         = time.time()
                             mTEPES.write(f'{_path}/openTEPES_{CaseName}_{p}_{sc}_{st}.lp', io_options={'symbolic_solver_labels': True})
@@ -264,7 +270,7 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
                             StartTime         = time.time()
                             print('Writing LP file                        ... ', round(WritingLPFileTime), 's')
 
-                        # there are investment decisions (it is an expansion and operation model) or there are system emission constraints
+                        # there are investment decisions (it is an expansion and operation model), or there are system emission constraints
                         ProblemSolving(DirName, CaseName, SolverName, mTEPES, mTEPES, pIndLogConsole, p, sc, st)
 
     mTEPES.del_component(mTEPES.st)
@@ -314,7 +320,7 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
     # output plot results
     pIndPlotOutput = 1
 
-    # indicators to control the amount of output results
+    # indicators to control the number of output results
     if pIndOutputResults == 1:
         pIndDumpRawResults              = 0
         pIndInvestmentResults           = 1
@@ -356,15 +362,15 @@ def openTEPES_run(DirName, CaseName, SolverName, pIndOutputResults, pIndLogConso
         InvestmentResults                 (DirName, CaseName, mTEPES, mTEPES, pIndTechnologyOutput,                 pIndPlotOutput)
     if pIndGenerationOperationResults  == 1:
         GenerationOperationResults        (DirName, CaseName, mTEPES, mTEPES, pIndTechnologyOutput, pIndAreaOutput, pIndPlotOutput)
-        if len(mTEPES.ch) and mTEPES.pIndHeat == 1:
+        if mTEPES.ch and mTEPES.pIndHeat == 1:
             GenerationOperationHeatResults(DirName, CaseName, mTEPES, mTEPES, pIndTechnologyOutput, pIndAreaOutput, pIndPlotOutput)
-    if pIndESSOperationResults         == 1 and len(mTEPES.es):
+    if pIndESSOperationResults         == 1 and mTEPES.es:
         ESSOperationResults               (DirName, CaseName, mTEPES, mTEPES, pIndTechnologyOutput, pIndAreaOutput, pIndPlotOutput)
-    if pIndReservoirOperationResults   == 1 and len(mTEPES.rs) and mTEPES.pIndHydroTopology == 1:
+    if pIndReservoirOperationResults   == 1 and mTEPES.rs and mTEPES.pIndHydroTopology == 1:
         ReservoirOperationResults         (DirName, CaseName, mTEPES, mTEPES, pIndTechnologyOutput,                 pIndPlotOutput)
-    if pIndNetworkH2OperationResults   == 1 and len(mTEPES.pa) and mTEPES.pIndHydrogen == 1:
+    if pIndNetworkH2OperationResults   == 1 and mTEPES.pa and mTEPES.pIndHydrogen == 1:
         NetworkH2OperationResults         (DirName, CaseName, mTEPES, mTEPES)
-    if pIndNetworkHeatOperationResults == 1 and len(mTEPES.ha) and mTEPES.pIndHeat == 1:
+    if pIndNetworkHeatOperationResults == 1 and mTEPES.ha and mTEPES.pIndHeat == 1:
         NetworkHeatOperationResults       (DirName, CaseName, mTEPES, mTEPES)
     if pIndFlexibilityResults          == 1:
         FlexibilityResults                (DirName, CaseName, mTEPES, mTEPES)