Skip to content

Commit

Permalink
Merge pull request #21 from calliope-project/fix-hydropower-docs
Browse files Browse the repository at this point in the history
Fix documentation and license file omissions
  • Loading branch information
irm-codebase authored Aug 29, 2024
2 parents be0344d + bf6726a commit 5335965
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 26 deletions.
5 changes: 4 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ This does not necessarily list everyone who has contributed to ec_modules
code or documentation. For a full contributor list, see:
<https://github.com/calliope-project/ec_modules/graphs/contributors>

Ivan Ruiz Manuel, TU Delft <[email protected]>
- Ivan Ruiz Manuel, TU Delft <[email protected]>
- Stefan Pfenninger-Lee, TU Delft <[email protected]>
- Francesco Sanvito, TU Delft <[email protected]>
- Meijun Chen, TU Delft <[email protected]>
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 Calliope
Copyright (c) 2024 AUTHORS

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion modules/heat/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-2021 Tim Tröndle (ETH Zürich / IASS Potsdam), Bryn Pickering (ETH Zürich)
Copyright (c) 2018-2023 Bryn Pickering (ETH Zürich)
Copyright (c) 2024 AUTHORS

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
22 changes: 22 additions & 0 deletions modules/hydropower/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
MIT License

Copyright (c) 2018-2023 Tim Tröndle (ETH Zürich / IASS Potsdam), Bryn Pickering (ETH Zürich)
Copyright (c) 2024 AUTHORS

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
20 changes: 0 additions & 20 deletions modules/hydropower/LICENSE.md

This file was deleted.

17 changes: 15 additions & 2 deletions modules/hydropower/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Easy Hydropower data
# Module: Hydropower

Generate timeseries for hydropower plants in Europe.
A module to estimate hydropower capacity factors and powerplant capacities for arbitrary regions in Europe.

## Input-Output

Here is a brief summary of the IO structure of the module.

Users must specify a remote location of shapefile with the desired subregions in the configuration, which will be downloaded and processed into timeseries and capacity values by the module.

```mermaid
flowchart LR
Expand All @@ -11,3 +17,10 @@ flowchart LR
M --> O3(region-power-capacity.csv)
M --> O4(region-storage-capacity.csv)
```

## DAG

Here is a brief overview of the module's steps.
Please consult the code for more details.

![dag](rulegraph.png)
Binary file added modules/hydropower/rulegraph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion modules/transport_road/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MIT License

Copyright (c) 2021, Francesco Sanvito (TU Delft), Bryn Pickering (University of Cambridge), Adrien Mellot (ETH Zürich), Ivan Ruiz Manuel (TU Delft)
Copyright (c) 2021-2023 Bryn Pickering (ETH Zürich)
Copyright (c) 2024 AUTHORS and Adrien Mellot (ETH Zürich)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
20 changes: 20 additions & 0 deletions modules/transport_road/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,24 @@ A module to create transport demand for European Energy Models.
>For now, only electrified transport is fully supported.
>In the future, this module will instead follow a VKM approach that is more flexible.
## Input-Output

Here is a brief summary of the IO structure of the module.

Users must specify a remote location of shapefile with the desired subregions in the configuration, which will be downloaded and processed into timeseries and capacity values by the module.

```mermaid
flowchart LR
I1(shapefile.geojson) -.-> |Download| C
C(config.yaml) -->M((transport-road))
M --> O1(annual-charging-demand.csv)
M --> O2("controlled-ev-charging-timeseries.csv
uncontrolled-ev-charging-timeseries.csv")
```

## DAG

Here is a brief overview of the module's steps.
Please consult the code for more details.

![dag](rulegraph.png)

0 comments on commit 5335965

Please sign in to comment.