Skip to content
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: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release notes

## Unversioned
## Version 0.11.3 (2025-11-26)

* Use the new concepts for data variables introduced in [`EnergyModelsBase` v0.9.1](https://github.com/EnergyModelsX/EnergyModelsBase.jl/releases/tag/v0.9.1).
* Reworked the examples to be simpler to understand.
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "EnergyModelsGeography"
uuid = "3f775d88-a4da-46c4-a2cc-aa9f16db6708"
authors = ["Espen Flo Bødal <Espen.Bodal@sintef.no>"]
version = "0.11.2"
version = "0.11.3"

[deps]
EnergyModelsBase = "5d7e687e-f956-46f3-9045-6f5a5fd49f50"
Expand Down
11 changes: 4 additions & 7 deletions docs/src/area_mode/mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TransmissionMode
```

The individual modes use in general the same constraint functions and have the same fields with minor variations.
Hence, all nodes with be presented below.
Hence, all transmission modes will be presented below.

The fields of the types are given as:

Expand Down Expand Up @@ -83,13 +83,10 @@ The types [`RefStatic`](@ref) and [`RefDynamic`](@ref) have furthermore the foll
- **`directions::Int`**:\
The direction value decides whether only unidirectional (1) or bidirectional (2) transport is allowed for the transmission mode.

Theoretically, both [`PipeSimple`](@ref) and [`PipeLinepackSimple`](@ref) include the field `directions`.
However, it is automatically set to 1 through the application of an *[inner constructor](https://docs.julialang.org/en/v1/manual/constructors/#man-inner-constructor-methods)*.

!!! tip "Order of the fields"
The order of the individual fields can be best found in the library, [`RefStatic`](@ref), [`RefDynamic`](@ref), [`PipeSimple`](@ref), and [`PipeLinepackSimple`](@ref).

## [Mathematical description](@id nodes-trans_mode-math)
## [Mathematical description](@id area_mode-trans_mode-math)

In the following mathematical equations, we use the name for variables and functions used in the model.
Variables are in general represented as
Expand All @@ -102,7 +99,7 @@ with square brackets, while functions are represented as

with paranthesis.

### [Variables](@id nodes-trans_mode-math-var)
### [Variables](@id area_mode-trans_mode-math-var)

The variables of all transmission modes are described on *[optimization variables](@ref man-opt_var-transmission_mode)* and include:

Expand All @@ -123,7 +120,7 @@ Bidirectional transmission modes include furthermore:
- ``\texttt{trans\_neg}``
- ``\texttt{trans\_pos}``

### [Constraints](@id nodes-trans_mode-math-con)
### [Constraints](@id area_mode-trans_mode-math-con)

A qualitative overview of the individual constraints can be found on *[Constraint functions](@ref man-con)*.
This section focuses instead on the mathematical description of the individual constraints.
Expand Down
6 changes: 3 additions & 3 deletions examples/investments.jl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ capacity.
function generate_example_network_investment()
@info "Generate case data - Simple geographic example with investments"

# Define the different resources and their emission intensity in tCO2/MWh
# Define the different resources and their emission intensity in t CO₂/MWh
ng = ResourceCarrier("NG", 0.2)
coal = ResourceCarrier("Coal", 0.35)
power = ResourceCarrier("Power", 0.0)
Expand Down Expand Up @@ -85,7 +85,7 @@ function generate_example_network_investment()
Dict(coal => 2.5), # Input to the node with input ratio
Dict(power => 1), # Output from the node with output ratio
[EmissionsEnergy()], # Additional data for emissions
# Line above: `EmissionsEnergy` imply that the emissions data corresponds to
# Line above: `EmissionsEnergy` implies that the emissions data corresponds to
# emissions through fuel usage as calculated by the CO₂ intensity and efficiency.
),
RefStorage{AccumulatingEmissions}(
Expand Down Expand Up @@ -150,7 +150,7 @@ function generate_example_network_investment()
# Line above: `co2` is required as output for variable definition, but the
# value does not matter as it is not utilized in the model.
[CaptureEnergyEmissions(0.9)], # Additional data for emissions and CO₂ capture
# Line above: `CaptureEnergyEmissions` imply that the emissions data corresponds
# Line above: `CaptureEnergyEmissions` implies that the emissions data corresponds
# to emissions through fuel usage as calculated by the CO₂ intensity and efficiency.
# 90 % of the CO₂ emissions are captured as given by the value 0.9.
),
Expand Down
6 changes: 3 additions & 3 deletions examples/network.jl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ electricity is delivered.
function generate_example_network()
@info "Generate case data - Simple geographic example"

# Define the different resources and their emission intensity in tCO2/MWh
# Define the different resources and their emission intensity in t CO₂/MWh
ng = ResourceCarrier("NG", 0.2)
coal = ResourceCarrier("Coal", 0.35)
power = ResourceCarrier("Power", 0.0)
Expand Down Expand Up @@ -78,7 +78,7 @@ function generate_example_network()
Dict(coal => 2.5), # Input to the node with input ratio
Dict(power => 1), # Output from the node with output ratio
[EmissionsEnergy()], # Additional data for emissions
# Line above: `EmissionsEnergy` imply that the emissions data corresponds to
# Line above: `EmissionsEnergy` implies that the emissions data corresponds to
# emissions through fuel usage as calculated by the CO₂ intensity and efficiency.
),
RefStorage{AccumulatingEmissions}(
Expand Down Expand Up @@ -143,7 +143,7 @@ function generate_example_network()
# Line above: `co2` is required as output for variable definition, but the
# value does not matter as it is not utilized in the model.
[CaptureEnergyEmissions(0.9)], # Additional data for emissions and CO₂ capture
# Line above: `CaptureEnergyEmissions` imply that the emissions data corresponds
# Line above: `CaptureEnergyEmissions` implies that the emissions data corresponds
# to emissions through fuel usage as calculated by the CO₂ intensity and efficiency.
# 90 % of the CO₂ emissions are captured as given by the value 0.9.
),
Expand Down