Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reformat dc #100

Merged
merged 20 commits into from
Nov 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ This repository, and the associated data has been developed to facilitate Produc
- [PLEXOS](https://energyexemplar.com/)
- [Prescient](https://energy.sandia.gov/tag/prescient/)
- [RTS3](http://egpreston.com/)
- [pandapower](http://www.pandapower.org)

## TODO and Identified Areas of Improvement:
- Conventional Plant Data:
Expand Down
8 changes: 4 additions & 4 deletions RTS_Data/FormattedData/MATPOWER/script.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,12 @@ def l(string, string_list):
for i, g in _generators.iterrows():
gen['model'] = 1
gen['startup'] = (
(g['Start Heat Cold MBTU'] * g['Fuel Price $/MMBTU']) + g['Non Fuel Start Cost $']
if not np.isnan((g['Start Heat Cold MBTU'] * g['Fuel Price $/MMBTU']) + g['Non Fuel Start Cost $']) else 0.0
(g['Start Heat Cold MMBTU'] * g['Fuel Price $/MMBTU']) + g['Non Fuel Start Cost $']
if not np.isnan((g['Start Heat Cold MMBTU'] * g['Fuel Price $/MMBTU']) + g['Non Fuel Start Cost $']) else 0.0
)
gen['shutdown'] = (
g['Start Heat Cold MBTU'] * g['Fuel Price $/MMBTU']
if not np.isnan(g['Start Heat Cold MBTU'] * g['Fuel Price $/MMBTU']) else 0.0
g['Start Heat Cold MMBTU'] * g['Fuel Price $/MMBTU']
if not np.isnan(g['Start Heat Cold MMBTU'] * g['Fuel Price $/MMBTU']) else 0.0
)
gen['cost'] = list()
gen['cost'] = g['io_cost']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ generator.data = src.gen[,.(Generator = `GEN UID`,
Fuels_Fuel = Fuel,
`Max Capacity` = `PMax MW`,
Units = ifelse(grepl('Storage|CSP',Category),0,1),
`Shutdown Cost` = `Start Heat Cold MBTU` * `Fuel Price $/MMBTU` ,
`Start Cost` = (`Start Heat Cold MBTU` * `Fuel Price $/MMBTU`) + `Non Fuel Start Cost $` ,
`Shutdown Cost` = `Start Heat Cold MMBTU` * `Fuel Price $/MMBTU` ,
`Start Cost` = (`Start Heat Cold MMBTU` * `Fuel Price $/MMBTU`) + `Non Fuel Start Cost $` ,
`Max Ramp Up` = ifelse(`Ramp Rate MW/Min` == 0, NA,`Ramp Rate MW/Min`),
`Max Ramp Down` = ifelse(`Ramp Rate MW/Min` == 0, NA,`Ramp Rate MW/Min`),
`Pump Load` = ifelse(`Pump Load MW` == 0, NA, `Pump Load MW`),
Expand Down
12 changes: 6 additions & 6 deletions RTS_Data/FormattedData/Prescient/topysp.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
'StartTimeCold', # units are hours
'StartTimeWarm', # units are hours
'StartTimeHot', # units are hours
'StartCostCold', # units are MBTU
'StartCostWarm', # units are MBTU
'StartCostHot', # units are MBTU
'StartCostCold', # units are MMBTU
'StartCostWarm', # units are MMBTU
'StartCostHot', # units are MMBTU
'NonFuelStartCost', # units are $
'FuelPrice', # units are $ / MMBTU
'OutputPct0',
Expand Down Expand Up @@ -111,9 +111,9 @@
int(this_generator_dict["Start Time Cold Hr"]),
int(this_generator_dict["Start Time Warm Hr"]),
int(this_generator_dict["Start Time Hot Hr"]),
float(this_generator_dict["Start Heat Cold MBTU"]),
float(this_generator_dict["Start Heat Warm MBTU"]),
float(this_generator_dict["Start Heat Hot MBTU"]),
float(this_generator_dict["Start Heat Cold MMBTU"]),
float(this_generator_dict["Start Heat Warm MMBTU"]),
float(this_generator_dict["Start Heat Hot MMBTU"]),
float(this_generator_dict["Non Fuel Start Cost $"]),
float(this_generator_dict["Fuel Price $/MMBTU"]),
float(this_generator_dict["Output_pct_0"]),
Expand Down
Loading