Merge remote-tracking branch 'origin/master' into HydroCHiPPs

Author: MPavicevic

README.md

@@ -85,3 +85,21 @@ This command installs the package in "editable" mode (-e) using pyproject.toml t
 ![overview_pownet](./joss_submission/overview_pownet.png)
 
 
+# Citing this software
+If you use PowNet 2.0 in your work, please cite the following [JOSS article](https://joss.theoj.org/papers/10.21105/joss.08035):
+
+```
+@article{
+  Bunnak2025,
+  title = {PowNet 2.0: A production cost modeling framework for large-scale power systems},
+  author = {Bunnak, Phumthep and Eldardiry, Hisham and Pavičević, Matija and Feng, Jerry Zhuoer and Galelli, Stefano},
+  year = {2025},
+  publisher = {The Open Journal},
+  volume = {10},
+  number = {111},
+  pages = {8035},
+  journal = {Journal of Open Source Software}
+  doi = {10.21105/joss.08035},
+  url = {https://doi.org/10.21105/joss.08035},
+}
+```

docs/source/user_guide/input_files.rst

@@ -89,19 +89,19 @@ These files describe different components of the power system. While optional, y
         * ``sink_lon``, ``sink_lat``: Coordinates for the sink node (needed for map plotting).
 
 * ``hydropower.csv`` / ``hydropower_daily.csv``:
-    * **Description**: Hourly (``hydropower.csv``) or daily (``hydropower_daily.csv``) timeseries of maximum available hydropower generation (e.g., in MW) for each hydro unit. `Do not provide` both for the same unit.
+    * **Description**: Hourly (``hydropower.csv``) or daily (``hydropower_daily.csv``) timeseries of maximum available hydropower energy in MWh for each hydro unit. `Do not provide` both for the same unit.
     * **Format**: Uses a two-level column header. Level 1: Unit name. Level 2: Node name where the unit connects. Rows correspond to hours or days.
 
 * ``solar.csv``:
-    * **Description**: Hourly timeseries of maximum available solar power generation (e.g., in MW) for each solar unit.
+    * **Description**: Hourly timeseries of maximum available solar energy in MWh for each solar unit.
     * **Format**: Two-level column header (Level 1: Unit name, Level 2: Node name). Rows correspond to hours.
 
 * ``wind.csv``:
-    * **Description**: Hourly timeseries of maximum available wind power generation (e.g., in MW) for each wind unit.
+    * **Description**: Hourly timeseries of maximum available wind energy in MWh for each wind unit.
     * **Format**: Two-level column header (Level 1: Unit name, Level 2: Node name). Rows correspond to hours.
 
 * ``import.csv``:
-    * **Description**: Hourly timeseries of maximum available power import (e.g., in MW) for each import source/node.
+    * **Description**: Hourly timeseries of maximum available import energy in MWh for each import source/node.
     * **Format**: Two-level column header (Level 1: Source/Unit name, Level 2: Node name). Rows correspond to hours.
 
 Auto-Generated Inputs (by `PowNet`'s DataProcessor)

joss_submission/paper.bib

@@ -6,6 +6,7 @@ @article{garver1962threebin
   number={3},
   pages={730--734},
   year={1962},
+  doi={10.1109/aieepas.1962.4501405},
   publisher={IEEE}
 }
 @article{horsch2018linear,
@@ -15,6 +16,7 @@ @article{horsch2018linear
   volume={158},
   pages={126--135},
   year={2018},
+  doi={10.1016/j.epsr.2017.12.034},
   publisher={Elsevier}
 }
 @article{knueven2020mixed,
@@ -25,6 +27,7 @@ @article{knueven2020mixed
   number={4},
   pages={857--876},
   year={2020},
+  doi={10.1287/ijoc.2019.0944},
   publisher={INFORMS}
 }
 @article{koh2022hard,
@@ -34,6 +37,7 @@ @article{koh2022hard
   volume={321},
   pages={119386},
   year={2022},
+  doi={10.1016/j.apenergy.2022.119386},
   publisher={Elsevier}
 }
 @article{galelli2022opportunities,
@@ -44,6 +48,7 @@ @article{galelli2022opportunities
   number={12},
   pages={1058--1069},
   year={2022},
+  doi={10.1038/s41893-022-00971-z},
   publisher={Nature Publishing Group UK London}
 }
 @article{chowdhury2020expected,
@@ -54,6 +59,7 @@ @article{chowdhury2020expected
   number={10},
   pages={05020019},
   year={2020},
+  doi={10.1061/(ASCE)WR.1943-5452.0001279},
   publisher={American Society of Civil Engineers}
 }
 @article{chowdhury2021greater,
@@ -64,6 +70,7 @@ @article{chowdhury2021greater
   number={3},
   pages={e2020EF001814},
   year={2021},
+  doi={10.1029/2020EF001814},
   publisher={Wiley Online Library}
 }
 @article{arnold2024floating,
@@ -72,6 +79,7 @@ @article{arnold2024floating
   journal={Nature Energy},
   pages={1--10},
   year={2024},
+  doi={10.1038/s41560-024-01510-0},
   publisher={Nature Publishing Group UK London}
 }
 
@@ -89,6 +97,7 @@ @article{groissbock2019open
   volume={102},
   pages={234--248},
   year={2019},
+  doi={10.1016/j.rser.2018.11.020},
   publisher={Elsevier}
 }
 @article{hofmann2023linopy,
@@ -98,6 +107,7 @@ @article{hofmann2023linopy
   volume={8},
   number={84},
   pages={4823},
+  doi={10.21105/joss.04823},
   year={2023}
 }
 @article{chen2016improving,
@@ -108,6 +118,7 @@ @article{chen2016improving
   number={6},
   pages={4732--4743},
   year={2016},
+  doi={10.1109/TPWRS.2016.2530811},
   publisher={IEEE}
 }
 @article{su2020open,
@@ -117,6 +128,7 @@ @article{su2020open
   volume={126},
   pages={104667},
   year={2020},
+  doi={10.1016/j.envsoft.2020.104667},
   publisher={Elsevier}
 }
 @article{hoffmann2024review,
@@ -125,6 +137,7 @@ @article{hoffmann2024review
   journal={Advances in Applied Energy},
   pages={100190},
   year={2024},
+  doi={10.1016/j.adapen.2024.100190},
   publisher={Elsevier}
 }
 @article{tejada2019unit,
@@ -135,6 +148,7 @@ @article{tejada2019unit
   number={4},
   pages={2926--2936},
   year={2019},
+  doi={10.1109/TPWRS.2019.2962024},
   publisher={IEEE}
 }
 @article{oberle2019open,
@@ -144,6 +158,7 @@ @article{oberle2019open
   volume={26},
   pages={100396},
   year={2019},
+  doi={10.1016/j.esr.2019.100396},
   publisher={Elsevier}
 }
 @article{oikonomou2022core,
@@ -153,6 +168,7 @@ @article{oikonomou2022core
   volume={238},
   pages={122049},
   year={2022},
+  doi={10.1016/j.energy.2021.122049},
   publisher={Elsevier}
 }
 @article{chen2022security,
@@ -163,6 +179,7 @@ @article{chen2022security
   number={5},
   pages={4668--4681},
   year={2022},
+  doi={10.1109/TPWRS.2022.3213001},
   publisher={IEEE}
 }
 @article{chowdhury2020pownet,
@@ -176,8 +193,14 @@ @article{chowdhury2020pownet
 @misc{bunnak2024bridging,
   author = {Bunnak, Phumthep and Coniglio, Stefano and Galelli, Stefano},
   title = {Bridging Theory and Practice: Efficiently Solving the Unit Commitment Problem in Production Cost Models},
-  year = {2024},
-  note = {Available at SSRN 4918660}
+  journal={Energy},
+  volume={322},
+  number={5},
+  pages={135454},
+  year={2025},
+  doi={10.1016/j.energy.2025.135454},
+  publisher={Elsevier}
+}
 }
 @article{boyd2016power,
   title={Power Sector Modeling 101},
@@ -197,7 +220,8 @@ @article{parzen2022opt
   title={Optimization solvers: the missing link for a fully open-source energy system modelling ecosystem},
   author={Parzen, Maximilian and Hall, Julian and Jenkins, Jesse and Brown, Tom},
   journal={mars},
-  year={2022}
+  year={2022},
+  doi={10.5281/zenodo.12703174},
 }
 @article{wilkinson2016fair,
   title={{The FAIR Guiding Principles for scientific data management and stewardship}},
@@ -207,6 +231,7 @@ @article{wilkinson2016fair
   number={1},
   pages={1--9},
   year={2016},
+  doi={10.1038/sdata.2016.18},
   publisher={Nature Publishing Group}
 }
 @article{akdemir2024open,
@@ -217,6 +242,7 @@ @article{akdemir2024open
   number={1},
   pages={015003},
   year={2024},
+  doi={10.1088/2753-3751/ad1751},
   publisher={IOP Publishing}
 }
 @article{lara2021pcm,
@@ -226,11 +252,18 @@ @article{lara2021pcm
   volume={15},
   pages={100747},
   year={2021},
+  doi={10.1016/j.softx.2021.100747},
   publisher={Elsevier}
 }
 @article{brown2017pypsa,
   title={PyPSA: Python for power system analysis},
   author={Brown, Tom and H{\"o}rsch, Jonas and Schlachtberger, David},
-  journal={arXiv preprint arXiv:1707.09913},
-  year={2017}
+  journal = {Journal of Open Research Software},
+  volume = {6},
+  issue = {1},
+  number = {4},
+  year = {2018},
+  eprint = {1707.09913},
+  url = {https://doi.org/10.5334/jors.188},
+  doi = {10.5334/jors.188}
 }