Skip to content

Commit

Permalink
fix error in RsrInvCost
Browse files Browse the repository at this point in the history
  • Loading branch information
arght committed Dec 9, 2023
1 parent 9f9ae4a commit db78948
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion openTEPES/openTEPES_OutputResults.py
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,7 @@ def CostSummaryResults(DirName, CaseName, OptModel, mTEPES):
if mTEPES.pIndHydroTopology == 1:
RsrInvCost = pd.Series(data=[mTEPES.pDiscountedWeight[p] * sum(mTEPES.pRsrInvestCost[rc ] * OptModel.vReservoirInvest [p,rc ]() for rc in mTEPES.rn ) for p in mTEPES.p], index=mTEPES.p).to_frame(name='Reservoir Investment Cost').stack()
else:
RsrInvCost = pd.Series(data=[0.0 ], index=mTEPES.p).to_frame(name='Reservoir Investment Cost').stack()
RsrInvCost = pd.Series(data=[0.0 for p in mTEPES.p], index=mTEPES.p).to_frame(name='Reservoir Investment Cost').stack()
NetInvCost = pd.Series(data=[mTEPES.pDiscountedWeight[p] * sum(mTEPES.pNetFixedCost [lc ] * OptModel.vNetworkInvest [p,lc ]() for lc in mTEPES.lc ) for p in mTEPES.p], index=mTEPES.p).to_frame(name='Network Investment Cost').stack()
GenCost = pd.Series(data=[mTEPES.pDiscountedWeight[p] * sum(mTEPES.pScenProb [p,sc]() * OptModel.vTotalGCost [p,sc,n]() for sc,n in mTEPES.sc*mTEPES.n if mTEPES.pScenProb[p,sc]()) for p in mTEPES.p], index=mTEPES.p).to_frame(name='Generation Operation Cost').stack()
ConCost = pd.Series(data=[mTEPES.pDiscountedWeight[p] * sum(mTEPES.pScenProb [p,sc]() * OptModel.vTotalCCost [p,sc,n]() for sc,n in mTEPES.sc*mTEPES.n if mTEPES.pScenProb[p,sc]()) for p in mTEPES.p], index=mTEPES.p).to_frame(name='Consumption Operation Cost').stack()
Expand Down

0 comments on commit db78948

Please sign in to comment.