Debugging the financial results

Author: toddleif

src/results/financial.jl

@@ -146,8 +146,10 @@ function initial_capex(m::JuMP.AbstractModel, p::REoptInputs; _n="")
     for b in p.s.storage.types.elec
         if p.s.storage.attr[b].max_kw > 0
             initial_capex += p.s.storage.attr[b].installed_cost_per_kw * value.(m[Symbol("dvStoragePower"*_n)])[b] + 
-                p.s.storage.attr[b].installed_cost_per_kwh * value.(m[Symbol("dvStorageEnergy"*_n)])[b] +
-                (p.s.storage.attr[b].installed_cost_constant * value.(m[Symbol("binIncludeStorageCostConstant"*_n)])[b])
+                p.s.storage.attr[b].installed_cost_per_kwh * value.(m[Symbol("dvStorageEnergy"*_n)])[b] 
+            if (p.s.storage.attr[b].installed_cost_constant != 0) || (p.s.storage.attr[b].replace_cost_constant != 0)
+                initial_capex += p.s.storage.attr[b].installed_cost_constant * value.(m[Symbol("binIncludeStorageCostConstant"*_n)])[b]
+            end
         end
     end
 
@@ -234,10 +236,19 @@ function replacement_costs_future_and_present(m::JuMP.AbstractModel, p::REoptInp
         else
             future_cost_storage = p.s.storage.attr[b].replace_cost_per_kwh * value.(m[Symbol("dvStorageEnergy"*_n)])[b]
         end
-        if p.s.storage.attr[b].cost_constant_replacement_year >= p.s.financial.analysis_years
-            future_cost_cost_constant = 0
+
+        if b in p.s.storage.types.elec
+            if p.s.storage.attr[b].cost_constant_replacement_year >= p.s.financial.analysis_years
+                future_cost_cost_constant = 0
+            else
+                if (p.s.storage.attr[b].installed_cost_constant != 0) || (p.s.storage.attr[b].replace_cost_constant != 0)
+                    future_cost_cost_constant = p.s.storage.attr[b].replace_cost_constant * value.(m[Symbol("binIncludeStorageCostConstant"*_n)])[b]
+                else
+                    future_cost_cost_constant = 0
+                end
+            end
         else
-            future_cost_cost_constant = p.s.storage.attr[b].replace_cost_constant * value.(m[Symbol("binIncludeStorageCostConstant"*_n)])[b]
+            future_cost_cost_constant = 0
         end
 
         future_cost += future_cost_inverter + future_cost_storage + future_cost_cost_constant