From 6796e51b5d33f0d649a42c057edc64eabda9a868 Mon Sep 17 00:00:00 2001 From: Eric Muller Date: Sat, 4 Feb 2023 09:26:12 -0800 Subject: [PATCH] Minor fixes to comments in code --- match_model/balancing/load_zones.py | 4 ++-- match_model/balancing/renewable_target.py | 2 +- match_model/timescales.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/match_model/balancing/load_zones.py b/match_model/balancing/load_zones.py index 73c8d61..4fa1a3a 100644 --- a/match_model/balancing/load_zones.py +++ b/match_model/balancing/load_zones.py @@ -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. diff --git a/match_model/balancing/renewable_target.py b/match_model/balancing/renewable_target.py index dc99abf..8591e72 100644 --- a/match_model/balancing/renewable_target.py +++ b/match_model/balancing/renewable_target.py @@ -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] diff --git a/match_model/timescales.py b/match_model/timescales.py index 591e694..4b743b5 100644 --- a/match_model/timescales.py +++ b/match_model/timescales.py @@ -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 @@ -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