Skip to content

Commit

Permalink
Response to most review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
brynpickering committed Oct 27, 2023
1 parent 3537c52 commit 5a14185
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 94 deletions.
4 changes: 2 additions & 2 deletions doc/_static/custom_math/annual_energy_balance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# annual_source_max

# New top-level parameters:
# annual_flow_max (if grouping technologies and/or nodes)
# flow_max_group (if grouping technologies and/or nodes)
# annual_flow_max (if summing over technologies and/or nodes)
# flow_max_group (if summing over technologies and/or nodes)

constraints:
annual_energy_balance_per_tech_and_node:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
# Specifying `relaxation` inside the constraint to a non-zero value allows the constraint some flexibility around a given value, making a model easier to solve.

# New top-level parameters:
# relaxation (defined here directly)
# total share limit (defined here directly)
# relaxation (defined here directly).
# demand_share_limit.
# decide_demand_share <- Link supply technologies to the demand technology they are going to be a share of.

variables:
demand_share_per_timestep_decision:
Expand Down
1 change: 1 addition & 0 deletions doc/_static/custom_math/fuel_dist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# fuel_export_max
# fuel_distribution_max
# fuel_distributor_costs
# allow_fuel_distribution <- lookup array with a value of `True` for each carrier where you want to track its distribution

variables:
fuel_distributor:
Expand Down
2 changes: 1 addition & 1 deletion src/calliope/math/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ variables:
max: storage_cap_max

storage:
description: "The carrier stored by a `supply_plus` or `storage` technology in each timestep."
description: "The carrier stored by a `storage` technology in each timestep."
unit: energy
foreach: [nodes, techs, timesteps]
where: "include_storage=True"
Expand Down
89 changes: 0 additions & 89 deletions tests/common/lp_files/piecewise_efficiency_2.lp

This file was deleted.

0 comments on commit 5a14185

Please sign in to comment.