Skip to content

Update area units and available_area description. #705

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

Merged
merged 3 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

### User-facing changes

|fixed| Area-based parameters have appropriate documented units of `area` rather than `area^2` (#701).

|fixed| Technology capacity lower bound constraints so that `[cap-type]_min` (e.g., `flow_cap_min`) is not always enforced if the `purchased_units` variable is active (#643).

|changed| Single data entries defined in YAML indexed parameters will not be automatically broadcast along indexed dimensions.
Expand Down
16 changes: 10 additions & 6 deletions src/calliope/config/model_def_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ properties:
description: >-
Sets `area_use` to a parameter in operate mode.
NOTE: this parameter cannot be used in `plan` mode as it clashes with the decision variable of the same name.
x-unit: $\text{area}^{2}$.
x-unit: $\text{area}$.

area_use_max:
$ref: "#/$defs/TechParamNullNumber"
Expand All @@ -529,7 +529,7 @@ properties:
title: Maximum usable area.
description: >-
If set to a finite value, limits the upper bound of the `area_use` decision variable to this value.
x-unit: $\text{area}^{2}$.
x-unit: $\text{area}$.

area_use_min:
$ref: "#/$defs/TechParamNullNumber"
Expand All @@ -538,7 +538,7 @@ properties:
title: Minimum usable area.
description: >-
Limits the lower bound of the `area_use` decision variable to this value.
x-unit: $\text{area}^{2}$.
x-unit: $\text{area}$.

area_use_per_flow_cap:
$ref: "#/$defs/TechParamNullNumber"
Expand All @@ -547,7 +547,7 @@ properties:
title: Area use per flow capacity
description: >-
If set, forces `area_use` to follow `flow_cap` with the given numerical ratio (e.g. setting to 1.5 means that `area_use == 1.5 * flow_cap`).
x-unit: $\frac{\text{area}^{2}}{\text{power}}$.
x-unit: $\frac{\text{area}}{\text{power}}$.

storage_cap:
$ref: "#/$defs/TechParamNullNumber"
Expand All @@ -558,7 +558,7 @@ properties:
description: >-
Sets `storage_cap` to a parameter in operate mode.
NOTE: this parameter cannot be used in `plan` mode as it clashes with the decision variable of the same name.
x-unit: $\text{area}^{2}$.
x-unit: $\text{area}$.

storage_cap_max:
$ref: "#/$defs/TechParamNullNumber"
Expand Down Expand Up @@ -950,7 +950,7 @@ properties:
title: Cost of area use.
description: >-
Cost per unit `area_use`.
x-unit: $\text{area}^{-2}$.
x-unit: $\text{area}^{-1}$.

cost_source_cap:
$ref: "#/$defs/TechCostNullNumber"
Expand Down Expand Up @@ -1016,3 +1016,7 @@ properties:
minimum: 0
default: .inf
x-resample_method: mean
title: Available area at the given node.
description: >-
Limits the total area that can be occupied by all technologies which have the `area_use` decision variable activated.
x-unit: $\text{area}$.