Fix multistage test

src/write_outputs/capacity_reserve_margin/write_reserve_margin_slack.jl

@@ -11,7 +11,7 @@ function write_reserve_margin_slack(path::AbstractString, inputs::Dict, setup::D
         temp_ResMar_slack .*= ModelScalingFactor # Convert GW to MW
     end
     dfResMar_slack = hcat(dfResMar_slack, DataFrame(temp_ResMar_slack, [Symbol("t$t") for t in 1:T]))
-    CSV.write(joinpath(path, "ReserveMargin_prices_and_penalties.csv"), dftranspose(dfResMar_slack, false), writeheader=false)
+    CSV.write(joinpath(path, "ReserveMargin_prices_and_penalties.csv"), dftranspose(dfResMar_slack, false), header=false)
     return dfResMar_slack
 end
 

src/write_outputs/capacity_reserve_margin/write_virtual_discharge.jl

@@ -29,6 +29,6 @@ function write_virtual_discharge(path::AbstractString, inputs::Dict, setup::Dict
 	total[:, 4:T+3] .= sum(virtual_discharge, dims = 1)
 	rename!(total,auxNew_Names)
 	dfVirtualDischarge = vcat(dfVirtualDischarge, total)
-	CSV.write(joinpath(path, "virtual_discharge.csv"), dftranspose(dfVirtualDischarge, false), writeheader=false)
+	CSV.write(joinpath(path, "virtual_discharge.csv"), dftranspose(dfVirtualDischarge, false), header=false)
 	return dfVirtualDischarge
 end

src/write_outputs/hydrogen/write_hourly_matching_prices.jl

@@ -11,7 +11,7 @@ function write_hourly_matching_prices(path::AbstractString, inputs::Dict, setup:
 	auxNew_Names=[Symbol("Zone");[Symbol("t$t") for t in 1:T]]
 	rename!(dfHourlyMatchPrices,auxNew_Names)
 
-	CSV.write(joinpath(path, "hourly_matching_prices.csv"), dftranspose(dfHourlyMatchPrices, false), writeheader=false)
+	CSV.write(joinpath(path, "hourly_matching_prices.csv"), dftranspose(dfHourlyMatchPrices, false), header=false)
 
 	return dfHourlyMatchPrices
 end

src/write_outputs/long_duration_storage/write_opwrap_lds_dstor.jl

@@ -26,5 +26,5 @@ function write_opwrap_lds_dstor(path::AbstractString, inputs::Dict, setup::Dict,
 	dfdStorage = hcat(dfdStorage, DataFrame(dsoc, :auto))
 	auxNew_Names=[Symbol("Resource");Symbol("Zone");[Symbol("w$t") for t in 1:W]]
 	rename!(dfdStorage,auxNew_Names)
-	CSV.write(joinpath(path, "dStorage.csv"), dftranspose(dfdStorage, false), writeheader=false)
+	CSV.write(joinpath(path, "dStorage.csv"), dftranspose(dfdStorage, false), header=false)
 end

src/write_outputs/long_duration_storage/write_opwrap_lds_stor_init.jl

@@ -26,5 +26,5 @@ function write_opwrap_lds_stor_init(path::AbstractString, inputs::Dict, setup::D
 	dfStorageInit = hcat(dfStorageInit, DataFrame(socw, :auto))
 	auxNew_Names=[Symbol("Resource");Symbol("Zone");[Symbol("n$t") for t in 1:NPeriods]]
 	rename!(dfStorageInit,auxNew_Names)
-	CSV.write(joinpath(path, "StorageInit.csv"), dftranspose(dfStorageInit, false), writeheader=false)
+	CSV.write(joinpath(path, "StorageInit.csv"), dftranspose(dfStorageInit, false), header=false)
 end

src/write_outputs/reserves/write_reg.jl

@@ -19,5 +19,5 @@ function write_reg(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
 	total[!, 4:T+3] .= sum(reg, dims = 1)
 	rename!(total,auxNew_Names)
 	dfReg = vcat(dfReg, total)
-	CSV.write(joinpath(path, "reg.csv"), dftranspose(dfReg, false), writeheader=false)
+	CSV.write(joinpath(path, "reg.csv"), dftranspose(dfReg, false), header=false)
 end

src/write_outputs/reserves/write_rsv.jl

@@ -24,5 +24,5 @@ function write_rsv(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
 	rename!(total,auxNew_Names)
 	rename!(unmet,auxNew_Names)
 	dfRsv = vcat(dfRsv, unmet, total)
-	CSV.write(joinpath(path, "reg_dn.csv"), dftranspose(dfRsv, false), writeheader=false)
+	CSV.write(joinpath(path, "reg_dn.csv"), dftranspose(dfRsv, false), header=false)
 end

src/write_outputs/transmission/write_transmission_flows.jl

@@ -16,5 +16,5 @@ function write_transmission_flows(path::AbstractString, inputs::Dict, setup::Dic
 	total[:, 3:T+2] .= sum(flow, dims = 1)
 	rename!(total,auxNew_Names)
 	dfFlow = vcat(dfFlow, total)
-	CSV.write(joinpath(path, "flow.csv"), dftranspose(dfFlow, false), writeheader=false)
+	CSV.write(joinpath(path, "flow.csv"), dftranspose(dfFlow, false), header=false)
 end

src/write_outputs/transmission/write_transmission_losses.jl

@@ -18,5 +18,5 @@ function write_transmission_losses(path::AbstractString, inputs::Dict, setup::Di
 	total[:, 3:T+2] .= sum(tlosses, dims = 1)
 	rename!(total,auxNew_Names)
 	dfTLosses = vcat(dfTLosses, total)
-	CSV.write(joinpath(path, "tlosses.csv"), dftranspose(dfTLosses, false), writeheader=false)
+	CSV.write(joinpath(path, "tlosses.csv"), dftranspose(dfTLosses, false), header=false)
 end

src/write_outputs/ucommit/write_commit.jl

@@ -12,5 +12,5 @@ function write_commit(path::AbstractString, inputs::Dict, setup::Dict, EP::Model
 	dfCommit = hcat(dfCommit, DataFrame(commit, :auto))
 	auxNew_Names=[Symbol("Resource");Symbol("Zone");[Symbol("t$t") for t in 1:T]]
 	rename!(dfCommit,auxNew_Names)
-	CSV.write(joinpath(path, "commit.csv"), dftranspose(dfCommit, false), writeheader=false)
+	CSV.write(joinpath(path, "commit.csv"), dftranspose(dfCommit, false), header=false)
 end

src/write_outputs/ucommit/write_shutdown.jl

@@ -18,5 +18,5 @@ function write_shutdown(path::AbstractString, inputs::Dict, setup::Dict, EP::Mod
 	total[:, 4:T+3] .= sum(shut, dims = 1)
 	rename!(total,auxNew_Names)
 	dfShutdown = vcat(dfShutdown, total)
-	CSV.write(joinpath(path, "shutdown.csv"), dftranspose(dfShutdown, false), writeheader=false)
+	CSV.write(joinpath(path, "shutdown.csv"), dftranspose(dfShutdown, false), header=false)
 end

src/write_outputs/ucommit/write_start.jl

@@ -18,5 +18,5 @@ function write_start(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
 	total[:, 4:T+3] .= sum(start, dims = 1)
 	rename!(total,auxNew_Names)
 	dfStart = vcat(dfStart, total)
-	CSV.write(joinpath(path, "start.csv"), dftranspose(dfStart, false), writeheader=false)
+	CSV.write(joinpath(path, "start.csv"), dftranspose(dfStart, false), header=false)
 end

src/write_outputs/write_charge.jl

@@ -42,6 +42,6 @@ function write_charge(path::AbstractString, inputs::Dict, setup::Dict, EP::Model
 	total[:, 4:T+3] .= sum(charge, dims = 1)
 	rename!(total,auxNew_Names)
 	dfCharge = vcat(dfCharge, total)
-	CSV.write(joinpath(path, "charge.csv"), dftranspose(dfCharge, false), writeheader=false)
+	CSV.write(joinpath(path, "charge.csv"), dftranspose(dfCharge, false), header=false)
 	return dfCharge
 end

src/write_outputs/write_co2.jl

@@ -31,7 +31,7 @@ function write_co2_emissions_plant(path::AbstractString, inputs::Dict, setup::Di
     total = DataFrame(["Total" 0 sum(dfEmissions_plant[!, :AnnualSum]) fill(0.0, (1, T))], auxNew_Names)
     total[!, 4:T+3] .= sum(emissions_plant, dims=1)
     dfEmissions_plant = vcat(dfEmissions_plant, total)
-    CSV.write(joinpath(path, "emissions_plant.csv"), dftranspose(dfEmissions_plant, false), writeheader=false)
+    CSV.write(joinpath(path, "emissions_plant.csv"), dftranspose(dfEmissions_plant, false), header=false)
 end
 
 function write_co2_capture_plant(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
@@ -58,6 +58,6 @@ function write_co2_capture_plant(path::AbstractString, inputs::Dict, setup::Dict
         total[!, 4:T+3] .= sum(emissions_captured_plant, dims=1)
         dfCapturedEmissions_plant = vcat(dfCapturedEmissions_plant, total)
 
-        CSV.write(joinpath(path, "captured_emissions_plant.csv"), dftranspose(dfCapturedEmissions_plant, false), writeheader=false)
+        CSV.write(joinpath(path, "captured_emissions_plant.csv"), dftranspose(dfCapturedEmissions_plant, false), header=false)
     end
 end

src/write_outputs/write_curtailment.jl

@@ -42,6 +42,6 @@ function write_curtailment(path::AbstractString, inputs::Dict, setup::Dict, EP::
 	total[:, 4:T+3] .= sum(curtailment, dims = 1)
 	rename!(total,auxNew_Names)
 	dfCurtailment = vcat(dfCurtailment, total)
-	CSV.write(joinpath(path, "curtail.csv"), dftranspose(dfCurtailment, false), writeheader=false)
+	CSV.write(joinpath(path, "curtail.csv"), dftranspose(dfCurtailment, false), header=false)
 	return dfCurtailment
 end

src/write_outputs/write_emissions.jl

@@ -77,5 +77,5 @@ function write_emissions(path::AbstractString, inputs::Dict, setup::Dict, EP::Mo
 		rename!(total,auxNew_Names)
 		dfEmissions = vcat(dfEmissions, total)
 	end
-	CSV.write(joinpath(path, "emissions.csv"), dftranspose(dfEmissions, false), writeheader=false)
+	CSV.write(joinpath(path, "emissions.csv"), dftranspose(dfEmissions, false), header=false)
 end

src/write_outputs/write_fuel_consumption.jl

@@ -41,7 +41,7 @@ function write_fuel_consumption_ts(path::AbstractString, inputs::Dict, setup::Di
 	dfPlantFuel_TS = hcat(dfPlantFuel_TS,
 		DataFrame(tempts, [Symbol("t$t") for t in 1:T]))
     CSV.write(joinpath(path, "FuelConsumption_plant_MMBTU.csv"), 
-		dftranspose(dfPlantFuel_TS, false), writeheader=false)
+		dftranspose(dfPlantFuel_TS, false), header=false)
 end
 
 

src/write_outputs/write_nse.jl

@@ -24,6 +24,6 @@ function write_nse(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
 	rename!(total,auxNew_Names)
 	dfNse = vcat(dfNse, total)
 
-	CSV.write(joinpath(path, "nse.csv"),  dftranspose(dfNse, false), writeheader=false)
+	CSV.write(joinpath(path, "nse.csv"),  dftranspose(dfNse, false), header=false)
 	return dfNse
 end

src/write_outputs/write_power.jl

@@ -27,6 +27,6 @@ function write_power(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
 
 	rename!(total,auxNew_Names)
 	dfPower = vcat(dfPower, total)
-	CSV.write(joinpath(path, "power.csv"), dftranspose(dfPower, false), writeheader=false)
+	CSV.write(joinpath(path, "power.csv"), dftranspose(dfPower, false), header=false)
 	return dfPower
 end

src/write_outputs/write_power_balance.jl

@@ -61,5 +61,5 @@ function write_power_balance(path::AbstractString, inputs::Dict, setup::Dict, EP
 	dfPowerBalance = hcat(dfPowerBalance, DataFrame(powerbalance, :auto))
 	auxNew_Names = [Symbol("BalanceComponent"); Symbol("Zone"); Symbol("AnnualSum"); [Symbol("t$t") for t in 1:T]]
 	rename!(dfPowerBalance,auxNew_Names)
-	CSV.write(joinpath(path, "power_balance.csv"), dftranspose(dfPowerBalance, false), writeheader=false)
+	CSV.write(joinpath(path, "power_balance.csv"), dftranspose(dfPowerBalance, false), header=false)
 end

src/write_outputs/write_price.jl

@@ -18,7 +18,7 @@ function write_price(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
 	rename!(dfPrice,auxNew_Names)
 
 	## Linear configuration final output
-	CSV.write(joinpath(path, "prices.csv"), dftranspose(dfPrice, false), writeheader=false)
+	CSV.write(joinpath(path, "prices.csv"), dftranspose(dfPrice, false), header=false)
 	return dfPrice
 end
 

src/write_outputs/write_reliability.jl

@@ -16,6 +16,6 @@ function write_reliability(path::AbstractString, inputs::Dict, setup::Dict, EP::
 	auxNew_Names=[Symbol("Zone");[Symbol("t$t") for t in 1:T]]
 	rename!(dfReliability,auxNew_Names)
 
-	CSV.write(joinpath(path, "reliability.csv"), dftranspose(dfReliability, false), writeheader=false)
+	CSV.write(joinpath(path, "reliability.csv"), dftranspose(dfReliability, false), header=false)
 
 end

src/write_outputs/write_storage.jl

@@ -38,5 +38,5 @@ function write_storage(path::AbstractString, inputs::Dict,setup::Dict, EP::Model
 	dfStorage = hcat(dfStorage, DataFrame(storagevcapvalue, :auto))
 	auxNew_Names=[Symbol("Resource");Symbol("Zone");[Symbol("t$t") for t in 1:T]]
 	rename!(dfStorage,auxNew_Names)
-	CSV.write(joinpath(path, "storage.csv"), dftranspose(dfStorage, false), writeheader=false)
+	CSV.write(joinpath(path, "storage.csv"), dftranspose(dfStorage, false), header=false)
 end

src/write_outputs/write_storagedual.jl

@@ -59,5 +59,5 @@ function write_storagedual(path::AbstractString, inputs::Dict, setup::Dict, EP::
 	dfStorageDual=hcat(dfStorageDual, DataFrame(dual_values, :auto))
 	rename!(dfStorageDual,[Symbol("Resource");Symbol("Zone");[Symbol("t$t") for t in 1:T]])
 
-	CSV.write(joinpath(path, "storagebal_duals.csv"), dftranspose(dfStorageDual, false), writeheader=false)
+	CSV.write(joinpath(path, "storagebal_duals.csv"), dftranspose(dfStorageDual, false), header=false)
 end

src/write_outputs/write_vre_stor.jl

@@ -307,7 +307,7 @@ function write_vre_stor_charge(path::AbstractString, inputs::Dict, setup::Dict,
 		total[:, 4:T+3] .= sum(charge_dc, dims = 1)
 		rename!(total,auxNew_Names)
 		dfCharge_DC = vcat(dfCharge_DC, total)
-		CSV.write(joinpath(path,"vre_stor_dc_charge.csv"), dftranspose(dfCharge_DC, false), writeheader=false)
+		CSV.write(joinpath(path,"vre_stor_dc_charge.csv"), dftranspose(dfCharge_DC, false), header=false)
 	end
 
 	# AC charging of battery dataframe
@@ -323,7 +323,7 @@ function write_vre_stor_charge(path::AbstractString, inputs::Dict, setup::Dict,
 		total[:, 4:T+3] .= sum(charge_ac, dims = 1)
 		rename!(total,auxNew_Names)
 		dfCharge_AC = vcat(dfCharge_AC, total)
-		CSV.write(joinpath(path,"vre_stor_ac_charge.csv"), dftranspose(dfCharge_AC, false), writeheader=false)
+		CSV.write(joinpath(path,"vre_stor_ac_charge.csv"), dftranspose(dfCharge_AC, false), header=false)
 	end
 end
 
@@ -356,7 +356,7 @@ function write_vre_stor_discharge(path::AbstractString, inputs::Dict, setup::Dic
 		total[:, 4:T+3] .= sum(power_vre_stor, dims = 1)
 		rename!(total,auxNew_Names)
 		dfDischarge_DC = vcat(dfDischarge_DC, total)
-		CSV.write(joinpath(path, "vre_stor_dc_discharge.csv"), dftranspose(dfDischarge_DC, false), writeheader=false)
+		CSV.write(joinpath(path, "vre_stor_dc_discharge.csv"), dftranspose(dfDischarge_DC, false), header=false)
 	end
 
 	# AC discharging of battery dataframe
@@ -374,7 +374,7 @@ function write_vre_stor_discharge(path::AbstractString, inputs::Dict, setup::Dic
 		total[:, 4:T+3] .= sum(power_vre_stor, dims = 1)
 		rename!(total,auxNew_Names)
 		dfDischarge_AC = vcat(dfDischarge_AC, total)
-		CSV.write(joinpath(path, "vre_stor_ac_discharge.csv"), dftranspose(dfDischarge_AC, false), writeheader=false)
+		CSV.write(joinpath(path, "vre_stor_ac_discharge.csv"), dftranspose(dfDischarge_AC, false), header=false)
 	end
 
 	# Wind generation of co-located resource dataframe
@@ -392,7 +392,7 @@ function write_vre_stor_discharge(path::AbstractString, inputs::Dict, setup::Dic
 		total[:, 4:T+3] .= sum(vre_vre_stor, dims = 1)
 		rename!(total,auxNew_Names)
 		dfVP_VRE_STOR = vcat(dfVP_VRE_STOR, total)
-		CSV.write(joinpath(path,"vre_stor_wind_power.csv"), dftranspose(dfVP_VRE_STOR, false), writeheader=false)
+		CSV.write(joinpath(path,"vre_stor_wind_power.csv"), dftranspose(dfVP_VRE_STOR, false), header=false)
 	end
 
 	# Solar generation of co-located resource dataframe
@@ -410,6 +410,6 @@ function write_vre_stor_discharge(path::AbstractString, inputs::Dict, setup::Dic
 		total[:, 4:T+3] .= sum(vre_vre_stor, dims = 1)
 		rename!(total,auxNew_Names)
 		dfVP_VRE_STOR = vcat(dfVP_VRE_STOR, total)
-		CSV.write(joinpath(path,"vre_stor_solar_power.csv"), dftranspose(dfVP_VRE_STOR, false), writeheader=false)
+		CSV.write(joinpath(path,"vre_stor_solar_power.csv"), dftranspose(dfVP_VRE_STOR, false), header=false)
 	end
 end

test/MultiStage.log

@@ -0,0 +1,6 @@
+2024-01-12 13:04:25 | 79735.0 ± 8.0, 41630.0 ± 4.0, 27855.0 ± 3.0 | Test Passed
+2024-01-12 13:07:51 | 79735.0 ± 8.0, 41630.0 ± 4.0, 27855.0 ± 3.0 | Test Passed
+2024-01-12 13:08:35 | 79735.0 ± 8.0, 41630.0 ± 4.0, 27855.0 ± 3.0 | Test Passed
+2024-01-12 13:11:09 | 79735.0 ± 8.0, 41630.0 ± 4.0, 27855.0 ± 3.0 | Test Passed
+2024-01-12 13:13:10 | 79735.0 ± 8.0, 41630.0 ± 4.0, 27855.0 ± 3.0 | Test Passed
+2024-01-12 13:22:00 | 79735.0 ± 8.0, 41630.0 ± 4.0, 27855.0 ± 3.0 | Test Passed

test/MultiStage/Can_Retire.log

@@ -0,0 +1,5 @@
+2024-01-12 13:04:28 | Testing that the resource with Can_Retire = 0 did not expand capacity | Error During Test at /Users/lb9239/Documents/ZERO_lab/GenX/GenX/test/test_multistage.jl:110
+2024-01-12 13:08:39 | Testing that the resource with Can_Retire = 0 did not expand capacity | Test Passed
+2024-01-12 13:11:12 | Testing that the resource with Can_Retire = 0 did not expand capacity | Test Passed
+2024-01-12 13:13:13 | Testing that the resource with Can_Retire = 0 did not expand capacity | Test Passed
+2024-01-12 13:22:04 | Testing that the resource with Can_Retire = 0 did not expand capacity | Test Passed

test/MultiStage/Can_Retire/Inputs_p1/Resources/Res_multistage_data.csv

@@ -0,0 +1,5 @@
+Resource,WACC,Capital_Recovery_Period,Lifetime,Min_Retired_Cap_MW,Min_Retired_Energy_Cap_MW,Min_Retired_Charge_Cap_MW
+natural_gas_combined_cycle,0.039,20,20,0,0,0
+solar_pv,0.017,20,20,0,0,0
+onshore_wind,0.024,20,20,0,0,0
+battery,0.027,20,20,0,0,0

test/MultiStage/Can_Retire/Inputs_p1/Resources/Storage.csv

@@ -0,0 +1,2 @@
+Resource,Zone,Model,New_Build,Can_Retire,Existing_Cap_MW,Existing_Cap_MWh,Max_Cap_MW,Max_Cap_MWh,Min_Cap_MW,Min_Cap_MWh,Inv_Cost_per_MWyr,Inv_Cost_per_MWhyr,Fixed_OM_Cost_per_MWyr,Fixed_OM_Cost_per_MWhyr,Fixed_OM_Cost_Charge_per_MWyr,Var_OM_Cost_per_MWh,Var_OM_Cost_per_MWh_In,Self_disch,Eff_Up,Eff_Down,Min_Duration,Max_Duration,Resource_Type,region,cluster
+battery,1,1,1,1,0,0,-1,-1,0,0,19584,22494,4895,5622,5622,0.15,0.15,0,0.92,0.92,1,10,battery_mid,NE,0

test/MultiStage/Can_Retire/Inputs_p1/Resources/Thermal.csv

@@ -0,0 +1,2 @@
+Resource,Zone,Model,New_Build,Can_Retire,Existing_Cap_MW,Max_Cap_MW,Min_Cap_MW,Inv_Cost_per_MWyr,Fixed_OM_Cost_per_MWyr,Var_OM_Cost_per_MWh,Heat_Rate_MMBTU_per_MWh,Fuel,Cap_Size,Start_Cost_per_MW,Start_Fuel_MMBTU_per_MW,Up_Time,Down_Time,Ramp_Up_Percentage,Ramp_Dn_Percentage,Min_Power,Reg_Max,Rsv_Max,Reg_Cost,Rsv_Cost,MGA,Resource_Type,region,cluster
+natural_gas_combined_cycle,1,1,1,0,10000,-1,0,65400,10287,3.55,7.43,NG,250,91,2,6,6,0.64,0.64,0.468,0.25,0.5,0,0,1,natural_gas_fired_combined_cycle,NE,1

test/MultiStage/Can_Retire/Inputs_p1/Resources/Vre.csv

@@ -0,0 +1,3 @@
+Resource,Zone,Num_VRE_Bins,New_Build,Can_Retire,Existing_Cap_MW,Max_Cap_MW,Min_Cap_MW,Inv_Cost_per_MWyr,Fixed_OM_Cost_per_MWyr,Var_OM_Cost_per_MWh,Heat_Rate_MMBTU_per_MWh,MGA,Resource_Type,region,cluster
+solar_pv,1,1,1,1,500,-1,0,85300,18760,0,9.13,1,solar_photovoltaic,NE,1
+onshore_wind,1,1,1,1,1000,-1,0,97200,43205,0.1,9.12,1,onshore_wind_turbine,NE,1