Merge branch 'main' into custom-RM

KTH-dESA · Nov 29, 2022 · 1e83d32 · 1e83d32
2 parents 83294cb + 21be283
commit 1e83d32
Show file tree

Hide file tree

Showing 763 changed files with 621,066 additions and 677,734 deletions.
diff --git a/input_data/diagnostic_scen/diag-base/data/ATReserveMarginTagTechnology.csv b/input_data/diagnostic_scen/diag-base/data/ATReserveMarginTagTechnology.csv
diff --git a/input_data/diagnostic_scen/diag-base/data/BEReserveMarginTagTechnology.csv b/input_data/diagnostic_scen/diag-base/data/BEReserveMarginTagTechnology.csv
diff --git a/input_data/diagnostic_scen/diag-base/data/BGReserveMarginTagTechnology.csv b/input_data/diagnostic_scen/diag-base/data/BGReserveMarginTagTechnology.csv
diff --git a/input_data/diagnostic_scen/diag-base/data/CHReserveMarginTagTechnology.csv b/input_data/diagnostic_scen/diag-base/data/CHReserveMarginTagTechnology.csv
diff --git a/input_data/diagnostic_scen/diag-base/data/CYReserveMarginTagTechnology.csv b/input_data/diagnostic_scen/diag-base/data/CYReserveMarginTagTechnology.csv
diff --git a/input_data/diagnostic_scen/diag-base/data/CZReserveMarginTagTechnology.csv b/input_data/diagnostic_scen/diag-base/data/CZReserveMarginTagTechnology.csv
diff --git a/input_data/diagnostic_scen/diag-base/data/DEReserveMarginTagTechnology.csv b/input_data/diagnostic_scen/diag-base/data/DEReserveMarginTagTechnology.csv
diff --git a/input_data/diagnostic_scen/diag-base/data/DKReserveMarginTagTechnology.csv b/input_data/diagnostic_scen/diag-base/data/DKReserveMarginTagTechnology.csv
diff --git a/input_data/diagnostic_scen/diag-base/data/DiscountRate.csv b/input_data/diagnostic_scen/diag-base/data/DiscountRate.csv
@@ -1 +1 @@
-REGION,VALUE
+REGION,TECHNOLOGY,VALUE