Double Negative for Storage Costs in Objective Equation

[trevorb1]

Hi! I have a question relating to how Storage Salvage Value is treated in the objective equation in OSeMOSYS_fast:

I think the actual calculation of discounting the salvage value is correct, but we are adding it to the cost (via the double negative) rather than subtracting it? Or I may just be interpreting something wrong?

OSeMOSYS_GNU_MathProg/src/osemosys_fast.txt

Lines 336 to 344 in 9520268

	minimize cost: sum{r in REGION, t in TECHNOLOGY, y in YEAR}
	((((sum{yy in YEAR: y-yy < OperationalLife[r,t] && y-yy>=0}
	NewCapacity[r,t,yy])+ ResidualCapacity[r,t,y])*FixedCost[r,t,y] +
	sum{m in MODEperTECHNOLOGY[t], l in TIMESLICE}
	RateOfActivity[r,l,t,m,y]*YearSplit[l,y]*VariableCost[r,t,m,y]) / DiscountFactorMid[r,y] +
	CapitalCost[r,t,y] * NewCapacity[r,t,y] * CapitalRecoveryFactor[r,t] * PvAnnuity[r,t] / DiscountFactor[r,y] +
	DiscountedTechnologyEmissionsPenalty[r,t,y] - DiscountedSalvageValue[r,t,y]) +
	sum{r in REGION, s in STORAGE, y in YEAR} (CapitalCostStorage[r,s,y] * NewStorageCapacity[r,s,y] / DiscountFactorStorage[r,s,y] -
	- SalvageValueStorage[r,s,y] / ((1+DiscountRateStorage[r,s])^(max{yy in YEAR} max(yy)-min{yy in YEAR} min(yy)+1)));

[willu47]

Classic. That's a good catch....