updates zenodo wget and otoole version

OSeMOSYS · Apr 25, 2023 · 15f8d1c · 15f8d1c
1 parent 3ff463b
commit 15f8d1c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -13,16 +13,21 @@ the free and open-source solver [GLPK](https://www.gnu.org/software/glpk/)
 
 ```bash
 # Install the OSeMOSYS toolkit
-pip install otoole>=1.0.0
+pip install "otoole>=1.0.0"
 
 # Download the dataset. On Linux or OSX use wget, otherwise download and unzip
-wget https://zenodo.org/record/7736670/files/OSeMOSYS/simplicity-v1.0.zip?download=1
+wget https://zenodo.org/record/7736836/files/OSeMOSYS/simplicity-v1.1.zip?download=1
+unzip simplicity-v1.1.zip?download=1 -d simplicity
 
-unzip simplicity-v1.0 -d simplicity
+# Move the data to a new directory called simplicity/
+mv simplicity/OSeMOSYS-simplicity-74b9610/* simplicity
+rm -R simplicity/OSeMOSYS-simplicity-74b9610/
+
+# Change working directory to the new simplicity folder 
+cd simplicity 
 
 # Create the GNUMathProg data file with otoole
-mv simplicity/OSeMOSYS-simplicity-f0d3e83/* simplicity
-otoole convert csv datafile simplicity/data ./simplicity.txt simplicity/config.yaml
+otoole convert csv datafile data/ ./simplicity.txt config.yaml
 
 # Solve the model
 glpsol -m OSeMOSYS.txt -d simplicity.txt

diff --git a/data/DiscountRate.csv b/data/DiscountRate.csv
@@ -1,2 +1,2 @@
-REGION,TECHNOLOGY,VALUE
+REGION,VALUE
 
diff --git a/data/default_values.csv b/data/default_values.csv