Clean example folder and module

GenXProject · Feb 3, 2024 · d534d34 · d534d34
1 parent 3700340
commit d534d34
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 172 deletions.
diff --git a/Example_Systems/IEEE_9BUS/Fuels_data.csv → ...e_Systems/DC_OPF/IEEE_9BUS/Fuels_data.csv b/Example_Systems/IEEE_9BUS/Fuels_data.csv → ...e_Systems/DC_OPF/IEEE_9BUS/Fuels_data.csv
diff --git a/...ple_Systems/IEEE_9BUS/Generators_data.csv → ...tems/DC_OPF/IEEE_9BUS/Generators_data.csv b/...ple_Systems/IEEE_9BUS/Generators_data.csv → ...tems/DC_OPF/IEEE_9BUS/Generators_data.csv
diff --git a/...tems/IEEE_9BUS/Generators_variability.csv → ..._OPF/IEEE_9BUS/Generators_variability.csv b/...tems/IEEE_9BUS/Generators_variability.csv → ..._OPF/IEEE_9BUS/Generators_variability.csv
diff --git a/Example_Systems/IEEE_9BUS/Load_data.csv → ...le_Systems/DC_OPF/IEEE_9BUS/Load_data.csv b/Example_Systems/IEEE_9BUS/Load_data.csv → ...le_Systems/DC_OPF/IEEE_9BUS/Load_data.csv
diff --git a/Example_Systems/IEEE_9BUS/Network.csv → Example_Systems/DC_OPF/IEEE_9BUS/Network.csv b/Example_Systems/IEEE_9BUS/Network.csv → Example_Systems/DC_OPF/IEEE_9BUS/Network.csv
diff --git a/Example_Systems/IEEE_9BUS/README.md → Example_Systems/DC_OPF/IEEE_9BUS/README.md b/Example_Systems/IEEE_9BUS/README.md → Example_Systems/DC_OPF/IEEE_9BUS/README.md
@@ -2,12 +2,12 @@
 
 They are total of 3 generators and three loads
 
-To run the model, first navigate to the example directory at `GenX/Example_Systems/RealSystemExample/IEEE_9BUS`:
+To run the model, first navigate to the example directory at `GenX/Example_Systems/DC_OPF/IEEE_9BUS`:
 
-`cd("Example_Systems/RealSystemExample/IEEE_9BUS")`
+`cd("Example_Systems/DC_OPF/IEEE_9BUS")`
 
-Next, ensure that your settings in `GenX_settings.yml` are correct.
-The default settings use the solver Gurobi (`Solver: Gurobi`).
+Next, ensure that your settings in `Settings/genx_settings.yml` are correct.
+The default settings use the solver HiGHS.
 Other optional policies include minimum capacity requirements, a capacity reserve margin, and more. 
 
 Once the settings are confirmed, run the model with the `Run.jl` script in the example directory:

diff --git a/Example_Systems/IEEE_9BUS/Run_IEEE.jl → Example_Systems/DC_OPF/IEEE_9BUS/Run.jl b/Example_Systems/IEEE_9BUS/Run_IEEE.jl → Example_Systems/DC_OPF/IEEE_9BUS/Run.jl
diff --git a/...ems/IEEE_9BUS/Settings/cplex_settings.yml → ...OPF/IEEE_9BUS/Settings/cplex_settings.yml b/...ems/IEEE_9BUS/Settings/cplex_settings.yml → ...OPF/IEEE_9BUS/Settings/cplex_settings.yml
diff --git a/...tems/IEEE_9BUS/Settings/genx_settings.yml → ..._OPF/IEEE_9BUS/Settings/genx_settings.yml b/...tems/IEEE_9BUS/Settings/genx_settings.yml → ..._OPF/IEEE_9BUS/Settings/genx_settings.yml
@@ -9,7 +9,6 @@ CO2Cap: 0 # CO2 emissions cap; 0 = not active (no CO2 emission limit); 1 = mass-
 StorageLosses: 0 # 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: 0  # Activate minimum technology carveout constraints; 0 = not active; 1 = active
 MaxCapReq: 0  # Activate maximum technology carveout constraints; 0 = not active; 1 = active
-Solver: Gurobi # Available solvers: HiGHS, Gurobi, CPLEX, CLP, SCIP
 ParameterScale: 0 # Turn on parameter scaling wherein load, 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: 0 # Unit committment of thermal power plants; 0 = not active; 1 = active using integer clestering; 2 = active using linearized clustering

diff --git a/...ms/IEEE_9BUS/Settings/gurobi_settings.yml → ...PF/IEEE_9BUS/Settings/gurobi_settings.yml b/...ms/IEEE_9BUS/Settings/gurobi_settings.yml → ...PF/IEEE_9BUS/Settings/gurobi_settings.yml
diff --git a/...ems/IEEE_9BUS/Settings/highs_settings.yml → ...OPF/IEEE_9BUS/Settings/highs_settings.yml b/...ems/IEEE_9BUS/Settings/highs_settings.yml → ...OPF/IEEE_9BUS/Settings/highs_settings.yml
diff --git a/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml b/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml
diff --git a/Example_Systems/IEEE_9BUS/Settings/cbc_settings.yml b/Example_Systems/IEEE_9BUS/Settings/cbc_settings.yml
diff --git a/Example_Systems/IEEE_9BUS/Settings/clp_settings.yml b/Example_Systems/IEEE_9BUS/Settings/clp_settings.yml
diff --git a/Example_Systems/IEEE_9BUS/Settings/scip_settings.yml b/Example_Systems/IEEE_9BUS/Settings/scip_settings.yml
diff --git a/Example_Systems/Input_data_explained/Energy_share_requirement.xlsx b/Example_Systems/Input_data_explained/Energy_share_requirement.xlsx
diff --git a/GenX/Project.toml b/GenX/Project.toml
diff --git a/Project.toml b/Project.toml
@@ -11,7 +11,6 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
-Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b"
 HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -29,6 +28,7 @@ Combinatorics = "1.0.2"
 DataFrames = "1.3.4"
 DataStructures = "0.18.13"
 Distances = "0.10.7"
+HiGHS = "1.1.4"
 JuMP = "1.1.1"
 MathOptInterface = "1.6.1"
 RecursiveArrayTools = "2.31.2"

diff --git a/src/GenX.jl b/src/GenX.jl
@@ -8,7 +8,7 @@ export load_dataframe
 export generate_model
 export solve_model
 export write_outputs
-export cluster_inputs 
+export cluster_inputs
 export mga
 export morris
 export simple_operation

diff --git a/src/configure_settings/configure_settings.jl b/src/configure_settings/configure_settings.jl
@@ -22,7 +22,7 @@ function default_settings()
         "MethodofMorris" => 0,
         "IncludeLossesInESR" => 0,
         "EnableJuMPStringNames" => false,
-        "HydrogenHourlyMatching" => 0
+        "HydrogenHourlyMatching" => 0,
         "DC_OPF" => 0,
     )
 end

diff --git a/src/load_inputs/load_generators_data.jl b/src/load_inputs/load_generators_data.jl
@@ -28,9 +28,6 @@ function load_generators_data!(setup::Dict, path::AbstractString, inputs_gen::Di
 	## Defining sets of generation and storage resources
 
 	# Set of storage resources with symmetric charge/discharge capacity
-	# print(gen_in)
-	# print(gen_in.STOR)
-	# print(R_ID)
 	inputs_gen["STOR_SYMMETRIC"] = gen_in[gen_in.STOR.==1,:R_ID]
 	# Set of storage resources with asymmetric (separte) charge/discharge capacity components
 	inputs_gen["STOR_ASYMMETRIC"] = gen_in[gen_in.STOR.==2,:R_ID]