Address comments and cleanup

GenXProject · Feb 15, 2024 · deb9887 · deb9887
1 parent 78f0656
commit deb9887
Show file tree

Hide file tree

Showing 86 changed files with 199 additions and 2,862 deletions.
diff --git a/Example_Systems/ProprietarySolver/Resources/Resource_capacity_reserve_margin.csv b/Example_Systems/ProprietarySolver/Resources/Resource_capacity_reserve_margin.csv
@@ -1,4 +1,4 @@
-Resource,Eligible_Cap_Res
+Resource,Derating_Factor
 natural_gas_combined_cycle,0.93
 solar_pv,0.8
 onshore_wind,0.8

diff --git a/...Systems/RealSystemExample/ISONE_Singlezone/Resources/Resource_capacity_reserve_margin.csv b/...Systems/RealSystemExample/ISONE_Singlezone/Resources/Resource_capacity_reserve_margin.csv
@@ -1,4 +1,4 @@
-Resource,Eligible_Cap_Res_1
+Resource,Derating_Factor_1
 NENGREST_biomass_1,0.93
 NENGREST_conventional_hydroelectric_1,0.8
 NENGREST_hydroelectric_pumped_storage_1,0.95

diff --git a/...le_Systems/RealSystemExample/ISONE_Trizone/Resources/Resource_capacity_reserve_margin.csv b/...le_Systems/RealSystemExample/ISONE_Trizone/Resources/Resource_capacity_reserve_margin.csv
@@ -1,4 +1,4 @@
-Resource,Eligible_Cap_Res_1
+Resource,Derating_Factor_1
 NENGREST_biomass_1,0.93
 NENGREST_conventional_hydroelectric_1,0.8
 NENGREST_hydroelectric_pumped_storage_1,0.95

diff --git a/...SystemExample/ISONE_Trizone_FullTimeseries/Resources/Resource_capacity_reserve_margin.csv b/...SystemExample/ISONE_Trizone_FullTimeseries/Resources/Resource_capacity_reserve_margin.csv
@@ -1,4 +1,4 @@
-Resource,Eligible_Cap_Res_1
+Resource,Derating_Factor_1
 NENGREST_biomass_1,0.93
 NENGREST_conventional_hydroelectric_1,0.8
 NENGREST_hydroelectric_pumped_storage_1,0.95

diff --git a/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Generators_data_.csv b/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Generators_data_.csv
diff --git a/...emExample/MGA_ISONE_Trizone_FullTimeseries/Resources/Resource_capacity_reserve_margin.csv b/...emExample/MGA_ISONE_Trizone_FullTimeseries/Resources/Resource_capacity_reserve_margin.csv
@@ -1,4 +1,4 @@
-Resource,Eligible_Cap_Res_1
+Resource,Derating_Factor_1
 NENGREST_biomass_1,0.93
 NENGREST_conventional_hydroelectric_1,0.8
 NENGREST_hydroelectric_pumped_storage_1,0.95

diff --git a/Example_Systems/SmallNewEngland/OneZone/Resources/Resource_capacity_reserve_margin.csv b/Example_Systems/SmallNewEngland/OneZone/Resources/Resource_capacity_reserve_margin.csv
@@ -1,4 +1,4 @@
-Resource,Eligible_Cap_Res_1
+Resource,Derating_Factor_1
 natural_gas_combined_cycle,0.93
 solar_pv,0.8
 onshore_wind,0.8

diff --git a/Example_Systems/SmallNewEngland/OneZone/Resources/Resource_maximum_capacity_requirement.csv b/Example_Systems/SmallNewEngland/OneZone/Resources/Resource_maximum_capacity_requirement.csv
@@ -1,4 +1,4 @@
-Resource,Min_Cap_1,Min_Cap_2,Min_Cap_3
+Resource,Max_Cap_1,Max_Cap_2,Max_Cap_3
 solar_pv,1,0,0
 onshore_wind,0,1,0
-battery,0,0,1
+battery,0,0,1
diff --git a/Example_Systems/VREStor_Example/Resources/Resource_capacity_reserve_margin.csv b/Example_Systems/VREStor_Example/Resources/Resource_capacity_reserve_margin.csv
@@ -1,4 +1,4 @@
-Resource,Eligible_Cap_Res_1,Eligible_Cap_Res_2,Eligible_Cap_Res_3
+Resource,Derating_Factor_1,Derating_Factor_2,Derating_Factor_3
 EIC_advnuclear_atb_moderate_0,0.93,0,0
 EIC_batteries_1,0.95,0,0
 EIC_battery_moderate_0,0.95,0,0