openTEPES 4.17.5rc3__py3-none-any.whl → 4.17.6__py3-none-any.whl

openTEPES/9n/oT_Data_RESEnergy_9n.csv

@@ -1,2 +1,2 @@
-,,RESEnergy
+,,RESEnergy
 2030,Area1,1000

openTEPES/9n7y/oT_Data_Option_9n7y.csv

@@ -1,2 +1,2 @@
-,IndBinGenInvest,IndBinGenRetirement,IndBinRsrInvest,IndBinNetInvest,IndBinNetH2Invest,IndBinNetHeatInvest,IndBinGenOperat,IndBinNetLosses,IndBinLineCommit,IndBinSingleNode,IndBinGenRamps,IndBinGenMinTime
-Options,0,0,0,0,0,0,0,1,0,0,0,0
+,IndBinGenInvest,IndBinGenRetirement,IndBinRsrInvest,IndBinNetInvest,IndBinNetH2Invest,IndBinNetHeatInvest,IndBinGenOperat,IndBinNetLosses,IndBinLineCommit,IndBinSingleNode,IndBinGenRamps,IndBinGenMinTime
+Options,0,0,0,0,0,0,0,1,0,0,0,0

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.17.5rc3"
+__version__ = "4.17.6"
 
 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) - September 02, 2024
+Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - September 18, 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.4 - August 08, 2024')
-    print(                 'Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.4 - August 08, 2024', file=open(_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.17.6 - September 18, 2024')
+    print(                 'Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.6 - September 18, 2024', file=open(_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]

openTEPES/openTEPES_InputData.py

@@ -1,5 +1,5 @@
 """
-Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - July 19, 2024
+Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - September 18, 2024
 """
 
 import datetime
@@ -565,7 +565,7 @@ def InputData(DirName, CaseName, mTEPES, pIndLogConsole):
     mTEPES.st     = Set(initialize=mTEPES.stt,              ordered=True , doc='stages'                          , filter=lambda mTEPES,stt : stt    in mTEPES.stt and pStageWeight       [stt] >  0.0)
     mTEPES.n      = Set(initialize=mTEPES.nn,               ordered=True , doc='load levels'                     , filter=lambda mTEPES,nn  : nn     in mTEPES.nn  and sum(pDuration  [p,sc,nn] for p,sc in mTEPES.ps) > 0)
     mTEPES.n2     = Set(initialize=mTEPES.nn,               ordered=True , doc='load levels'                     , filter=lambda mTEPES,nn  : nn     in mTEPES.nn  and sum(pDuration  [p,sc,nn] for p,sc in mTEPES.ps) > 0)
-    mTEPES.g      = Set(initialize=mTEPES.gg,               ordered=False, doc='generating              units'   , filter=lambda mTEPES,gg  : gg     in mTEPES.gg  and (pRatedMaxPowerElec [gg] >  0.0 or  pRatedMaxCharge[gg] >  0.0 or pRatedMaxPowerHeat    [gg] >  0.0) and pElecGenPeriodIni[gg] <= mTEPES.p.last() and pElecGenPeriodFin[gg] >= mTEPES.p.first() and pGenToNode.reset_index().set_index(['index']).isin(mTEPES.nd)['Node'][gg])  # excludes generators with empty node
+    mTEPES.g      = Set(initialize=mTEPES.gg,               ordered=True , doc='generating              units'   , filter=lambda mTEPES,gg  : gg     in mTEPES.gg  and (pRatedMaxPowerElec [gg] >  0.0 or  pRatedMaxCharge[gg] >  0.0 or pRatedMaxPowerHeat    [gg] >  0.0) and pElecGenPeriodIni[gg] <= mTEPES.p.last() and pElecGenPeriodFin[gg] >= mTEPES.p.first() and pGenToNode.reset_index().set_index(['index']).isin(mTEPES.nd)['Node'][gg])  # excludes generators with empty node
     mTEPES.t      = Set(initialize=mTEPES.g ,               ordered=False, doc='thermal                 units'   , filter=lambda mTEPES,g   : g      in mTEPES.g   and pRatedLinearOperCost[g ] >  0.0)
     mTEPES.re     = Set(initialize=mTEPES.g ,               ordered=False, doc='RES                     units'   , filter=lambda mTEPES,g   : g      in mTEPES.g   and pRatedLinearOperCost[g ] == 0.0 and pRatedMaxStorage[g] == 0.0   and pProductionFunctionH2[g ] == 0.0 and pProductionFunctionHeat[g ] == 0.0  and pProductionFunctionHydro[g ] == 0.0)
     mTEPES.es     = Set(initialize=mTEPES.g ,               ordered=False, doc='ESS                     units'   , filter=lambda mTEPES,g   : g      in mTEPES.g   and     (pRatedMaxCharge[g ] >  0.0 or  pRatedMaxStorage[g] >  0.0    or pProductionFunctionH2[g ]  > 0.0  or pProductionFunctionHeat[g ]  > 0.0) and pProductionFunctionHydro[g ] == 0.0)
@@ -824,6 +824,8 @@ def InputData(DirName, CaseName, mTEPES, pIndLogConsole):
     mTEPES.a2g = Set(initialize=mTEPES.ar*mTEPES.g, ordered=False, doc='area   to generator', filter=lambda mTEPES,ar,g: (ar,g) in pArea2Gen  )
     mTEPES.r2g = Set(initialize=mTEPES.rg*mTEPES.g, ordered=False, doc='region to generator', filter=lambda mTEPES,rg,g: (rg,g) in pRegion2Gen)
 
+    # mTEPES.z2g  = Set(initialize = [(zn,g) for zn,g in mTEPES.zn*mTEPES.g if (zn,g) in pZone2Gen])
+
     #%% inverse index generator to technology
     pTechnologyToGen = pGenToTechnology.reset_index().set_index('Technology').set_axis(['Generator'], axis=1)[['Generator']]
     pTechnologyToGen = pTechnologyToGen.loc[pTechnologyToGen['Generator'].isin(mTEPES.g)].reset_index().set_index(['Technology', 'Generator'])
@@ -1237,6 +1239,11 @@ def InputData(DirName, CaseName, mTEPES, pIndLogConsole):
     pStartUpCost.update         (pd.Series([0.0 for nr in mTEPES.nr if     pStartUpCost         [nr]  < pEpsilon], index=[nr for nr in mTEPES.nr if     pStartUpCost         [nr]  < pEpsilon]))
     pShutDownCost.update        (pd.Series([0.0 for nr in mTEPES.nr if     pShutDownCost        [nr]  < pEpsilon], index=[nr for nr in mTEPES.nr if     pShutDownCost        [nr]  < pEpsilon]))
 
+    # this rated linear variable cost y going to be used to order the generating units
+    # we include a small term to avoid stochastic behavior due to equal values
+    for g in mTEPES.g:
+        pRatedLinearVarCost[g] += 1e-3*pEpsilon*mTEPES.g.ord(g)
+
     # BigM maximum flow to be used in the Kirchhoff's 2nd law disjunctive constraint
     pBigMFlowBck = pLineNTCBck*0.0
     pBigMFlowFrw = pLineNTCFrw*0.0
@@ -1983,9 +1990,9 @@ def SettingUpVariables(OptModel, mTEPES):
     nFixedVariables += nFixedGeneratorCommits
     # thermal and RES units ordered by increasing variable operation cost, excluding reactive generating units
     if len(mTEPES.tq):
-        mTEPES.go = [k for k in sorted(mTEPES.pRatedLinearVarCost, key=mTEPES.pRatedLinearVarCost.__getitem__) if k not in mTEPES.sq]
+        mTEPES.go = Set(initialize=[g for g in sorted(mTEPES.pRatedLinearVarCost, key=mTEPES.pRatedLinearVarCost.__getitem__) if g not in mTEPES.sq])
     else:
-        mTEPES.go = [k for k in sorted(mTEPES.pRatedLinearVarCost, key=mTEPES.pRatedLinearVarCost.__getitem__)                      ]
+        mTEPES.go = Set(initialize=[g for g in sorted(mTEPES.pRatedLinearVarCost, key=mTEPES.pRatedLinearVarCost.__getitem__) if g not in mTEPES.eh])
 
     for p,sc,st in mTEPES.ps*mTEPES.stt:
         # activate only period, scenario, and load levels to formulate
@@ -1995,7 +2002,7 @@ def SettingUpVariables(OptModel, mTEPES):
         mTEPES.n  = Set(initialize=mTEPES.nn , ordered=True, doc='load levels', filter=lambda mTEPES,nn : nn  in mTEPES.nn                              and           (p,sc,st,nn) in mTEPES.s2n)
 
         if len(mTEPES.n):
-            mTEPES.psn1 = Set(initialize=[(p, sc, n) for p, sc, n in mTEPES.ps * mTEPES.n])
+            mTEPES.psn1 = Set(initialize=[(p,sc,n) for p,sc,n in mTEPES.ps*mTEPES.n])
             # determine the first load level of each stage
             n1 = next(iter(mTEPES.psn1))
             # commit the units and their output at the first load level of each stage
@@ -2016,7 +2023,7 @@ def SettingUpVariables(OptModel, mTEPES):
                         else:
                             mTEPES.pInitialOutput[n1,go] = mTEPES.pMinPowerElec[n1,go]
                         mTEPES.pInitialUC[n1,go] = 1
-                        pSystemOutput = pSystemOutput + mTEPES.pInitialOutput[n1,go]()
+                        pSystemOutput           += mTEPES.pInitialOutput[n1,go]()
 
             # determine the initial committed lines
             for la in mTEPES.la:

openTEPES/openTEPES_Main.py

@@ -685,7 +685,7 @@ import time
 # 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.4 - September 02, 2024\033[0m')
+print('\033[1;32mOpen Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 4.17.6 - September 18, 2024\033[0m')
 print('\033[34m#### Academic research license - for non-commercial use only ####\033[0m \n')
 
 parser = argparse.ArgumentParser(description='Introducing main parameters...')

openTEPES/openTEPES_ModelFormulation.py

@@ -1056,7 +1056,7 @@ def GenerationOperationModelFormulationRampMinTime(OptModel, mTEPES, pIndLogCons
     if pIndLogConsole == 1:
         print('eRampDwChr            ... ', len(getattr(OptModel, 'eRampDwChr_'+str(p)+'_'+str(sc)+'_'+str(st))), ' rows')
 
-    # the small tolerance pEpsilon=1e-5 is added to detect if the generator is ramping up/down
+    # the small tolerance pEpsilon=5e-2 is added to detect if the generator is ramping up/down
     pEpsilon = 5e-2
     def eRampUpState(OptModel,n,nr):
         if (p,nr) in mTEPES.pnr:

openTEPES/openTEPES_OutputResults.py

@@ -1,5 +1,5 @@
 """
-Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - August 08, 2024
+Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - September 12, 2024
 """
 
 import time
@@ -1592,7 +1592,7 @@ def MarginalResults(DirName, CaseName, OptModel, mTEPES, pIndPlotOutput):
     pEpsilon = 1e-6
 
     #%% outputting the incremental variable cost of each generating unit (neither ESS nor boilers) with power surplus
-    sPSNG        = [(p,sc,n,g) for p,sc,n,g in mTEPES.psng if g not in mTEPES.es and g not in mTEPES.bo]
+    sPSNG        = [(p,sc,n,g) for p,sc,n,g in mTEPES.psng if g not in mTEPES.eh and g not in mTEPES.bo]
     OutputToFile = pd.Series(data=[(mTEPES.pLinearVarCost[p,sc,n,g]+mTEPES.pEmissionVarCost[p,sc,n,g]) if OptModel.vTotalOutput[p,sc,n,g].ub - OptModel.vTotalOutput[p,sc,n,g]() > pEpsilon else math.inf for p,sc,n,g in sPSNG], index=pd.Index(sPSNG))
     OutputToFile *= 1e3
 

openTEPES/openTEPES_gitinfo.py

@@ -0,0 +1,68 @@
+import subprocess
+import shlex
+import os
+
+ROOT_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+
+
+def cmd(cmd, cwd=ROOT_DIR) -> str:
+    """
+    Executes a shell command in a subprocess and returns its output as a string.
+
+    Args:
+        cmd (str): The shell command to execute.
+        cwd (str): The directory where the command should be executed. Defaults to ROOT_DIR.
+
+    Returns:
+        str: The output of the command, decoded to a string and stripped of trailing whitespace.
+             If the command fails, an empty string is returned.
+    """
+    output = ""
+    try:
+        output = (
+            subprocess.check_output(shlex.split(cmd), cwd=cwd, stderr=subprocess.STDOUT)
+            .decode()
+            .strip()
+        )
+    except Exception as _:
+        ...
+    return output
+
+
+def last_commit_id(cwd=ROOT_DIR) -> str:
+    """
+    Retrieves the last Git commit ID for the given folder.
+
+    Args:
+        cwd (str): The directory where the Git command should be executed. Defaults to ROOT_DIR.
+
+    Returns:
+        str: The Git commit ID, or a string indicating if the working tree is dirty.
+    """
+    return cmd("git describe --always --dirty", cwd=cwd)
+
+
+def branch(cwd=ROOT_DIR) -> str:
+    """
+    Retrieves the current Git branch name for the given folder.
+
+    Args:
+        cwd (str): The directory where the Git command should be executed. Defaults to ROOT_DIR.
+
+    Returns:
+        str: The current Git branch name.
+    """
+    return cmd("git rev-parse --abbrev-ref HEAD", cwd=cwd)
+
+
+def get_git_version(cwd=ROOT_DIR) -> str:
+    """
+    Constructs the Git version string by combining the last commit ID and the current branch name.
+
+    Args:
+        cwd (str): The directory where the Git commands should be executed. Defaults to ROOT_DIR.
+
+    Returns:
+        str: A string in the format "<commit_id>-<branch_name>".
+    """
+    return f"{last_commit_id(cwd)}-{branch(cwd)}"

{opentepes-4.17.5rc3.dist-info → opentepes-4.17.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openTEPES
-Version: 4.17.5rc3
+Version: 4.17.6
 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
@@ -25,7 +25,7 @@ Requires-Dist: networkx>=3.3
 Requires-Dist: dill>=0.3.8
 
 
-.. image:: https://github.com/IIT-EnergySystemModels/openTEPES/blob/master/doc/img/openTEPES.png
+.. image:: https://pascua.iit.comillas.edu/aramos/openTEPES.png
    :target: https://pascua.iit.comillas.edu/aramos/openTEPES/index.html
    :alt: logo
    :align: center

{opentepes-4.17.5rc3.dist-info → opentepes-4.17.6.dist-info}/RECORD

@@ -1,11 +1,12 @@
-openTEPES/__init__.py,sha256=R-8V2LE1omLoAjE7Qg-Xc33zQ6Ayahuuhc9HsfeJ3IU,835
+openTEPES/__init__.py,sha256=fhwOJ-2xGRRdp7yCQNdiqKmoqVEIali-zAANWXPVHho,832
 openTEPES/openTEPES.mapbox_token,sha256=xsXNkwGp2vzXqQy2zVkyLhhNcNWniK2BMeOFpc5SZHI,93
-openTEPES/openTEPES.py,sha256=xC1V16VMuF959VtYRmp95kJQXCeRh3A208gM8AXuE9s,21139
-openTEPES/openTEPES_InputData.py,sha256=izDfzCbzeytPM5XQtr6p0IbXSK2OGp2RLKKTPm_lrPA,211797
-openTEPES/openTEPES_Main.py,sha256=ABpSO8irtNTRRJPZloe1umMw8ErvcxIq9jFSoPiyIU4,39834
-openTEPES/openTEPES_ModelFormulation.py,sha256=B82tUDO3gJfAYi7VvivImsdI0qYAbDc4QtoYudIVFV4,112753
-openTEPES/openTEPES_OutputResults.py,sha256=MxNiRVVIXlJOx9LDdEpLOMBKVf2Pe9s5_syXSk4_-M4,203160
+openTEPES/openTEPES.py,sha256=IgukztLMugmCa-ozAxZm6dAjd6Oqa-B9jAGGMC-7qrU,21145
+openTEPES/openTEPES_InputData.py,sha256=zRfslChwhdqGQlESeISO5k7sYB3EKOyVtDpyQ3bgbeE,212186
+openTEPES/openTEPES_Main.py,sha256=XByyTjmoyCLvfYzvJEfD6c54s6V9M8JQOxpGd9T1myM,39834
+openTEPES/openTEPES_ModelFormulation.py,sha256=N9UERcDRHmH9hkXaqOLnE7015GAqg9RSdwP4GwtO8ZM,112753
+openTEPES/openTEPES_OutputResults.py,sha256=W_oEYQb0L2EYFhbVlMldzXP214mJe6lggzAahrJnYtA,203163
 openTEPES/openTEPES_ProblemSolving.py,sha256=wsFwr3gyH9vdNHstV7RwB-NRZrtftTBfXzuFf7zEg90,14722
+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
 openTEPES/.idea/modules.xml,sha256=5XBWcjJ2MnJMJeZH6rMyzJfsThRQB2HhldeHDHucbJU,277
@@ -27,7 +28,7 @@ openTEPES/9n/oT_Data_OperatingReserveUp_9n.csv,sha256=Db0lWL63oSGsdsXYDSveQYMgij
 openTEPES/9n/oT_Data_Option_9n.csv,sha256=ouGUVLRYbiqW38CbrNdfvmNiD34tLsyS0e0ft-xMVBo,239
 openTEPES/9n/oT_Data_Parameter_9n.csv,sha256=x3vVs9nElSFcTvVKCmolzhyLlMWdJOEZbM6sJs18k8o,232
 openTEPES/9n/oT_Data_Period_9n.csv,sha256=esleipBmJEKh_pPnwqfJXMy_BWFJBe88iofCBLQxnCE,20
-openTEPES/9n/oT_Data_RESEnergy_9n.csv,sha256=fzaMK1-C6JKMbtipPKO4Ck1uqCrdsYA1-YSSEubBdWw,33
+openTEPES/9n/oT_Data_RESEnergy_9n.csv,sha256=XubGaoy8_52hEl4MmB7_bPA4bC8cwqvrLq_cPIUyWGw,30
 openTEPES/9n/oT_Data_ReserveMargin_9n.csv,sha256=5JYaMv-OSdi4WoWSSEkn6nBPUye9QxXOqOXSm2xrJN8,36
 openTEPES/9n/oT_Data_Scenario_9n.csv,sha256=G-kidq9YmyCLTWKr9wnc4vTz-2EXvnDtoVQ7Xe_0fkU,31
 openTEPES/9n/oT_Data_Stage_9n.csv,sha256=vHegWdEnTMu6EU__n3GoC7sY8dPlNJkD9maimbo1aGc,19
@@ -68,7 +69,7 @@ openTEPES/9n7y/oT_Data_Network_9n7y.csv,sha256=DeA_ywWHvwJ320cHWfypHqwCUjoH6HeF0
 openTEPES/9n7y/oT_Data_NodeLocation_9n7y.csv,sha256=muevfA9X-kL3l45Fre5Y4Jv0iH3Gj6vq6qHh4uoqjbA,299
 openTEPES/9n7y/oT_Data_OperatingReserveDown_9n7y.csv,sha256=Qn0_fW9Ly4mu4xw1XPfxcPJB4led4InaLYFXsUZ7cLs,2686680
 openTEPES/9n7y/oT_Data_OperatingReserveUp_9n7y.csv,sha256=Qn0_fW9Ly4mu4xw1XPfxcPJB4led4InaLYFXsUZ7cLs,2686680
-openTEPES/9n7y/oT_Data_Option_9n7y.csv,sha256=ouGUVLRYbiqW38CbrNdfvmNiD34tLsyS0e0ft-xMVBo,239
+openTEPES/9n7y/oT_Data_Option_9n7y.csv,sha256=Bwa2MiQJ7pk-GEsjaE1duZkZQEIlhW2BeSdZG1dk9sA,237
 openTEPES/9n7y/oT_Data_Parameter_9n7y.csv,sha256=BSuKo6FXlJCiDRBtGbQIztLWIMfGXx9cwVFpSBQoXVk,232
 openTEPES/9n7y/oT_Data_Period_9n7y.csv,sha256=CMeEXcbYvkerdb4L50rnrKA3DV5QmbGP6h1WmdJFacw,68
 openTEPES/9n7y/oT_Data_RESEnergy_9n7y.csv,sha256=3sBOFBrRw6UiO8S2iQie5bR3aOC5xBgfYJhQucM--dI,187
@@ -217,22 +218,22 @@ openTEPES/RTS-GMLC_6y/oT_Data_VariableMinConsumption_RTS-GMLC_6y.csv,sha256=IOw8
 openTEPES/RTS-GMLC_6y/oT_Data_VariableMinEnergy_RTS-GMLC_6y.csv,sha256=IOw8FCVppeD10zitucrAFYqpZmzJoF9jK2fvvJfPo0s,12582160
 openTEPES/RTS-GMLC_6y/oT_Data_VariableMinGeneration_RTS-GMLC_6y.csv,sha256=IOw8FCVppeD10zitucrAFYqpZmzJoF9jK2fvvJfPo0s,12582160
 openTEPES/RTS-GMLC_6y/oT_Data_VariableMinStorage_RTS-GMLC_6y.csv,sha256=IOw8FCVppeD10zitucrAFYqpZmzJoF9jK2fvvJfPo0s,12582160
-openTEPES/RTS-GMLC_6y/oT_Dict_AreaToRegion_RTS-GMLC_6y.csv,sha256=AC7WhEMDMekOKE9-kUHV-Dy92zmWKo6-YNL9vyps_j8,64
-openTEPES/RTS-GMLC_6y/oT_Dict_Area_RTS-GMLC_6y.csv,sha256=VR1A8dGJ-9UcRtiyYaJwANd-7faXMtPggvkhNQ4RBf8,30
-openTEPES/RTS-GMLC_6y/oT_Dict_Circuit_RTS-GMLC_6y.csv,sha256=-5ia4UT_W0lrWYYVyFV9D6-q6nA93timI8MYf_XaWxY,33
+openTEPES/RTS-GMLC_6y/oT_Dict_AreaToRegion_RTS-GMLC_6y.csv,sha256=eVY_4Mu1PTkNbvzIcqbYbpvT0rloVrphTB048YYDyvA,60
+openTEPES/RTS-GMLC_6y/oT_Dict_Area_RTS-GMLC_6y.csv,sha256=6l13IVxPq4HJh6apld5lNtUPMerRRMgfK7odZxCpCb8,26
+openTEPES/RTS-GMLC_6y/oT_Dict_Circuit_RTS-GMLC_6y.csv,sha256=YudHKDVQ2bpMRufOHYttfppzQEaqi2d3vRGmxTuMFdc,28
 openTEPES/RTS-GMLC_6y/oT_Dict_Generation_RTS-GMLC_6y.csv,sha256=w6kE1V9QiFoihhMs43minFkyFWRzwQtWnSYsF96_7WA,2535
-openTEPES/RTS-GMLC_6y/oT_Dict_Line_RTS-GMLC_6y.csv,sha256=xg4OpM5ldCbkhLOrAgZiJbZekkwtD5lpwxYE6dCzzLA,18
+openTEPES/RTS-GMLC_6y/oT_Dict_Line_RTS-GMLC_6y.csv,sha256=rON9ZbWsiGauhkOIgBS3CDQosACOkKkJoORYT_fCGoc,15
 openTEPES/RTS-GMLC_6y/oT_Dict_LoadLevel_RTS-GMLC_6y.csv,sha256=FNuj3oD4Npror74ru-HGnm3wD8rLhJFTu2u4jMUYJ4o,192203
-openTEPES/RTS-GMLC_6y/oT_Dict_NodeToZone_RTS-GMLC_6y.csv,sha256=p0TKIjW16gSR5F51FnP-5E_oACrxzPo0glTt0OoglBE,1325
+openTEPES/RTS-GMLC_6y/oT_Dict_NodeToZone_RTS-GMLC_6y.csv,sha256=7bnlSu5HfA1ch_58touhcvhmrCLOEjjWhH7f5G8tONw,1251
 openTEPES/RTS-GMLC_6y/oT_Dict_Node_RTS-GMLC_6y.csv,sha256=2YRl6OD1hV1lR8LiTN-PYjX8bW2v3BktmLVMRl8HW74,736
 openTEPES/RTS-GMLC_6y/oT_Dict_Period_RTS-GMLC_6y.csv,sha256=Jp7qufLCOXwJ1kSCruPE64llGaTj4wVqe79u5H4LPKg,44
-openTEPES/RTS-GMLC_6y/oT_Dict_Region_RTS-GMLC_6y.csv,sha256=xd-mTmEwgSbq3wu8mbiMhvW4D_h9Y9sX9-M4C7j_Jyc,18
-openTEPES/RTS-GMLC_6y/oT_Dict_Scenario_RTS-GMLC_6y.csv,sha256=UFD1pqOy6af_SLucKNhgs-CCcoSkZ6OB7YcxLhIpeqs,16
+openTEPES/RTS-GMLC_6y/oT_Dict_Region_RTS-GMLC_6y.csv,sha256=9sUtX_OUST0EMWbhQG2bh7q4_CN0zrELH-ImI5OCAV4,16
+openTEPES/RTS-GMLC_6y/oT_Dict_Scenario_RTS-GMLC_6y.csv,sha256=2ofsWknL6_xojAEk9w_ntKDc_iRFh1tY3MKWyKGlKBE,14
 openTEPES/RTS-GMLC_6y/oT_Dict_Stage_RTS-GMLC_6y.csv,sha256=cZKl_y6qUHVS8cLY2EFYwGyb8Bzw8043XqkYZJhOOr0,76
-openTEPES/RTS-GMLC_6y/oT_Dict_Storage_RTS-GMLC_6y.csv,sha256=GbyzeENaCG-Yx67tdPsZhF1qUY-OVDKQP2TOSbugPVk,28
-openTEPES/RTS-GMLC_6y/oT_Dict_Technology_RTS-GMLC_6y.csv,sha256=TpbqRLfZsKkqXtVZNRxBrmis9claViI_UQzw7zyvCuA,76
-openTEPES/RTS-GMLC_6y/oT_Dict_ZoneToArea_RTS-GMLC_6y.csv,sha256=lj86EH-OBqXsts32_AyCPKWtyH8aFRAnHfJls6tJI_8,347
-openTEPES/RTS-GMLC_6y/oT_Dict_Zone_RTS-GMLC_6y.csv,sha256=mwTHNLbVoLCLclucd4IC1p4Ui8eK7td5FYYUHb8QMxk,195
+openTEPES/RTS-GMLC_6y/oT_Dict_Storage_RTS-GMLC_6y.csv,sha256=1xK85kRhPuVmBJUjdT5jxma6pft_aX3AQ4RsJyU1kLs,25
+openTEPES/RTS-GMLC_6y/oT_Dict_Technology_RTS-GMLC_6y.csv,sha256=OWIqvZzabgF1OxfFkk7tSRf8hRjdGUZBF7yMz7f8g9s,66
+openTEPES/RTS-GMLC_6y/oT_Dict_ZoneToArea_RTS-GMLC_6y.csv,sha256=GAxPRWF3ZLQMYrZTLOxQpJq0EnLQBxG05HDL-P3GJUE,325
+openTEPES/RTS-GMLC_6y/oT_Dict_Zone_RTS-GMLC_6y.csv,sha256=qdYPgz7RLrL4A2iiNEJ5pkXMPFpwIeLK5QOyAqJ11oQ,173
 openTEPES/RTS24/oT_Data_Demand_RTS24.csv,sha256=HQ1US6fsd3iotXTlR6hpVxAy67forSUbxW8Fqzp8W0I,1824963
 openTEPES/RTS24/oT_Data_Duration_RTS24.csv,sha256=uduXkV_fE7Vd9cNYdik14_b7NZgm5pqusoTAC6Z1Zo4,331987
 openTEPES/RTS24/oT_Data_Emission_RTS24.csv,sha256=-CBlzyOIzCVs2LmAYLUwKfoRGxJMQXzmHVvcjMOOqEA,48
@@ -334,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.17.5rc3.dist-info/entry_points.txt,sha256=gNNPrDaTsRuRJXI1FLNgqMX1CiJ45bEp1dEDH7ZB8Oc,49
-opentepes-4.17.5rc3.dist-info/LICENSE,sha256=4O7bphXVzRuYavtsWzpLGuM3E-fp3HTRna7F4yIfnS4,35184
-opentepes-4.17.5rc3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-opentepes-4.17.5rc3.dist-info/METADATA,sha256=nPcF4IHhakBU4iUpa1UD8FUE8TDGvxBKWagqu8t-ylQ,17844
-opentepes-4.17.5rc3.dist-info/RECORD,,
+opentepes-4.17.6.dist-info/entry_points.txt,sha256=gNNPrDaTsRuRJXI1FLNgqMX1CiJ45bEp1dEDH7ZB8Oc,49
+opentepes-4.17.6.dist-info/LICENSE,sha256=4O7bphXVzRuYavtsWzpLGuM3E-fp3HTRna7F4yIfnS4,35184
+opentepes-4.17.6.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+opentepes-4.17.6.dist-info/METADATA,sha256=dNvl75pNhZFvaYEn0zifbz5RjDXquWKC5CIhOCINVqQ,17808
+opentepes-4.17.6.dist-info/RECORD,,