Fix retrofit examples after merge

GenXProject · Mar 8, 2024 · 10505d4 · 10505d4
1 parent 10d0b75
commit 10505d4
Show file tree

Hide file tree

Showing 70 changed files with 16 additions and 23 deletions.
diff --git a/...rces/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv b/...rces/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv
diff --git a/...ces/Resource_energy_share_requirement.csv → ...nts/Resource_energy_share_requirement.csv b/...ces/Resource_energy_share_requirement.csv → ...nts/Resource_energy_share_requirement.csv
diff --git a/...Resource_maximum_capacity_requirement.csv → ...Resource_maximum_capacity_requirement.csv b/...Resource_maximum_capacity_requirement.csv → ...Resource_maximum_capacity_requirement.csv
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/Example_Systems/RetrofitExample/OneZone/Run.jl b/Example_Systems/RetrofitExample/OneZone/Run.jl
@@ -1,3 +1,4 @@
 using GenX
+using Gurobi
 
-run_genx_case!(dirname(@__FILE__))
+run_genx_case!(dirname(@__FILE__), Gurobi.Optimizer)
diff --git a/...stems/RetrofitExample/OneZone/CO2_cap.csv → ...rofitExample/OneZone/policies/CO2_cap.csv b/...stems/RetrofitExample/OneZone/CO2_cap.csv → ...rofitExample/OneZone/policies/CO2_cap.csv
diff --git a/...ample/OneZone/Capacity_reserve_margin.csv → ...Zone/policies/Capacity_reserve_margin.csv b/...ample/OneZone/Capacity_reserve_margin.csv → ...Zone/policies/Capacity_reserve_margin.csv
diff --git a/...mple/OneZone/Energy_share_requirement.csv → ...one/policies/Energy_share_requirement.csv b/...mple/OneZone/Energy_share_requirement.csv → ...one/policies/Energy_share_requirement.csv
diff --git a/.../OneZone/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv b/.../OneZone/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv
diff --git a/.../OneZone/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/.../OneZone/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/...s/RetrofitExample/OneZone/Demand_data.csv → ...fitExample/OneZone/system/Demand_data.csv b/...s/RetrofitExample/OneZone/Demand_data.csv → ...fitExample/OneZone/system/Demand_data.csv
diff --git a/...ms/RetrofitExample/OneZone/Fuels_data.csv → ...ofitExample/OneZone/system/Fuels_data.csv b/...ms/RetrofitExample/OneZone/Fuels_data.csv → ...ofitExample/OneZone/system/Fuels_data.csv
diff --git a/...xample/OneZone/Generators_variability.csv → ...OneZone/system/Generators_variability.csv b/...xample/OneZone/Generators_variability.csv → ...OneZone/system/Generators_variability.csv
diff --git a/...e_MultiStage/Inputs/Inputs_p1/CO2_cap.csv → ...age/Inputs/Inputs_p1/policies/CO2_cap.csv b/...e_MultiStage/Inputs/Inputs_p1/CO2_cap.csv → ...age/Inputs/Inputs_p1/policies/CO2_cap.csv
diff --git a/...uts/Inputs_p1/Capacity_reserve_margin.csv → ...s_p1/policies/Capacity_reserve_margin.csv b/...uts/Inputs_p1/Capacity_reserve_margin.csv → ...s_p1/policies/Capacity_reserve_margin.csv
diff --git a/...ts/Inputs_p1/Energy_share_requirement.csv → ..._p1/policies/Energy_share_requirement.csv b/...ts/Inputs_p1/Energy_share_requirement.csv → ..._p1/policies/Energy_share_requirement.csv
diff --git a/...nputs_p1/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...nputs_p1/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/...ltiStage/Inputs/Inputs_p1/Demand_data.csv → ...e/Inputs/Inputs_p1/system/Demand_data.csv b/...ltiStage/Inputs/Inputs_p1/Demand_data.csv → ...e/Inputs/Inputs_p1/system/Demand_data.csv
diff --git a/...ultiStage/Inputs/Inputs_p1/Fuels_data.csv → ...ge/Inputs/Inputs_p1/system/Fuels_data.csv b/...ultiStage/Inputs/Inputs_p1/Fuels_data.csv → ...ge/Inputs/Inputs_p1/system/Fuels_data.csv
diff --git a/...puts/Inputs_p1/Generators_variability.csv → ...puts_p1/system/Generators_variability.csv b/...puts/Inputs_p1/Generators_variability.csv → ...puts_p1/system/Generators_variability.csv
diff --git a/..._MultiStage/Inputs/Inputs_p1/Reserves.csv → ...Inputs_p1/system/Operational_reserves.csv b/..._MultiStage/Inputs/Inputs_p1/Reserves.csv → ...Inputs_p1/system/Operational_reserves.csv
diff --git a/...e_MultiStage/Inputs/Inputs_p2/CO2_cap.csv → ...age/Inputs/Inputs_p2/policies/CO2_cap.csv b/...e_MultiStage/Inputs/Inputs_p2/CO2_cap.csv → ...age/Inputs/Inputs_p2/policies/CO2_cap.csv
diff --git a/...uts/Inputs_p2/Capacity_reserve_margin.csv → ...s_p2/policies/Capacity_reserve_margin.csv b/...uts/Inputs_p2/Capacity_reserve_margin.csv → ...s_p2/policies/Capacity_reserve_margin.csv
diff --git a/...ts/Inputs_p2/Energy_share_requirement.csv → ..._p2/policies/Energy_share_requirement.csv b/...ts/Inputs_p2/Energy_share_requirement.csv → ..._p2/policies/Energy_share_requirement.csv
diff --git a/...nputs_p2/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...nputs_p2/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/...ltiStage/Inputs/Inputs_p2/Demand_data.csv → ...e/Inputs/Inputs_p2/system/Demand_data.csv b/...ltiStage/Inputs/Inputs_p2/Demand_data.csv → ...e/Inputs/Inputs_p2/system/Demand_data.csv
diff --git a/...ultiStage/Inputs/Inputs_p2/Fuels_data.csv → ...ge/Inputs/Inputs_p2/system/Fuels_data.csv b/...ultiStage/Inputs/Inputs_p2/Fuels_data.csv → ...ge/Inputs/Inputs_p2/system/Fuels_data.csv
diff --git a/...puts/Inputs_p2/Generators_variability.csv → ...puts_p2/system/Generators_variability.csv b/...puts/Inputs_p2/Generators_variability.csv → ...puts_p2/system/Generators_variability.csv
diff --git a/..._MultiStage/Inputs/Inputs_p2/Reserves.csv → ...Inputs_p2/system/Operational_reserves.csv b/..._MultiStage/Inputs/Inputs_p2/Reserves.csv → ...Inputs_p2/system/Operational_reserves.csv
diff --git a/...e_MultiStage/Inputs/Inputs_p3/CO2_cap.csv → ...age/Inputs/Inputs_p3/policies/CO2_cap.csv b/...e_MultiStage/Inputs/Inputs_p3/CO2_cap.csv → ...age/Inputs/Inputs_p3/policies/CO2_cap.csv
diff --git a/...uts/Inputs_p3/Capacity_reserve_margin.csv → ...s_p3/policies/Capacity_reserve_margin.csv b/...uts/Inputs_p3/Capacity_reserve_margin.csv → ...s_p3/policies/Capacity_reserve_margin.csv
diff --git a/...ts/Inputs_p3/Energy_share_requirement.csv → ..._p3/policies/Energy_share_requirement.csv b/...ts/Inputs_p3/Energy_share_requirement.csv → ..._p3/policies/Energy_share_requirement.csv
diff --git a/...nputs_p3/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...nputs_p3/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/...ltiStage/Inputs/Inputs_p3/Demand_data.csv → ...e/Inputs/Inputs_p3/system/Demand_data.csv b/...ltiStage/Inputs/Inputs_p3/Demand_data.csv → ...e/Inputs/Inputs_p3/system/Demand_data.csv
diff --git a/...ultiStage/Inputs/Inputs_p3/Fuels_data.csv → ...ge/Inputs/Inputs_p3/system/Fuels_data.csv b/...ultiStage/Inputs/Inputs_p3/Fuels_data.csv → ...ge/Inputs/Inputs_p3/system/Fuels_data.csv
diff --git a/...puts/Inputs_p3/Generators_variability.csv → ...puts_p3/system/Generators_variability.csv b/...puts/Inputs_p3/Generators_variability.csv → ...puts_p3/system/Generators_variability.csv
diff --git a/..._MultiStage/Inputs/Inputs_p3/Reserves.csv → ...Inputs_p3/system/Operational_reserves.csv b/..._MultiStage/Inputs/Inputs_p3/Reserves.csv → ...Inputs_p3/system/Operational_reserves.csv
diff --git a/Example_Systems/RetrofitExample/OneZone_MultiStage/Run.jl b/Example_Systems/RetrofitExample/OneZone_MultiStage/Run.jl
@@ -1,3 +1,4 @@
 using GenX
+using Gurobi
 
-run_genx_case!(dirname(@__FILE__))
+run_genx_case!(dirname(@__FILE__), Gurobi.Optimizer)
diff --git a/Example_Systems/RetrofitExample/OneZone_MultiStage/Settings/genx_settings.yml b/Example_Systems/RetrofitExample/OneZone_MultiStage/Settings/genx_settings.yml
@@ -1,16 +1,15 @@
-NetworkExpansion: 1 # Transmission network expansionl; 0 = not active; 1 = active systemwide
+OverwriteResults: 0 # Overwrite existing results in output folder or create a new one; 0 = create new folder; 1 = overwrite existing results
+PrintModel: 0 # Write the model formulation as an output; 0 = active; 1 = not active
+NetworkExpansion: 0 # Transmission network expansionl; 0 = not active; 1 = active systemwide
 Trans_Loss_Segments: 1 # Number of segments used in piecewise linear approximation of transmission losses; 1 = linear, >2 = piecewise quadratic
-<<<<<<<< HEAD:Example_Systems/RetrofitExample/OneZone_MultiStage/Settings/genx_settings.yml
-Reserves: 1 # Regulation (primary) and operating (secondary) reserves; 0 = not active, 1 = active systemwide
-========
->>>>>>>> origin/develop:example_systems/1_three_zones/settings/genx_settings.yml
 EnergyShareRequirement: 0 # Minimum qualifying renewables penetration; 0 = not active; 1 = active systemwide
 CapacityReserveMargin: 0 # Number of capacity reserve margin constraints; 0 = not active; 1 = active systemwide
 CO2Cap: 2 # CO2 emissions cap; 0 = not active (no CO2 emission limit); 1 = mass-based emission limit constraint; 2 = demand + rate-based emission limit constraint; 3 = generation + rate-based emission limit constraint
 StorageLosses: 1 # Energy Share Requirement and CO2 constraints account for energy lost; 0 = not active (DO NOT account for energy lost); 1 = active systemwide (DO account for energy lost)
-MinCapReq: 1  # Activate minimum technology carveout constraints; 0 = not active; 1 = active
+MinCapReq: 0  # Activate minimum technology carveout constraints; 0 = not active; 1 = active
 MaxCapReq: 0  # Activate maximum technology carveout constraints; 0 = not active; 1 = active
 ParameterScale: 1 # Turn on parameter scaling wherein demand, capacity and power variables are defined in GW rather than MW. 0 = not active; 1 = active systemwide
 WriteShadowPrices: 1 # Write shadow prices of LP or relaxed MILP; 0 = not active; 1 = active
 UCommit: 2 # Unit committment of thermal power plants; 0 = not active; 1 = active using integer clestering; 2 = active using linearized clustering
 TimeDomainReduction: 1 # Time domain reduce (i.e. cluster) inputs based on Demand_data.csv, Generators_variability.csv, and Fuels_data.csv; 0 = not active (use input data as provided); 0 = active (cluster input data, or use data that has already been clustered)
+MultiStage: 1
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/Example_Systems/RetrofitExample/ThreeZones/Run.jl b/Example_Systems/RetrofitExample/ThreeZones/Run.jl
@@ -1,3 +1,4 @@
 using GenX
+using Gurobi
 
-run_genx_case!(dirname(@__FILE__))
+run_genx_case!(dirname(@__FILE__), Gurobi.Optimizer)
diff --git a/Example_Systems/RetrofitExample/ThreeZones/Settings/genx_settings.yml b/Example_Systems/RetrofitExample/ThreeZones/Settings/genx_settings.yml
@@ -1,8 +1,5 @@
-OverwriteResults: 0 # Overwrite existing results in output folder or create a new one; 0 = create new folder; 1 = overwrite existing results
-PrintModel: 0 # Write the model formulation as an output; 0 = active; 1 = not active
 NetworkExpansion: 1 # Transmission network expansionl; 0 = not active; 1 = active systemwide
 Trans_Loss_Segments: 1 # Number of segments used in piecewise linear approximation of transmission losses; 1 = linear, >2 = piecewise quadratic
-Reserves: 0 # Regulation (primary) and operating (secondary) reserves; 0 = not active, 1 = active systemwide
 EnergyShareRequirement: 0 # Minimum qualifying renewables penetration; 0 = not active; 1 = active systemwide
 CapacityReserveMargin: 0 # Number of capacity reserve margin constraints; 0 = not active; 1 = active systemwide
 CO2Cap: 2 # CO2 emissions cap; 0 = not active (no CO2 emission limit); 1 = mass-based emission limit constraint; 2 = demand + rate-based emission limit constraint; 3 = generation + rate-based emission limit constraint
@@ -12,10 +9,4 @@ MaxCapReq: 0  # Activate maximum technology carveout constraints; 0 = not active
 ParameterScale: 1 # Turn on parameter scaling wherein demand, capacity and power variables are defined in GW rather than MW. 0 = not active; 1 = active systemwide
 WriteShadowPrices: 1 # Write shadow prices of LP or relaxed MILP; 0 = not active; 1 = active
 UCommit: 2 # Unit committment of thermal power plants; 0 = not active; 1 = active using integer clestering; 2 = active using linearized clustering
-TimeDomainReductionFolder: "TDR_Results" # Directory name where results from time domain reduction will be saved. If results already exist here, these will be used without running time domain reduction script again.
-TimeDomainReduction: 1 # Time domain reduce (i.e. cluster) inputs based on Demand_data.csv, Generators_variability.csv, and Fuels_data.csv; 0 = not active (use input data as provided); 0 = active (cluster input data, or use data that has already been clustered)
-ModelingToGenerateAlternatives: 0 # Modeling to generate alternatives; 0 = not active; 1 = active. Note: produces a single solution as output
-ModelingtoGenerateAlternativeSlack: 0.1 # Slack value as a fraction of least-cost objective in budget constraint used for evaluating alternative model solutions; positive float value
-ModelingToGenerateAlternativeIterations: 3 # Number of MGA iterations with maximization and minimization objective
-MultiStage: 0 # Multi-stage modeling; 0 if single-stage; 1 if multi-stage.
-MethodofMorris: 0 #Flag for turning on the Method of Morris analysis
+TimeDomainReduction: 1 # Time domain reduce (i.e. cluster) inputs based on Demand_data.csv, Generators_variability.csv, and Fuels_data.csv; 0 = not active (use input data as provided); 0 = active (cluster input data, or use data that has already been clustered)
diff --git a/...ms/RetrofitExample/ThreeZones/CO2_cap.csv → ...itExample/ThreeZones/policies/CO2_cap.csv b/...ms/RetrofitExample/ThreeZones/CO2_cap.csv → ...itExample/ThreeZones/policies/CO2_cap.csv
diff --git a/...le/ThreeZones/Capacity_reserve_margin.csv → ...ones/policies/Capacity_reserve_margin.csv b/...le/ThreeZones/Capacity_reserve_margin.csv → ...ones/policies/Capacity_reserve_margin.csv
diff --git a/...e/ThreeZones/Energy_share_requirement.csv → ...nes/policies/Energy_share_requirement.csv b/...e/ThreeZones/Energy_share_requirement.csv → ...nes/policies/Energy_share_requirement.csv
diff --git a/...reeZones/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...reeZones/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/...etrofitExample/ThreeZones/Demand_data.csv → ...Example/ThreeZones/system/Demand_data.csv b/...etrofitExample/ThreeZones/Demand_data.csv → ...Example/ThreeZones/system/Demand_data.csv
diff --git a/...RetrofitExample/ThreeZones/Fuels_data.csv → ...tExample/ThreeZones/system/Fuels_data.csv b/...RetrofitExample/ThreeZones/Fuels_data.csv → ...tExample/ThreeZones/system/Fuels_data.csv
diff --git a/...ple/ThreeZones/Generators_variability.csv → ...eeZones/system/Generators_variability.csv b/...ple/ThreeZones/Generators_variability.csv → ...eeZones/system/Generators_variability.csv
diff --git a/...ms/RetrofitExample/ThreeZones/Network.csv → ...ofitExample/ThreeZones/system/Network.csv b/...ms/RetrofitExample/ThreeZones/Network.csv → ...ofitExample/ThreeZones/system/Network.csv
diff --git a/src/load_inputs/load_resources_data.jl b/src/load_inputs/load_resources_data.jl
@@ -436,7 +436,7 @@ function check_resource(r::AbstractResource)
     return e
 end
 
-function check_retrofit_id(rs::Vector{AbstractResource})
+function check_retrofit_id(rs::Vector{T}) where T <: AbstractResource
     warning_strings = String[]
 
     units_can_retrofit = ids_can_retrofit(rs)
@@ -458,7 +458,7 @@ check_resource(resources::Vector{T})::Vector{String} where T <: AbstractResource
 Validate the consistency of a vector of GenX resources
 Reports any errors/warnings as a vector of messages.
 """
-function check_resource(resources::T) where T <: Vector{AbstractResource}
+function check_resource(resources::Vector{T}) where T <: AbstractResource
     e = []
     for r in resources
         e = [e; check_resource(r)]
@@ -488,7 +488,7 @@ function announce_errors_and_halt(e::Vector)
     return nothing
 end
 
-function validate_resources(resources::T) where T <: Vector{AbstractResource}
+function validate_resources(resources::Vector{T}) where T <: AbstractResource
     e = check_resource(resources)
     if length(e) > 0
         announce_errors_and_halt(e)

diff --git a/test/Retrofit/README.md → test/retrofit/README.md b/test/Retrofit/README.md → test/retrofit/README.md
diff --git a/test/Retrofit/highs_settings.yml → test/retrofit/highs_settings.yml b/test/Retrofit/highs_settings.yml → test/retrofit/highs_settings.yml
diff --git a/test/Retrofit/CO2_cap.csv → test/retrofit/policies/CO2_cap.csv b/test/Retrofit/CO2_cap.csv → test/retrofit/policies/CO2_cap.csv
diff --git a/test/Retrofit/Capacity_reserve_margin.csv → ...ofit/policies/Capacity_reserve_margin.csv b/test/Retrofit/Capacity_reserve_margin.csv → ...ofit/policies/Capacity_reserve_margin.csv
diff --git a/test/Retrofit/Energy_share_requirement.csv → ...fit/policies/Energy_share_requirement.csv b/test/Retrofit/Energy_share_requirement.csv → ...fit/policies/Energy_share_requirement.csv
diff --git a/...Retrofit/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv b/...Retrofit/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv
diff --git a/...Retrofit/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...Retrofit/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/test/Retrofit/Resources/Storage.csv → test/retrofit/resources/Storage.csv b/test/Retrofit/Resources/Storage.csv → test/retrofit/resources/Storage.csv
diff --git a/test/Retrofit/Resources/Thermal.csv → test/retrofit/resources/Thermal.csv b/test/Retrofit/Resources/Thermal.csv → test/retrofit/resources/Thermal.csv
diff --git a/test/Retrofit/Resources/Vre.csv → test/retrofit/resources/Vre.csv b/test/Retrofit/Resources/Vre.csv → test/retrofit/resources/Vre.csv
diff --git a/...rces/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv b/...rces/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv
diff --git a/...ces/Resource_energy_share_requirement.csv → ...nts/Resource_energy_share_requirement.csv b/...ces/Resource_energy_share_requirement.csv → ...nts/Resource_energy_share_requirement.csv
diff --git a/...Resource_maximum_capacity_requirement.csv → ...Resource_maximum_capacity_requirement.csv b/...Resource_maximum_capacity_requirement.csv → ...Resource_maximum_capacity_requirement.csv
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/test/Retrofit/Demand_data.csv → test/retrofit/system/Demand_data.csv b/test/Retrofit/Demand_data.csv → test/retrofit/system/Demand_data.csv
diff --git a/test/Retrofit/Fuels_data.csv → test/retrofit/system/Fuels_data.csv b/test/Retrofit/Fuels_data.csv → test/retrofit/system/Fuels_data.csv
diff --git a/test/Retrofit/Generators_variability.csv → ...etrofit/system/Generators_variability.csv b/test/Retrofit/Generators_variability.csv → ...etrofit/system/Generators_variability.csv
diff --git a/test/Retrofit/Period_map.csv → test/retrofit/system/Period_map.csv b/test/Retrofit/Period_map.csv → test/retrofit/system/Period_map.csv
diff --git a/test/test_retrofit.jl b/test/test_retrofit.jl
@@ -5,7 +5,7 @@ using Test
 include(joinpath(@__DIR__, "utilities.jl"))
 
 obj_true = 3179.6244
-test_path = "Retrofit"
+test_path = "retrofit"
 
 # Define test inputs
 genx_setup = Dict(