Add detailed hydro power model #35

peraaslid · 2024-11-19T12:32:39Z

New nodes HydroReservoir, HydroGenerator, HydroPump and HydroGate.

…ksjoner. Lagt til flomvei i eksempel. Lagt til constraints_capacity for Inflow constraints_level_aux og constraints_level_sp for HydroReservoir.

…ation changed to HydroGenerator, added TODOs

Move from added_datastruct to datastructures. Update checks. Implement flow and vol constraints and datatypes. Move constraints to Data[]. Export new types.

* add reservoir constraint tests * Add gate schedule test * update hydro reservoir docstring * Fix Hydro generator docstring * Add documentation structure * Add new nodes to methods-fields * include nodes in make.jl * Fix docstring format for HydroGate and HydroReservoir * fix HydroGenerator docstring * Export new module to make available in doc * Update checks.jl --------- Co-authored-by: Julian Straus <[email protected]> Co-authored-by: linnemeliesch <[email protected]>

* Adjust/Changes in EMB (#27) * Modifications to docstrings * Updated CI to LTS and updated dependencies * Adjusted documentation based on changes in EMB * Minor update in the level balance description * Change how constraints are defined * Fix code based on changes in base * Use reservoir inner constructor * use inner constructor for hydro gate * Use variable durations in test and general refactoring * Code refactoring of gate opex and more documentation * Fix links and equations * Include reservoir opex description * Refactor restriction function and rewrite test --------- Co-authored-by: Julian Straus <[email protected]>

…Producers.jl into dev_hydro_rebase

* Moved HydroGenerator and pq_curve to datastructures.jl Deleted added_datastruct.jl. * defined new type AbstractPqCurve * Model PQ_curve as energy equivalent for hydropower generator * Modelling of pq_curve as PqPoints (power - discharge points) for hydropower generator nodes * Added abstract type for HydroUnit, updated HydroPump struct * Add hydro generator test * use resource as input to constraint * Include power and discharge constraints for generator. Include capacity scaling of PQ-curve. * Add hydrogenerator tests. * Add pump module and simple test * Add hydro generator and pump checks * Only build penalty constraints when active * Refactor building of pq_curve to reuse code for pump and generator --------- Co-authored-by: Linn Emelie Schaffer <[email protected]>

…onstraint (#34)

* Bug fix scaling of PQ-curve/maximum capacity HydroUnit node. * documentation HydroGenerator * Simplified constraints_flow_in for pump * Added documentation to HydroPump * Added description of detailed hydropower, high-level. * updated index.md in documenatation * Include illustration * Fix links in doc --------- Co-authored-by: Linn Emelie Schaffer <[email protected]> Co-authored-by: Per Aaslid <[email protected]>

docs/src/nodes/detailed-hydropower.md

JulStraus

There are a few things we have to fix. Some of them can be taken as separate issue for the final release, some of them should be fixed beforehand. I will write for each point whether I will do it directly.

docs/src/nodes/detailed-hydropower.md

src/checks.jl

src/constraint_functions.jl

src/datastructures.jl

…uired

JulStraus

Updates to the existing comments

docs/src/nodes/detailed-hydropower.md

src/constraint_functions.jl

src/checks.jl

- Several subpages for improved accesibility - Updated crosslinks as well

- Moved input and output to function declarations from constructor - Moved call of `build_pq_constaints` ot `constraints_capacity`

…stractScheduleType, MinConstraintType to MinSchedule, MaxConstraintType to MaxSchedule, and ScheduleConstraintType to EqualSchedule

…ervoir

… that it better aligns with code.

peraaslid · 2024-11-21T13:06:27Z

All comments from review has been resolved @JulStraus

JulStraus

Looks good now. We wait with version increase and registration until the BatteryStorage nodes are merged as well.

Linn Emelie Schaffer and others added 25 commits September 18, 2024 15:17

file for new datastrucutres

8df806b

New structs and test example

a670c72

Added development branch to environment

318a7b6

Kommentert ut parametere som ikke er i bruk ennå + lagt til hjelpefun…

4d82074

…ksjoner. Lagt til flomvei i eksempel. Lagt til constraints_capacity for Inflow constraints_level_aux og constraints_level_sp for HydroReservoir.

updated formatting style

d24da7a

fixed example

0739f43

added GUI

8502a6b

formatting

02cae8e

Added simpel end value setting (single water value) and PQ curve.

1166053

Updated example to include pq-curve and water value (variable opex)

74f6a16

Commenting, checks for input data, pq_curve as optional data, HydroSt…

0dc17db

…ation changed to HydroGenerator, added TODOs

Fix struct subtyping

141b56c

Remove inflow object.

73d52db

Move from added_datastruct to datastructures. Update checks. Implement flow and vol constraints and datatypes. Move constraints to Data[]. Export new types.

Include penalty variables when required for rsv

84dd5e6

Make constraints relative

ca84e0d

Include rsv vol constraint and penalty

c8920b5

Remove init_vol from HydroReservoir

1239405

Convert hydrogate constraints to relative (#30)

fcda62a

Merge branch 'main' of github.com:EnergyModelsX/EnergyModelsRenewable…

aec642a

…Producers.jl into dev_hydro_rebase

Refactor - remove unused function

2940315

Fix bug causing crash in giving data to object that are not of type c…

efbcc2f

…onstraint (#34)

peraaslid requested a review from JulStraus November 19, 2024 12:32

peraaslid self-assigned this Nov 19, 2024

JulStraus added documentation Improvements or additions to documentation enhancement New feature or request labels Nov 20, 2024

Removed unnecessary files and updated formatter

0809ecc

JulStraus assigned linnemeliesch Nov 20, 2024

JulStraus added 2 commits November 20, 2024 08:59

Restructured library

83c5f8e

Modified the docs to be aligned with other package

fac8d6d

peraaslid commented Nov 20, 2024

View reviewed changes

docs/src/nodes/detailed-hydropower.md Outdated Show resolved Hide resolved

JulStraus added 2 commits November 20, 2024 13:50

Updated the doc strings.

73b1175

Reverted change which lead to an error

e8ca5ec

JulStraus requested changes Nov 20, 2024

View reviewed changes

Per Aaslid and others added 3 commits November 20, 2024 14:53

Update illustration and add danger box stating reservoir input is req…

3427df3

…uired

Prepared for improved check descriptions

677e472

Added a warning for investment data through an ext

1b69494

JulStraus reviewed Nov 20, 2024

View reviewed changes

docs/src/nodes/detailed-hydropower.md Outdated Show resolved Hide resolved

docs/src/nodes/detailed-hydropower.md Outdated Show resolved Hide resolved

src/constraint_functions.jl Show resolved Hide resolved

src/checks.jl Show resolved Hide resolved

JulStraus and others added 8 commits November 20, 2024 15:53

Resturctured the documentation:

32f69a1

- Several subpages for improved accesibility - Updated crosslinks as well

Multiple changes form PR review

2d39ebf

- Moved input and output to function declarations from constructor - Moved call of `build_pq_constaints` ot `constraints_capacity`

Changed CI to check lts windows x64

022ef8f

Rename Constraint to ScheduleConstraint, AbstractConstraintType to Ab…

d1a3f98

…stractScheduleType, MinConstraintType to MinSchedule, MaxConstraintType to MaxSchedule, and ScheduleConstraintType to EqualSchedule

Rename function build_constraint to build_schedule_constraint

0be0dc7

Include check for fixed_opex and non-negative vol_inflow for HydroRes…

82944d0

…ervoir

Rename max_power and max_flow functions and update documentation such…

6fadd61

… that it better aligns with code.

Add more constraint checks

396c38f

Per Aaslid and others added 2 commits November 21, 2024 15:12

Add example shown in documentation

6377c19

Updated NEWS.md and added comments

997df2b

JulStraus approved these changes Nov 22, 2024

View reviewed changes

JulStraus merged commit 73e6da6 into main Nov 22, 2024
5 checks passed

JulStraus mentioned this pull request Nov 22, 2024

Dev hydropower #24

Closed

JulStraus deleted the dev_hydro_rebase branch December 17, 2024 06:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add detailed hydro power model #35

Add detailed hydro power model #35

peraaslid commented Nov 19, 2024

JulStraus left a comment

JulStraus left a comment

peraaslid commented Nov 21, 2024

JulStraus left a comment

Add detailed hydro power model #35

Add detailed hydro power model #35

Conversation

peraaslid commented Nov 19, 2024

JulStraus left a comment

Choose a reason for hiding this comment

JulStraus left a comment

Choose a reason for hiding this comment

peraaslid commented Nov 21, 2024

JulStraus left a comment

Choose a reason for hiding this comment