Skip to content

Commit 73da190

Browse files
Update documentation of unit commitment fuel use to be more clear and parsimonious, correct errors where implementation drifted away from documentation, and fix broken links.
Implement support for a normalized input file parser for part load heat rates. Keep the old parser with the non-normalized (and probably obsolete) format to continue support for people who have written input files against it. Update implementation of unit commitment fuel use parsers to be incrementally more legible and conforming to python style recommendations.
1 parent b5b1a28 commit 73da190

File tree

9 files changed

+253
-203
lines changed

9 files changed

+253
-203
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
GENERATION_PROJECT,gen_loading_level,gen_heat_rate_at_loading_level
2+
S-NG_CC,0.4,2.694069
3+
S-NG_CC,1,6.705
4+
S-NG_GT,0,0.1039
5+
S-NG_GT,1,10.39

examples/production_cost_models/spinning_reserves/inputs/gen_inc_heat_rates.csv

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
GENERATION_PROJECT,gen_loading_level,gen_heat_rate_at_loading_level
2+
S-NG_CC,0.4,2.694069
3+
S-NG_CC,1,6.705
4+
S-NG_GT,0,0.1039
5+
S-NG_GT,1,10.39

examples/production_cost_models/spinning_reserves_advanced/inputs/gen_inc_heat_rates.csv

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
GENERATION_PROJECT,gen_loading_level,gen_heat_rate_at_loading_level
2+
S-NG_CC,0.4,2.694069
3+
S-NG_CC,1,6.705
4+
S-NG_GT,0,0.1039
5+
S-NG_GT,1,10.39

examples/production_cost_models/unit_commit/inputs/gen_inc_heat_rates.csv

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
GENERATION_PROJECT,gen_loading_level,gen_heat_rate_at_loading_level
2+
S-NG_CC,0.4,2.694069
3+
S-NG_CC,1,6.705
4+
S-NG_GT,0,0.1039
5+
S-NG_GT,1,10.39

switch_model/generators/core/commit/fuel_use.py

Lines changed: 224 additions & 179 deletions
Large diffs are not rendered by default.

switch_model/generators/core/commit/operate.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33

44
"""
55
Defines model components to describe unit commitment of projects for the
6-
Switch model. This module is mutually exclusive with the
7-
operations.no_commit module which specifies simplified dispatch
8-
constraints. If you want to use this module directly in a list of switch
9-
modules (instead of including the package operations.unitcommit), you will also
10-
need to include the module operations.unitcommit.fuel_use.
6+
Switch model. This module is mutually exclusive with the operations.no_commit
7+
module which specifies simplified dispatch constraints. This module has a
8+
post-requisite of switch_model.generators.core.commit.fuel_use.
119
"""
1210
from __future__ import division
1311

1412
import os, itertools
1513
from pyomo.environ import *
1614

1715
dependencies = (
18-
'switch_model.timescales', 'switch_model.balancing.load_zones',
19-
'switch_model.financials', 'switch_model.energy_sources.properties.properties',
20-
'switch_model.generators.core.build', 'switch_model.generators.core.dispatch'
16+
'switch_model.timescales',
17+
'switch_model.balancing.load_zones',
18+
'switch_model.financials',
19+
'switch_model.energy_sources.properties.properties',
20+
'switch_model.generators.core.build',
21+
'switch_model.generators.core.dispatch',
2122
)
2223

2324
def define_components(mod):
2425
"""
25-
2626
Adds components to a Pyomo abstract model object to describe
2727
unit commitment for projects. Unless otherwise stated, all power
2828
capacity is specified in units of MW and all sets and parameters

0 commit comments

Comments
 (0)