delete if unit availability = 0 changed to 1

IIT-EnergySystemModels · Nov 24, 2023 · 7c081f2 · 7c081f2
1 parent 03a2b58
commit 7c081f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/openTEPES/openTEPES_InputData.py b/openTEPES/openTEPES_InputData.py
@@ -1,5 +1,5 @@
 """
-Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - November 03, 2023
+Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - November 23, 2023
 """
 
 import datetime
@@ -1214,10 +1214,10 @@ def count_lines_in_csv(csv_file_path):
     mTEPES.gm     = [(p,sc,g ) for p,sc,g  in mTEPES.psg  if sum(mTEPES.pMinEnergy     [p,sc,n2,g ]   for n2 in mTEPES.n2)]
     mTEPES.gM     = [(p,sc,g ) for p,sc,g  in mTEPES.psg  if sum(mTEPES.pMaxEnergy     [p,sc,n2,g ]   for n2 in mTEPES.n2)]
 
-    # if unit availability = 0 changed to 1
-    for g in mTEPES.g:
-        if  mTEPES.pAvailability[g]() == 0.0:
-            mTEPES.pAvailability[g]   =  1.0
+    # # if unit availability = 0 changed to 1
+    # for g in mTEPES.g:
+    #     if  mTEPES.pAvailability[g]() == 0.0:
+    #         mTEPES.pAvailability[g]   =  1.0
 
     # if line length = 0 changed to geographical distance with an additional 10%
     for ni,nf,cc in mTEPES.la:

diff --git a/openTEPES/openTEPES_OutputResults.py b/openTEPES/openTEPES_OutputResults.py
@@ -1,5 +1,5 @@
 """
-Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - October 22, 2023
+Open Generation, Storage, and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - November 22, 2023
 """
 
 import time
@@ -1312,8 +1312,7 @@ def ReliabilityResults(DirName, CaseName, OptModel, mTEPES):
     if len(mTEPES.gc):
         CandCapacity  = [(p,sc,n,g) for p,sc,n,g in mTEPES.psng if g in mTEPES.gc]
         pCandMaxPower = pd.Series(data=[mTEPES.pMaxPower[p,sc,n,g ] * OptModel.vGenerationInvest[p,g]() for p,sc,n,g in CandCapacity], index=pd.Index(CandCapacity))
-        frames        = [pExistMaxPower, pCandMaxPower]
-        pMaxPower     = pd.concat(frames)
+        pMaxPower     = pd.concat([pExistMaxPower, pCandMaxPower])
     else:
         pMaxPower     = pExistMaxPower