add v2

ClimateCompatibleGrowth · May 7, 2024 · 4cb3de0 · 4cb3de0
1 parent ff86f85
commit 4cb3de0
Show file tree

Hide file tree

Showing 8 changed files with 31,912 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ This repository houses the OSeMOSYS Kenya Power System Model (PSM), developed wi
 | Version | Date    | DOI                                                                                                         | Description                                                                                   |
 |---------|---------|-------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
 | 1.0.0   | 09/2023 | [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11111018.svg)](https://doi.org/10.5281/zenodo.11111018) | First release of the model, LCPDP-CCG collaboration. |
+| 2.0.0   | 05/2024 | | Model Supply Region (MSR) implementation, LCPDP-CCG-WRI collaboration. |
 
 ### Citing OSeMOSYS-Kenya PSM 
 
@@ -29,17 +30,20 @@ BibTeX:
       url = {https://www.sciencedirect.com/science/article/pii/S2211467X24000191}
       }
 
+#### Version 2.0.0
+Upcoming.
+
 ### Acknowledgements
 This material has been produced with support from the Climate Compatible Growth (CCG) programme. CCG is funded by UK AID from the UK Government. Views expressed herein do not necessarily reflect the UK government's official policies.
 
 ### Licenses
 [![License: Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ClimateCompatibleGrowth/osemosys_kenya?tab=Apache-2.0-1-ov-file#readme)
 
-The model file located at ```psm/model_psm.txt``` is released under the Apache 2.0 license, and the copyright holders are listed in the author's list. The model has been developed starting from the original [OSeMOSYS modelling framework](https://github.com/OSeMOSYS/OSeMOSYS_GNU_MathProg?tab=readme-ov-file)<sup>1</sup>.
+The model files located at ```psm/v1_0_0/...``` and ```psm/v12_0_0/...``` are released under the Apache 2.0 license, and the copyright holders, per each version of the model, are listed in the author's list. The model has been developed starting from the original [OSeMOSYS modelling framework](https://github.com/OSeMOSYS/OSeMOSYS_GNU_MathProg?tab=readme-ov-file)<sup>1</sup>.
 
 [![License: CC BY 4.0](https://img.shields.io/badge/License-CC%20BY--4.0-lightgrey.svg)](https://creativecommons.org/licenses/by/4.0/)
 
-The data file located at ```psm/data_psm.txt``` is released under the [CC BY 4.0](https://creativecommons.org/licenses/by/4.0) license, and the copyright holders are listed in the author's list.
+The data files located at ```psm/v1_0_0/...``` and ```psm/v12_0_0/...``` are released under the [CC BY 4.0](https://creativecommons.org/licenses/by/4.0) license, and the copyright holders, per each version of the model, are listed in the author's list.
 
 ### References
 [1] Howells, Mark, et al. "OSeMOSYS: the open source energy modeling system: an introduction to its ethos, structure and development." Energy Policy 39.10 (2011): 5850-5870. https://doi.org/10.1016/j.enpol.2011.06.033
diff --git a/PSM/data_psm.txt → psm/v1_0_0/data_v1_0_0.txt b/PSM/data_psm.txt → psm/v1_0_0/data_v1_0_0.txt
diff --git a/PSM/model_psm.txt → psm/v1_0_0/model_v1_0_0.txt b/PSM/model_psm.txt → psm/v1_0_0/model_v1_0_0.txt
diff --git a/psm/v2_0_0/data_v2_0_0_sc1.txt b/psm/v2_0_0/data_v2_0_0_sc1.txt
diff --git a/psm/v2_0_0/data_v2_0_0_sc2.txt b/psm/v2_0_0/data_v2_0_0_sc2.txt
diff --git a/psm/v2_0_0/data_v2_0_0_sc3.txt b/psm/v2_0_0/data_v2_0_0_sc3.txt
diff --git a/psm/v2_0_0/data_v2_0_0_sc4.txt b/psm/v2_0_0/data_v2_0_0_sc4.txt
diff --git a/psm/v2_0_0/model_v2_0_0.txt b/psm/v2_0_0/model_v2_0_0.txt