Skip to content

Commit

Permalink
Clean inputfiles for examples
Browse files Browse the repository at this point in the history
  • Loading branch information
lbonaldo committed Feb 27, 2024
1 parent 7a7ac9d commit 27e8a63
Show file tree
Hide file tree
Showing 11 changed files with 3 additions and 29 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
Resource,Min_Cap_1,Min_Cap_2,Min_Cap_3
MA_natural_gas_combined_cycle,0,0,0
MA_solar_pv,1,0,0
CT_natural_gas_combined_cycle,0,0,0
CT_onshore_wind,0,1,0
CT_solar_pv,0,0,0
ME_natural_gas_combined_cycle,0,0,0
ME_onshore_wind,0,0,0
MA_battery,0,0,1
CT_battery,0,0,1
ME_battery,0,0,1
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
Resource,Min_Cap_1,Min_Cap_2,Min_Cap_3
MA_natural_gas_combined_cycle,0,0,0
MA_solar_pv,1,0,0
CT_natural_gas_combined_cycle,0,0,0
CT_onshore_wind,0,1,0
CT_solar_pv,0,0,0
ME_natural_gas_combined_cycle,0,0,0
ME_onshore_wind,0,0,0
MA_battery,0,0,1
CT_battery,0,0,1
ME_battery,0,0,1
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
Resource,Min_Cap_1,Min_Cap_2,Min_Cap_3
MA_natural_gas_combined_cycle,0,0,0
MA_solar_pv,1,0,0
CT_natural_gas_combined_cycle,0,0,0
CT_onshore_wind,0,1,0
CT_solar_pv,0,0,0
ME_natural_gas_combined_cycle,0,0,0
ME_onshore_wind,0,0,0
MA_battery,0,0,1
CT_battery,0,0,1
ME_battery,0,0,1
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
Resource,Min_Cap_1,Min_Cap_2,Min_Cap_3
MA_natural_gas_combined_cycle,0,0,0
MA_solar_pv,1,0,0
CT_natural_gas_combined_cycle,0,0,0
CT_onshore_wind,0,1,0
CT_solar_pv,0,0,0
ME_natural_gas_combined_cycle,0,0,0
ME_onshore_wind,0,0,0
MA_battery,0,0,1
CT_battery,0,0,1
ME_battery,0,0,1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ OverwriteResults: 0 # Overwrite existing results in output folder or create a ne
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#MacOrWindows: Mac # Set to either "Mac" (also works for Linux) or "Windows" to ensure use of proper file directory separator "\" or "/
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
Resource,Min_Cap_1,Min_Cap_2,Min_Cap_3,Min_Cap_Solar_1,Min_Cap_Wind_1
MA_natural_gas_combined_cycle,0,0,0,0,0
MA_solar_pv,1,0,0,0,0
CT_onshore_wind,0,1,0,0,0
MA_battery,0,0,1,0,0
CT_battery,0,0,1,0,0
ME_battery,0,0,1,0,0
MA_landbasedwind_class1_moderate,0,0,0,0,0
ME_utilitypv_class1_moderate,0,0,0,0,0
ME_battery,0,0,1,0,0
2 changes: 1 addition & 1 deletion src/multi_stage/configure_multi_stage_inputs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function configure_multi_stage_inputs(inputs_d::Dict, settings_d::Dict, NetworkE
inputs_d["EXPANSION_LINES"] = findall((inputs_d["pLine_Max_Flow_Possible_MW"] .> inputs_d["pTrans_Max"]) .& (inputs_d["pMax_Line_Reinforcement"] .> 0))
inputs_d["NO_EXPANSION_LINES"] = findall((inputs_d["pLine_Max_Flow_Possible_MW"] .<= inputs_d["pTrans_Max"]) .| (inputs_d["pMax_Line_Reinforcement"] .<= 0))
# To-Do: Error Handling
# 1.) Enforce that pLine_Max_Flow_Possible_MW for the first model stage be equal to (for transmission expansion to be disalowed) or greater (to allow transmission expansion) than pTrans_Max in Inputs/Inputs_p1
# 1.) Enforce that pLine_Max_Flow_Possible_MW for the first model stage be equal to (for transmission expansion to be disalowed) or greater (to allow transmission expansion) than pTrans_Max in inputs/inputs_p1
end

return inputs_d
Expand Down
2 changes: 1 addition & 1 deletion src/time_domain_reduction/time_domain_reduction.jl
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ function cluster_inputs(inpath, settings_path, mysetup, stage_id=-99, v=false; r
mysetup["MultiStageSettingsDict"]["CurStage"] = t

# Step 1) Load Inputs
global inpath_sub = string("$inpath/Inputs/Inputs_p",t)
global inpath_sub = string("$inpath/inputs/inputs_p",t)

# this prevents doubled time domain reduction in stages past
# the first, even if the first stage is okay.
Expand Down
File renamed without changes.

0 comments on commit 27e8a63

Please sign in to comment.