From 80fe2961e3fdcc96ab7cb8bc58a2f378d86844e3 Mon Sep 17 00:00:00 2001
From: Will Usher <wusher@kth.se>
Date: Mon, 9 Nov 2020 21:14:58 +0100
Subject: [PATCH] Updated simplicity to OSeMOSYS v1.0

---
 data/DiscountRate.csv   |  4 +--
 data/default_values.csv |  1 +
 datapackage.json        | 65 +++++++++++++++++++++++++++++++++++++++--
 3 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/data/DiscountRate.csv b/data/DiscountRate.csv
index 6ec3468..5d021eb 100644
--- a/data/DiscountRate.csv
+++ b/data/DiscountRate.csv
@@ -1,2 +1,2 @@
-REGION,VALUE
-SIMPLICITY,.05
+REGION,TECHNOLOGY,VALUE
+
diff --git a/data/default_values.csv b/data/default_values.csv
index 8d8ce42..cf899bc 100644
--- a/data/default_values.csv
+++ b/data/default_values.csv
@@ -15,6 +15,7 @@ DaysInDayType,7
 DaySplit,0.00137
 DepreciationMethod,1
 DiscountRate,0.05
+DiscountRateStorage,0.05
 EmissionActivityRatio,0
 EmissionsPenalty,0
 FixedCost,0
diff --git a/datapackage.json b/datapackage.json
index d8f4be3..8f297e6 100644
--- a/datapackage.json
+++ b/datapackage.json
@@ -335,6 +335,11 @@
                         "type": "string",
                         "format": "default"
                     },
+                    {
+                        "name": "TECHNOLOGY",
+                        "type": "string",
+                        "format": "default"
+                    },
                     {
                         "name": "VALUE",
                         "type": "number",
@@ -349,10 +354,66 @@
                             "resource": "REGION",
                             "fields": "VALUE"
                         }
+                    },
+                    {
+                        "fields": "TECHNOLOGY",
+                        "reference": {
+                            "resource": "TECHNOLOGY",
+                            "fields": "VALUE"
+                        }
                     }
                 ],
                 "primaryKey": [
-                    "REGION"
+                    "REGION",
+                    "TECHNOLOGY"
+                ]
+            }
+        },
+        {
+            "path": "data/DiscountRateStorage.csv",
+            "profile": "tabular-data-resource",
+            "name": "DiscountRateStorage",
+            "format": "csv",
+            "mediatype": "text/csv",
+            "encoding": "utf-8",
+            "schema": {
+                "fields": [
+                    {
+                        "name": "REGION",
+                        "type": "string",
+                        "format": "default"
+                    },
+                    {
+                        "name": "STORAGE",
+                        "type": "string",
+                        "format": "default"
+                    },
+                    {
+                        "name": "VALUE",
+                        "type": "number",
+                        "format": "default"
+                    }
+                ],
+                "missingValues": [""],
+                "foreignKeys": [
+                    {
+                        "fields": "REGION",
+                        "reference": {
+                            "resource": "REGION",
+                            "fields": "VALUE"
+                        }
+                    },
+                    {
+                        "fields": "STORAGE",
+                        "reference": {
+                            "resource": "STORAGE",
+                            "fields": "VALUE"
+                        }
+                    }
+                ],
+                "primaryKey": [
+                    "REGION",
+                    "STORAGE"
                 ]
             }
         },
@@ -2993,7 +3054,7 @@
                     },
                     {
                         "name": "VALUE",
-                        "type": "string",
+                        "type": "number",
                         "format": "default"
                     }
                 ],