Skip to content

Commit

Permalink
Merge pull request #93 from GenXProject/Reverted_Dev
Browse files Browse the repository at this point in the history 
Reverted dev
  • Loading branch information
@sambuddhac
sambuddhac authored Jan 6, 2022
2 parents c29b516 + a49b0c7 commit 7556b86
Show file tree
Hide file tree
Showing 132 changed files with 61,417 additions and 1,088 deletions.
71 changes: 71 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,74 @@ Example_Systems/NYISO/Results/ReserveMargin_w.csv
Example_Systems/NYISO/Results/ReserveMarginRevenue.csv
Example_Systems/NYISO/Results/storagebal_duals.csv
Example_Systems/RealSystemExample/PG_Test_2030_p1/*
Example_Systems/RealSystemExample/Inputs/*
Example_Systems/SmallNewEngland/ThreeZones_full.zip
Example_Systems/SmallNewEngland/ThreeZones_full/Fuels_data.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Generators_data.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Generators_data_.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Generators_variability.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Load_data.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Network.csv
Example_Systems/SmallNewEngland/ThreeZones_full/README.md
Example_Systems/SmallNewEngland/ThreeZones_full/Results/capacity.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/charge.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/ChargingCost.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/costs.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/curtail.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/emissions.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/EnergyRevenue.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/flow.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/network_expansion.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/nse.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/power.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/power_balance.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/prices.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/RegSubsidyRevenue.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/reliabilty.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/status.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/storage.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/storagebal_duals.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/SubsidyRevenue.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/time_weights.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results/tlosses.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/capacity.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/charge.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/ChargingCost.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/costs.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/curtail.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/emissions.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/EnergyRevenue.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/flow.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/network_expansion.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/nse.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/power.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/power_balance.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/prices.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/RegSubsidyRevenue.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/reliabilty.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/status.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/storage.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/storagebal_duals.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/SubsidyRevenue.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/time_weights.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Results_1/tlosses.csv
Example_Systems/SmallNewEngland/ThreeZones_full/Run.jl
Example_Systems/SmallNewEngland/ThreeZones_full/Run.sh
Example_Systems/SmallNewEngland/ThreeZones_full/Settings/cbc_settings.yml
Example_Systems/SmallNewEngland/ThreeZones_full/Settings/clp_settings.yml
Example_Systems/SmallNewEngland/ThreeZones_full/Settings/cplex_settings.yml
Example_Systems/SmallNewEngland/ThreeZones_full/Settings/genx_settings.yml
Example_Systems/SmallNewEngland/ThreeZones_full/Settings/gurobi_settings.yml
Example_Systems/SmallNewEngland/ThreeZones_full/Settings/time_domain_reduction_settings.yml
Example_Systems/SmallNewEngland/ThreeZones_full/TDR_Results/time_domain_reduction_settings.yml
2050/
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p2/TDR_Results/Fuels_data.csv
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p2/TDR_Results/Generators_variability.csv
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p2/TDR_Results/Load_data.csv
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p2/TDR_Results/Period_map.csv
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p2/TDR_Results/time_domain_reduction_settings.yml
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p3/TDR_Results/Fuels_data.csv
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p3/TDR_Results/Generators_variability.csv
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p3/TDR_Results/Load_data.csv
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p3/TDR_Results/Period_map.csv
Example_Systems/SmallNewEngland/ThreeZones_MultiPeriod/Inputs/Inputs_p3/TDR_Results/time_domain_reduction_settings.yml
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ after_success:
Pkg.add("Coverage")
using Coverage
Coveralls.submit(process_folder())'
#install: travis_wait 30 mvn install
Binary file added Example_Systems/Input_data_explained/CO2_cap.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Capacity_reserve_margin.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Energy_share_requirement.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Fuels_data.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Generators_data.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Generators_variability.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Load_data.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Minimum_Capacity_Requirement.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Network.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/Reserves.xlsx
View file
Binary file not shown.
Binary file added Example_Systems/Input_data_explained/~$Generators_data.xlsx
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions Example_Systems/MethodofMorrisExample/OneZone/CO2_cap.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
,Network_zones,CO_2_Cap_Zone_1,CO_2_Max_tons_MWh_1,CO_2_Max_Mtons_1
NE,z1,1,0.05,0.018
2 changes: 2 additions & 0 deletions Example_Systems/MethodofMorrisExample/OneZone/Capacity_reserve_margin.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
,Network_zones,CapRes_1
NE,z1,0.156
2 changes: 2 additions & 0 deletions Example_Systems/MethodofMorrisExample/OneZone/Energy_share_requirement.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
,Network_zones,ESR_1,ESR_2
NE,z1,0.259,0.348
Loading

0 comments on commit 7556b86

Please sign in to comment.