Skip to content

Minor fixes to comments in code #69

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.

Sign up for GitHub

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

Open
eric-muller wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor fixes to comments in code #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions match_model/balancing/load_zones.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ def define_components(mod):
parameter names and as z for indexes.

zone_demand_mw[z,t] describes the power demand from the high voltage
transmission grid each load zone z and timepoint t. This will either go
transmission grid for each load zone z and timepoint t. This will either go
into the Zone_Power_Withdrawals or the Distributed_Power_Withdrawals power
balance equations, depending on whether the local_td module is included
and has defined a distributed node for power balancing. If the local_td
module is excluded, this value should be the total withdrawals from the
central grid and should include any distribution losses. If the local_td
module is included, this should be set to total end-use demand (aka sales)
module is included, this should be the total end-use demand (aka sales)
and should not include distribution losses. zone_demand_mw must be
non-negative.

Expand Down
2 changes: 1 addition & 1 deletion match_model/balancing/renewable_target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def define_components(mod):

elif mod.options.goal_type == "annual":
mod.Enforce_Annual_Renewable_Target = Constraint(
mod.PERIODS, # for each zone in each period
mod.PERIODS, # for each period
rule=lambda m, p: (
m.total_generation_in_period[p] - m.total_storage_losses_in_period[p]
>= m.renewable_target[p] * m.total_demand_in_period[p]
Expand Down
8 changes: 4 additions & 4 deletions match_model/timescales.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ def define_components(mod):
the expected number of hours.

Example 1: The month of January is described by two timeseries: one
to represent a median load day (example 1) and one to represent a
peak day (example 2). In these examples, the timeseries for the
to represent a median load day (a) and one to represent a
peak day (b). In these examples, the timeseries for the
median load day has a much larger weight than the timeseries for the
peak load day.

January median timeseries: A timeseries describing a median day in
(a) January median timeseries: A timeseries describing a median day in
January is composed of 6 timepoints, each representing a 4-hour
block. This is scaled up by factor of 30 to represent all but 1 day
in January, then scaled up by a factor of 10 to represent all
Expand All @@ -170,7 +170,7 @@ def define_components(mod):
* tp_weight[t] = 1200 hr/period
= 4 hr/tp * 1 tp/ts * 300 ts/period

January peak timeseries: This timeseries describing a peak day in
(b) January peak timeseries: This timeseries describing a peak day in
January is also composed of 6 timepoints, each representing a 4-hour
block. This is scaled up by factor of 1 to represent a single peak
day of the month January, then scaled up by a factor of 10 to
Expand Down