Merge pull request #24 from willu47/will/environments

Review of workflow
KTH-dESA · Aug 29, 2022 · 26d3f71 · 26d3f71
2 parents 6cfbf93 + dd1d67a
commit 26d3f71
Show file tree

Hide file tree

Showing 1,516 changed files with 1,840 additions and 103 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,55 @@
+# Temporary and binary files
+*~
+*.py[cod]
+*.so
+*.cfg
+!.isort.cfg
+!setup.cfg
+*.orig
+*.log
+*.pot
+__pycache__/*
+.cache/*
+.*.swp
+*/.ipynb_checkpoints/*
+.DS_Store
+.ipynb_checkpoints/
+.snakemake
+
+# Project files
+.ropeproject
+.project
+.pydevproject
+.settings
+.idea
+tags
+.vscode
+
+# Package files
+*.egg
+*.eggs/
+.installed.cfg
+*.egg-info
+
+# Unittest and coverage
+htmlcov/*
+.coverage
+.tox
+junit.xml
+coverage.xml
+.pytest_cache/
+
+# Build and docs folder/files
+
+# Per-project virtualenvs
+.venv*/
+
+# Plots
+*.pdf
+
+# Temporary workflow files
+working_directory/*
+
+# Outputs
+results/*
+*.png
diff --git a/README.md b/README.md
@@ -1,35 +1,44 @@
 # OSeMBE_ECEMF
-This repository contains the scenarios modelled in OSeMBE throughout the H2020 project ECEMF -European Climate and Energy Modelling Forum. And the repo contains a workflow to run OSeMOSYS models from datapackage to results file in IAMC format.
-# OSeMOSYS workflow
-This workflow allows to run one or multiple scenarios. Starting from an OSeMOSYS datapackage going through all steps running the model with gurobi and producing the results in IAMC format.
 
-In addition to the standard OSeMOSYS outputs, the workflow can produce csvs containing the dual values for all constrains in the model.
+This repository contains the scenarios modelled in OSeMBE throughout the H2020 project ECEMF -
+European Climate and Energy Modelling Forum.
+
+The repo contains a workflow to run OSeMOSYS models from datapackage to results file in IAMC format.
+
+## OSeMOSYS workflow
+
+This workflow allows to run one or multiple scenarios.
+Starting from an OSeMOSYS datapackage going through all steps,
+running the model with the Gurobi solver and producing the results in IAMC format.
+
+In addition to the standard OSeMOSYS outputs, the workflow can produce CSV files containing the dual values for all constraints in the model.
+
+### Installation
 
-## Installation
 Install snakemake using conda into a new environment called `snakemake`:
+
 ```bash
 conda install -c conda-forge mamba
 mamba create -c bioconda -c conda-forge -n snakemake snakemake-minimal
 ```
-## Configuring the workflow
-### Input: 
 
-- datapackage(s)
+The workflow manages dependencies through conda environments.
+Dependencies are defined per rule and are installed upon first running the workflow.
 
-### Output:
+### Configuring the workflow
 
-- xlsx-files with model results in IAMC format
+3. Place the script `resultify.py` from the repo [osemosys2iamc](https://github.com/OSeMOSYS/osemosys2iamc/tree/osembe) in the root folder of the project.
 
-### Usage:
+### Adding new scenarios
+
+1. Place datapackage(s) in the folder `input_data`. Each datapackage should be placed in a folder
+that is named after the scenario, e.g. `baseline`.
+4. Check that the file `config.yaml`, which defines the conversion of OSeMOSYS results to IAMC format
+is suitable for the model.
+
+### Running the workflow
 
-1. Place datapackage(s) in the folder `data`. Each datapackage should be in a folder that is named after the scenario, e.g. `baseline`.
-2. Open the snakefile in a text-editor of your choice. Replace the scenario names potentially already in the list of `SCENARIOS` in line 1 with the names of your scenarios. The line should look similar to the below:
-```bash
-SCENARIOS = ['baseline', 'scenario1']`
-```
-3. Place the script `resultify.py` from the repo [osemosys2iamc](https://github.com/OSeMOSYS/osemosys2iamc/tree/osembe) in your folder.
-4. Make sure that the file `data/config.yaml`is suitable for your model. 
 3. ***Optional***: To retrieve dual values from your model you need to edit the list of `constraints` in the file `run.py`.
-4. Open terminal or command prompt in the directory of the snakefile.
+4. Open terminal or command prompt and change to the directory of the snakefile.
 5. ***Optional***: Perform a dry run to test snakemake with the command: `snakemake -n`
-5. Start the scenario runs with the command `snakemake --cores <number of cores to be used> --use-conda`
+5. Start the scenario runs with the command `snakemake --cores <number of cores to be used> --use-conda`
diff --git a/config/dp_files.txt b/config/dp_files.txt
@@ -0,0 +1,124 @@
+data/ATReserveMarginTagTechnology.csv
+data/AccumulatedAnnualDemand.csv
+data/AnnualEmissionLimit.csv
+data/AnnualExogenousEmission.csv
+data/AvailabilityFactor.csv
+data/BEReserveMarginTagTechnology.csv
+data/BGReserveMarginTagTechnology.csv
+data/CHReserveMarginTagTechnology.csv
+data/CYReserveMarginTagTechnology.csv
+data/CZReserveMarginTagTechnology.csv
+data/CapacityFactor.csv
+data/CapacityOfOneTechnologyUnit.csv
+data/CapacityToActivityUnit.csv
+data/CapitalCost.csv
+data/CapitalCostStorage.csv
+data/Conversionld.csv
+data/Conversionlh.csv
+data/Conversionls.csv
+data/DAILYTIMEBRACKET.csv
+data/DAYTYPE.csv
+data/DEReserveMarginTagTechnology.csv
+data/DKReserveMarginTagTechnology.csv
+data/DaySplit.csv
+data/DaysInDayType.csv
+data/DepreciationMethod.csv
+data/DiscountRate.csv
+data/DiscountRateStorage.csv
+data/EEReserveMarginTagTechnology.csv
+data/EMISSION.csv
+data/ESReserveMarginTagTechnology.csv
+data/EmissionActivityRatio.csv
+data/EmissionsPenalty.csv
+data/FIReserveMarginTagTechnology.csv
+data/FRReserveMarginTagTechnology.csv
+data/FUEL.csv
+data/FixedCost.csv
+data/GRReserveMarginTagTechnology.csv
+data/HRReserveMarginTagTechnology.csv
+data/HUReserveMarginTagTechnology.csv
+data/IEReserveMarginTagTechnology.csv
+data/ITReserveMarginTagTechnology.csv
+data/InputActivityRatio.csv
+data/LTReserveMarginTagTechnology.csv
+data/LUReserveMarginTagTechnology.csv
+data/LVReserveMarginTagTechnology.csv
+data/MODE_OF_OPERATION.csv
+data/MTReserveMarginTagTechnology.csv
+data/MinStorageCharge.csv
+data/ModelPeriodEmissionLimit.csv
+data/ModelPeriodExogenousEmission.csv
+data/NLReserveMarginTagTechnology.csv
+data/NOReserveMarginTagTechnology.csv
+data/OperationalLife.csv
+data/OperationalLifeStorage.csv
+data/OutputActivityRatio.csv
+data/PLReserveMarginTagTechnology.csv
+data/PTReserveMarginTagTechnology.csv
+data/REGION.csv
+data/REMinProductionTarget.csv
+data/RETagFuel.csv
+data/RETagTechnology.csv
+data/ROReserveMarginTagTechnology.csv
+data/ReserveMargin.csv
+data/ReserveMarginTagFuel.csv
+data/ResidualCapacity.csv
+data/ResidualStorageCapacity.csv
+data/SEASON.csv
+data/SEReserveMarginTagTechnology.csv
+data/SIReserveMarginTagTechnology.csv
+data/SKReserveMarginTagTechnology.csv
+data/STORAGE.csv
+data/SpecifiedAnnualDemand.csv
+data/SpecifiedDemandProfile.csv
+data/StorageLevelStart.csv
+data/StorageMaxChargeRate.csv
+data/StorageMaxDischargeRate.csv
+data/TECHNOLOGY.csv
+data/TIMESLICE.csv
+data/TechnologyFromStorage.csv
+data/TechnologyToStorage.csv
+data/TotalAnnualMaxCapacity.csv
+data/TotalAnnualMaxCapacityInvestment.csv
+data/TotalAnnualMinCapacity.csv
+data/TotalAnnualMinCapacityInvestment.csv
+data/TotalTechnologyAnnualActivityLowerLimit.csv
+data/TotalTechnologyAnnualActivityUpperLimit.csv
+data/TotalTechnologyModelPeriodActivityLowerLimit.csv
+data/TotalTechnologyModelPeriodActivityUpperLimit.csv
+data/TradeRoute.csv
+data/UKReserveMarginTagTechnology.csv
+data/VariableCost.csv
+data/YEAR.csv
+data/YearSplit.csv
+data/YearlyPeakAT.csv
+data/YearlyPeakBE.csv
+data/YearlyPeakBG.csv
+data/YearlyPeakCH.csv
+data/YearlyPeakCY.csv
+data/YearlyPeakCZ.csv
+data/YearlyPeakDE.csv
+data/YearlyPeakDK.csv
+data/YearlyPeakEE.csv
+data/YearlyPeakES.csv
+data/YearlyPeakFI.csv
+data/YearlyPeakFR.csv
+data/YearlyPeakGR.csv
+data/YearlyPeakHR.csv
+data/YearlyPeakHU.csv
+data/YearlyPeakIE.csv
+data/YearlyPeakIT.csv
+data/YearlyPeakLT.csv
+data/YearlyPeakLU.csv
+data/YearlyPeakLV.csv
+data/YearlyPeakMT.csv
+data/YearlyPeakNL.csv
+data/YearlyPeakNO.csv
+data/YearlyPeakPL.csv
+data/YearlyPeakPT.csv
+data/YearlyPeakRO.csv
+data/YearlyPeakSE.csv
+data/YearlyPeakSI.csv
+data/YearlyPeakSK.csv
+data/YearlyPeakUK.csv
+data/default_values.csv
diff --git a/envs/dag.yaml b/envs/dag.yaml
@@ -0,0 +1,4 @@
+channels:
+  - anaconda
+dependencies:
+  - graphviz
diff --git a/envs/openentrance_env.yaml b/envs/openentrance_env.yaml
@@ -9,5 +9,5 @@ dependencies:
 - pip:
   - pyam-iamc>=1.0
   - iam-units>=2021.11.12
-  - git+git://github.com/IAMconsortium/nomenclature.git
+  - nomenclature-iamc
   - git+https://github.com/openENTRANCE/openentrance.git@main#egg=openentrance
diff --git a/envs/otoole_env.yaml b/envs/otoole_env.yaml
@@ -9,4 +9,4 @@ dependencies:
 - xlrd
 - pip
 - pip:
-  - otoole
+  - git+https://github.com/HauHe/otoole.git@osembe#egg=otoole
diff --git a/gen_lp.py b/gen_lp.py
diff --git a/...ase/data/ATReserveMarginTagTechnology.csv → ...ase/data/ATReserveMarginTagTechnology.csv b/...ase/data/ATReserveMarginTagTechnology.csv → ...ase/data/ATReserveMarginTagTechnology.csv
diff --git a/...iag-base/data/AccumulatedAnnualDemand.csv → ...iag-base/data/AccumulatedAnnualDemand.csv b/...iag-base/data/AccumulatedAnnualDemand.csv → ...iag-base/data/AccumulatedAnnualDemand.csv
diff --git a/...en/diag-base/data/AnnualEmissionLimit.csv → ...ta/diag-base/data/AnnualEmissionLimit.csv b/...en/diag-base/data/AnnualEmissionLimit.csv → ...ta/diag-base/data/AnnualEmissionLimit.csv
diff --git a/...iag-base/data/AnnualExogenousEmission.csv → ...iag-base/data/AnnualExogenousEmission.csv b/...iag-base/data/AnnualExogenousEmission.csv → ...iag-base/data/AnnualExogenousEmission.csv
diff --git a/...cen/diag-base/data/AvailabilityFactor.csv → ...ata/diag-base/data/AvailabilityFactor.csv b/...cen/diag-base/data/AvailabilityFactor.csv → ...ata/diag-base/data/AvailabilityFactor.csv
diff --git a/...ase/data/BEReserveMarginTagTechnology.csv → ...ase/data/BEReserveMarginTagTechnology.csv b/...ase/data/BEReserveMarginTagTechnology.csv → ...ase/data/BEReserveMarginTagTechnology.csv
diff --git a/...ase/data/BGReserveMarginTagTechnology.csv → ...ase/data/BGReserveMarginTagTechnology.csv b/...ase/data/BGReserveMarginTagTechnology.csv → ...ase/data/BGReserveMarginTagTechnology.csv
diff --git a/...ase/data/CHReserveMarginTagTechnology.csv → ...ase/data/CHReserveMarginTagTechnology.csv b/...ase/data/CHReserveMarginTagTechnology.csv → ...ase/data/CHReserveMarginTagTechnology.csv
diff --git a/...ase/data/CYReserveMarginTagTechnology.csv → ...ase/data/CYReserveMarginTagTechnology.csv b/...ase/data/CYReserveMarginTagTechnology.csv → ...ase/data/CYReserveMarginTagTechnology.csv
diff --git a/...ase/data/CZReserveMarginTagTechnology.csv → ...ase/data/CZReserveMarginTagTechnology.csv b/...ase/data/CZReserveMarginTagTechnology.csv → ...ase/data/CZReserveMarginTagTechnology.csv
diff --git a/...ic_scen/diag-base/data/CapacityFactor.csv → input_data/diag-base/data/CapacityFactor.csv b/...ic_scen/diag-base/data/CapacityFactor.csv → input_data/diag-base/data/CapacityFactor.csv
diff --git a/...base/data/CapacityOfOneTechnologyUnit.csv → ...base/data/CapacityOfOneTechnologyUnit.csv b/...base/data/CapacityOfOneTechnologyUnit.csv → ...base/data/CapacityOfOneTechnologyUnit.csv
diff --git a/...diag-base/data/CapacityToActivityUnit.csv → ...diag-base/data/CapacityToActivityUnit.csv b/...diag-base/data/CapacityToActivityUnit.csv → ...diag-base/data/CapacityToActivityUnit.csv
diff --git a/...ostic_scen/diag-base/data/CapitalCost.csv → input_data/diag-base/data/CapitalCost.csv b/...ostic_scen/diag-base/data/CapitalCost.csv → input_data/diag-base/data/CapitalCost.csv
diff --git a/...cen/diag-base/data/CapitalCostStorage.csv → ...ata/diag-base/data/CapitalCostStorage.csv b/...cen/diag-base/data/CapitalCostStorage.csv → ...ata/diag-base/data/CapitalCostStorage.csv
diff --git a/...stic_scen/diag-base/data/Conversionld.csv → input_data/diag-base/data/Conversionld.csv b/...stic_scen/diag-base/data/Conversionld.csv → input_data/diag-base/data/Conversionld.csv
diff --git a/...stic_scen/diag-base/data/Conversionlh.csv → input_data/diag-base/data/Conversionlh.csv b/...stic_scen/diag-base/data/Conversionlh.csv → input_data/diag-base/data/Conversionlh.csv
diff --git a/...stic_scen/diag-base/data/Conversionls.csv → input_data/diag-base/data/Conversionls.csv b/...stic_scen/diag-base/data/Conversionls.csv → input_data/diag-base/data/Conversionls.csv
diff --git a/..._scen/diag-base/data/DAILYTIMEBRACKET.csv → ..._data/diag-base/data/DAILYTIMEBRACKET.csv b/..._scen/diag-base/data/DAILYTIMEBRACKET.csv → ..._data/diag-base/data/DAILYTIMEBRACKET.csv
diff --git a/...iagnostic_scen/diag-base/data/DAYTYPE.csv → input_data/diag-base/data/DAYTYPE.csv b/...iagnostic_scen/diag-base/data/DAYTYPE.csv → input_data/diag-base/data/DAYTYPE.csv
diff --git a/...ase/data/DEReserveMarginTagTechnology.csv → ...ase/data/DEReserveMarginTagTechnology.csv b/...ase/data/DEReserveMarginTagTechnology.csv → ...ase/data/DEReserveMarginTagTechnology.csv
diff --git a/...ase/data/DKReserveMarginTagTechnology.csv → ...ase/data/DKReserveMarginTagTechnology.csv b/...ase/data/DKReserveMarginTagTechnology.csv → ...ase/data/DKReserveMarginTagTechnology.csv
diff --git a/...agnostic_scen/diag-base/data/DaySplit.csv → input_data/diag-base/data/DaySplit.csv b/...agnostic_scen/diag-base/data/DaySplit.csv → input_data/diag-base/data/DaySplit.csv
diff --git a/...tic_scen/diag-base/data/DaysInDayType.csv → input_data/diag-base/data/DaysInDayType.csv b/...tic_scen/diag-base/data/DaysInDayType.csv → input_data/diag-base/data/DaysInDayType.csv
diff --git a/...cen/diag-base/data/DepreciationMethod.csv → ...ata/diag-base/data/DepreciationMethod.csv b/...cen/diag-base/data/DepreciationMethod.csv → ...ata/diag-base/data/DepreciationMethod.csv
diff --git a/...stic_scen/diag-base/data/DiscountRate.csv → input_data/diag-base/data/DiscountRate.csv b/...stic_scen/diag-base/data/DiscountRate.csv → input_data/diag-base/data/DiscountRate.csv
diff --git a/...en/diag-base/data/DiscountRateStorage.csv → ...ta/diag-base/data/DiscountRateStorage.csv b/...en/diag-base/data/DiscountRateStorage.csv → ...ta/diag-base/data/DiscountRateStorage.csv
diff --git a/...ase/data/EEReserveMarginTagTechnology.csv → ...ase/data/EEReserveMarginTagTechnology.csv b/...ase/data/EEReserveMarginTagTechnology.csv → ...ase/data/EEReserveMarginTagTechnology.csv
diff --git a/...agnostic_scen/diag-base/data/EMISSION.csv → input_data/diag-base/data/EMISSION.csv b/...agnostic_scen/diag-base/data/EMISSION.csv → input_data/diag-base/data/EMISSION.csv
diff --git a/...ase/data/ESReserveMarginTagTechnology.csv → ...ase/data/ESReserveMarginTagTechnology.csv b/...ase/data/ESReserveMarginTagTechnology.csv → ...ase/data/ESReserveMarginTagTechnology.csv
diff --git a/.../diag-base/data/EmissionActivityRatio.csv → .../diag-base/data/EmissionActivityRatio.csv b/.../diag-base/data/EmissionActivityRatio.csv → .../diag-base/data/EmissionActivityRatio.csv
diff --git a/..._scen/diag-base/data/EmissionsPenalty.csv → ..._data/diag-base/data/EmissionsPenalty.csv b/..._scen/diag-base/data/EmissionsPenalty.csv → ..._data/diag-base/data/EmissionsPenalty.csv
diff --git a/...ase/data/FIReserveMarginTagTechnology.csv → ...ase/data/FIReserveMarginTagTechnology.csv b/...ase/data/FIReserveMarginTagTechnology.csv → ...ase/data/FIReserveMarginTagTechnology.csv
diff --git a/...ase/data/FRReserveMarginTagTechnology.csv → ...ase/data/FRReserveMarginTagTechnology.csv b/...ase/data/FRReserveMarginTagTechnology.csv → ...ase/data/FRReserveMarginTagTechnology.csv
diff --git a/...a/diagnostic_scen/diag-base/data/FUEL.csv → input_data/diag-base/data/FUEL.csv b/...a/diagnostic_scen/diag-base/data/FUEL.csv → input_data/diag-base/data/FUEL.csv
diff --git a/...gnostic_scen/diag-base/data/FixedCost.csv → input_data/diag-base/data/FixedCost.csv b/...gnostic_scen/diag-base/data/FixedCost.csv → input_data/diag-base/data/FixedCost.csv
diff --git a/...ase/data/GRReserveMarginTagTechnology.csv → ...ase/data/GRReserveMarginTagTechnology.csv b/...ase/data/GRReserveMarginTagTechnology.csv → ...ase/data/GRReserveMarginTagTechnology.csv
diff --git a/...ase/data/HRReserveMarginTagTechnology.csv → ...ase/data/HRReserveMarginTagTechnology.csv b/...ase/data/HRReserveMarginTagTechnology.csv → ...ase/data/HRReserveMarginTagTechnology.csv
diff --git a/...ase/data/HUReserveMarginTagTechnology.csv → ...ase/data/HUReserveMarginTagTechnology.csv b/...ase/data/HUReserveMarginTagTechnology.csv → ...ase/data/HUReserveMarginTagTechnology.csv
diff --git a/...ase/data/IEReserveMarginTagTechnology.csv → ...ase/data/IEReserveMarginTagTechnology.csv b/...ase/data/IEReserveMarginTagTechnology.csv → ...ase/data/IEReserveMarginTagTechnology.csv
diff --git a/...ase/data/ITReserveMarginTagTechnology.csv → ...ase/data/ITReserveMarginTagTechnology.csv b/...ase/data/ITReserveMarginTagTechnology.csv → ...ase/data/ITReserveMarginTagTechnology.csv
diff --git a/...cen/diag-base/data/InputActivityRatio.csv → ...ata/diag-base/data/InputActivityRatio.csv b/...cen/diag-base/data/InputActivityRatio.csv → ...ata/diag-base/data/InputActivityRatio.csv
diff --git a/...ase/data/LTReserveMarginTagTechnology.csv → ...ase/data/LTReserveMarginTagTechnology.csv b/...ase/data/LTReserveMarginTagTechnology.csv → ...ase/data/LTReserveMarginTagTechnology.csv
diff --git a/...ase/data/LUReserveMarginTagTechnology.csv → ...ase/data/LUReserveMarginTagTechnology.csv b/...ase/data/LUReserveMarginTagTechnology.csv → ...ase/data/LUReserveMarginTagTechnology.csv
diff --git a/...ase/data/LVReserveMarginTagTechnology.csv → ...ase/data/LVReserveMarginTagTechnology.csv b/...ase/data/LVReserveMarginTagTechnology.csv → ...ase/data/LVReserveMarginTagTechnology.csv
diff --git a/...scen/diag-base/data/MODE_OF_OPERATION.csv → ...data/diag-base/data/MODE_OF_OPERATION.csv b/...scen/diag-base/data/MODE_OF_OPERATION.csv → ...data/diag-base/data/MODE_OF_OPERATION.csv
diff --git a/...ase/data/MTReserveMarginTagTechnology.csv → ...ase/data/MTReserveMarginTagTechnology.csv b/...ase/data/MTReserveMarginTagTechnology.csv → ...ase/data/MTReserveMarginTagTechnology.csv
diff --git a/..._scen/diag-base/data/MinStorageCharge.csv → ..._data/diag-base/data/MinStorageCharge.csv b/..._scen/diag-base/data/MinStorageCharge.csv → ..._data/diag-base/data/MinStorageCharge.csv
diff --git a/...ag-base/data/ModelPeriodEmissionLimit.csv → ...ag-base/data/ModelPeriodEmissionLimit.csv b/...ag-base/data/ModelPeriodEmissionLimit.csv → ...ag-base/data/ModelPeriodEmissionLimit.csv
diff --git a/...ase/data/ModelPeriodExogenousEmission.csv → ...ase/data/ModelPeriodExogenousEmission.csv b/...ase/data/ModelPeriodExogenousEmission.csv → ...ase/data/ModelPeriodExogenousEmission.csv
diff --git a/...ase/data/NLReserveMarginTagTechnology.csv → ...ase/data/NLReserveMarginTagTechnology.csv b/...ase/data/NLReserveMarginTagTechnology.csv → ...ase/data/NLReserveMarginTagTechnology.csv
diff --git a/...ase/data/NOReserveMarginTagTechnology.csv → ...ase/data/NOReserveMarginTagTechnology.csv b/...ase/data/NOReserveMarginTagTechnology.csv → ...ase/data/NOReserveMarginTagTechnology.csv
diff --git a/...c_scen/diag-base/data/OperationalLife.csv → ...t_data/diag-base/data/OperationalLife.csv b/...c_scen/diag-base/data/OperationalLife.csv → ...t_data/diag-base/data/OperationalLife.csv
diff --git a/...diag-base/data/OperationalLifeStorage.csv → ...diag-base/data/OperationalLifeStorage.csv b/...diag-base/data/OperationalLifeStorage.csv → ...diag-base/data/OperationalLifeStorage.csv
diff --git a/...en/diag-base/data/OutputActivityRatio.csv → ...ta/diag-base/data/OutputActivityRatio.csv b/...en/diag-base/data/OutputActivityRatio.csv → ...ta/diag-base/data/OutputActivityRatio.csv
diff --git a/...ase/data/PLReserveMarginTagTechnology.csv → ...ase/data/PLReserveMarginTagTechnology.csv b/...ase/data/PLReserveMarginTagTechnology.csv → ...ase/data/PLReserveMarginTagTechnology.csv
diff --git a/...ase/data/PTReserveMarginTagTechnology.csv → ...ase/data/PTReserveMarginTagTechnology.csv b/...ase/data/PTReserveMarginTagTechnology.csv → ...ase/data/PTReserveMarginTagTechnology.csv
diff --git a/...diagnostic_scen/diag-base/data/REGION.csv → input_data/diag-base/data/REGION.csv b/...diagnostic_scen/diag-base/data/REGION.csv → input_data/diag-base/data/REGION.csv
diff --git a/.../diag-base/data/REMinProductionTarget.csv → .../diag-base/data/REMinProductionTarget.csv b/.../diag-base/data/REMinProductionTarget.csv → .../diag-base/data/REMinProductionTarget.csv
diff --git a/...gnostic_scen/diag-base/data/RETagFuel.csv → input_data/diag-base/data/RETagFuel.csv b/...gnostic_scen/diag-base/data/RETagFuel.csv → input_data/diag-base/data/RETagFuel.csv
diff --git a/...c_scen/diag-base/data/RETagTechnology.csv → ...t_data/diag-base/data/RETagTechnology.csv b/...c_scen/diag-base/data/RETagTechnology.csv → ...t_data/diag-base/data/RETagTechnology.csv
diff --git a/...ase/data/ROReserveMarginTagTechnology.csv → ...ase/data/ROReserveMarginTagTechnology.csv b/...ase/data/ROReserveMarginTagTechnology.csv → ...ase/data/ROReserveMarginTagTechnology.csv
diff --git a/...tic_scen/diag-base/data/ReserveMargin.csv → input_data/diag-base/data/ReserveMargin.csv b/...tic_scen/diag-base/data/ReserveMargin.csv → input_data/diag-base/data/ReserveMargin.csv
diff --git a/...n/diag-base/data/ReserveMarginTagFuel.csv → ...a/diag-base/data/ReserveMarginTagFuel.csv b/...n/diag-base/data/ReserveMarginTagFuel.csv → ...a/diag-base/data/ReserveMarginTagFuel.csv
diff --git a/..._scen/diag-base/data/ResidualCapacity.csv → ..._data/diag-base/data/ResidualCapacity.csv b/..._scen/diag-base/data/ResidualCapacity.csv → ..._data/diag-base/data/ResidualCapacity.csv
diff --git a/...iag-base/data/ResidualStorageCapacity.csv → ...iag-base/data/ResidualStorageCapacity.csv b/...iag-base/data/ResidualStorageCapacity.csv → ...iag-base/data/ResidualStorageCapacity.csv
diff --git a/...diagnostic_scen/diag-base/data/SEASON.csv → input_data/diag-base/data/SEASON.csv b/...diagnostic_scen/diag-base/data/SEASON.csv → input_data/diag-base/data/SEASON.csv
diff --git a/...ase/data/SEReserveMarginTagTechnology.csv → ...ase/data/SEReserveMarginTagTechnology.csv b/...ase/data/SEReserveMarginTagTechnology.csv → ...ase/data/SEReserveMarginTagTechnology.csv
diff --git a/...ase/data/SIReserveMarginTagTechnology.csv → ...ase/data/SIReserveMarginTagTechnology.csv b/...ase/data/SIReserveMarginTagTechnology.csv → ...ase/data/SIReserveMarginTagTechnology.csv
diff --git a/...ase/data/SKReserveMarginTagTechnology.csv → ...ase/data/SKReserveMarginTagTechnology.csv b/...ase/data/SKReserveMarginTagTechnology.csv → ...ase/data/SKReserveMarginTagTechnology.csv
diff --git a/...iagnostic_scen/diag-base/data/STORAGE.csv → input_data/diag-base/data/STORAGE.csv b/...iagnostic_scen/diag-base/data/STORAGE.csv → input_data/diag-base/data/STORAGE.csv
diff --git a/.../diag-base/data/SpecifiedAnnualDemand.csv → .../diag-base/data/SpecifiedAnnualDemand.csv b/.../diag-base/data/SpecifiedAnnualDemand.csv → .../diag-base/data/SpecifiedAnnualDemand.csv
diff --git a/...diag-base/data/SpecifiedDemandProfile.csv → ...diag-base/data/SpecifiedDemandProfile.csv b/...diag-base/data/SpecifiedDemandProfile.csv → ...diag-base/data/SpecifiedDemandProfile.csv
diff --git a/...scen/diag-base/data/StorageLevelStart.csv → ...data/diag-base/data/StorageLevelStart.csv b/...scen/diag-base/data/StorageLevelStart.csv → ...data/diag-base/data/StorageLevelStart.csv
diff --git a/...n/diag-base/data/StorageMaxChargeRate.csv → ...a/diag-base/data/StorageMaxChargeRate.csv b/...n/diag-base/data/StorageMaxChargeRate.csv → ...a/diag-base/data/StorageMaxChargeRate.csv
diff --git a/...iag-base/data/StorageMaxDischargeRate.csv → ...iag-base/data/StorageMaxDischargeRate.csv b/...iag-base/data/StorageMaxDischargeRate.csv → ...iag-base/data/StorageMaxDischargeRate.csv
diff --git a/...nostic_scen/diag-base/data/TECHNOLOGY.csv → input_data/diag-base/data/TECHNOLOGY.csv b/...nostic_scen/diag-base/data/TECHNOLOGY.csv → input_data/diag-base/data/TECHNOLOGY.csv
diff --git a/...gnostic_scen/diag-base/data/TIMESLICE.csv → input_data/diag-base/data/TIMESLICE.csv b/...gnostic_scen/diag-base/data/TIMESLICE.csv → input_data/diag-base/data/TIMESLICE.csv
diff --git a/.../diag-base/data/TechnologyFromStorage.csv → .../diag-base/data/TechnologyFromStorage.csv b/.../diag-base/data/TechnologyFromStorage.csv → .../diag-base/data/TechnologyFromStorage.csv
diff --git a/...en/diag-base/data/TechnologyToStorage.csv → ...ta/diag-base/data/TechnologyToStorage.csv b/...en/diag-base/data/TechnologyToStorage.csv → ...ta/diag-base/data/TechnologyToStorage.csv
diff --git a/...diag-base/data/TotalAnnualMaxCapacity.csv → ...diag-base/data/TotalAnnualMaxCapacity.csv b/...diag-base/data/TotalAnnualMaxCapacity.csv → ...diag-base/data/TotalAnnualMaxCapacity.csv
diff --git a/...data/TotalAnnualMaxCapacityInvestment.csv → ...data/TotalAnnualMaxCapacityInvestment.csv b/...data/TotalAnnualMaxCapacityInvestment.csv → ...data/TotalAnnualMaxCapacityInvestment.csv
diff --git a/...diag-base/data/TotalAnnualMinCapacity.csv → ...diag-base/data/TotalAnnualMinCapacity.csv b/...diag-base/data/TotalAnnualMinCapacity.csv → ...diag-base/data/TotalAnnualMinCapacity.csv
diff --git a/...data/TotalAnnualMinCapacityInvestment.csv → ...data/TotalAnnualMinCapacityInvestment.csv b/...data/TotalAnnualMinCapacityInvestment.csv → ...data/TotalAnnualMinCapacityInvestment.csv
diff --git a/...talTechnologyAnnualActivityLowerLimit.csv → ...talTechnologyAnnualActivityLowerLimit.csv b/...talTechnologyAnnualActivityLowerLimit.csv → ...talTechnologyAnnualActivityLowerLimit.csv
diff --git a/...talTechnologyAnnualActivityUpperLimit.csv → ...talTechnologyAnnualActivityUpperLimit.csv b/...talTechnologyAnnualActivityUpperLimit.csv → ...talTechnologyAnnualActivityUpperLimit.csv
diff --git a/...chnologyModelPeriodActivityLowerLimit.csv → ...chnologyModelPeriodActivityLowerLimit.csv b/...chnologyModelPeriodActivityLowerLimit.csv → ...chnologyModelPeriodActivityLowerLimit.csv
diff --git a/...chnologyModelPeriodActivityUpperLimit.csv → ...chnologyModelPeriodActivityUpperLimit.csv b/...chnologyModelPeriodActivityUpperLimit.csv → ...chnologyModelPeriodActivityUpperLimit.csv
diff --git a/...nostic_scen/diag-base/data/TradeRoute.csv → input_data/diag-base/data/TradeRoute.csv b/...nostic_scen/diag-base/data/TradeRoute.csv → input_data/diag-base/data/TradeRoute.csv
diff --git a/...ase/data/UKReserveMarginTagTechnology.csv → ...ase/data/UKReserveMarginTagTechnology.csv b/...ase/data/UKReserveMarginTagTechnology.csv → ...ase/data/UKReserveMarginTagTechnology.csv
diff --git a/...stic_scen/diag-base/data/VariableCost.csv → input_data/diag-base/data/VariableCost.csv b/...stic_scen/diag-base/data/VariableCost.csv → input_data/diag-base/data/VariableCost.csv
diff --git a/...a/diagnostic_scen/diag-base/data/YEAR.csv → input_data/diag-base/data/YEAR.csv b/...a/diagnostic_scen/diag-base/data/YEAR.csv → input_data/diag-base/data/YEAR.csv
diff --git a/...gnostic_scen/diag-base/data/YearSplit.csv → input_data/diag-base/data/YearSplit.csv b/...gnostic_scen/diag-base/data/YearSplit.csv → input_data/diag-base/data/YearSplit.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakAT.csv → input_data/diag-base/data/YearlyPeakAT.csv b/...stic_scen/diag-base/data/YearlyPeakAT.csv → input_data/diag-base/data/YearlyPeakAT.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakBE.csv → input_data/diag-base/data/YearlyPeakBE.csv b/...stic_scen/diag-base/data/YearlyPeakBE.csv → input_data/diag-base/data/YearlyPeakBE.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakBG.csv → input_data/diag-base/data/YearlyPeakBG.csv b/...stic_scen/diag-base/data/YearlyPeakBG.csv → input_data/diag-base/data/YearlyPeakBG.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakCH.csv → input_data/diag-base/data/YearlyPeakCH.csv b/...stic_scen/diag-base/data/YearlyPeakCH.csv → input_data/diag-base/data/YearlyPeakCH.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakCY.csv → input_data/diag-base/data/YearlyPeakCY.csv b/...stic_scen/diag-base/data/YearlyPeakCY.csv → input_data/diag-base/data/YearlyPeakCY.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakCZ.csv → input_data/diag-base/data/YearlyPeakCZ.csv b/...stic_scen/diag-base/data/YearlyPeakCZ.csv → input_data/diag-base/data/YearlyPeakCZ.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakDE.csv → input_data/diag-base/data/YearlyPeakDE.csv b/...stic_scen/diag-base/data/YearlyPeakDE.csv → input_data/diag-base/data/YearlyPeakDE.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakDK.csv → input_data/diag-base/data/YearlyPeakDK.csv b/...stic_scen/diag-base/data/YearlyPeakDK.csv → input_data/diag-base/data/YearlyPeakDK.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakEE.csv → input_data/diag-base/data/YearlyPeakEE.csv b/...stic_scen/diag-base/data/YearlyPeakEE.csv → input_data/diag-base/data/YearlyPeakEE.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakES.csv → input_data/diag-base/data/YearlyPeakES.csv b/...stic_scen/diag-base/data/YearlyPeakES.csv → input_data/diag-base/data/YearlyPeakES.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakFI.csv → input_data/diag-base/data/YearlyPeakFI.csv b/...stic_scen/diag-base/data/YearlyPeakFI.csv → input_data/diag-base/data/YearlyPeakFI.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakFR.csv → input_data/diag-base/data/YearlyPeakFR.csv b/...stic_scen/diag-base/data/YearlyPeakFR.csv → input_data/diag-base/data/YearlyPeakFR.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakGR.csv → input_data/diag-base/data/YearlyPeakGR.csv b/...stic_scen/diag-base/data/YearlyPeakGR.csv → input_data/diag-base/data/YearlyPeakGR.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakHR.csv → input_data/diag-base/data/YearlyPeakHR.csv b/...stic_scen/diag-base/data/YearlyPeakHR.csv → input_data/diag-base/data/YearlyPeakHR.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakHU.csv → input_data/diag-base/data/YearlyPeakHU.csv b/...stic_scen/diag-base/data/YearlyPeakHU.csv → input_data/diag-base/data/YearlyPeakHU.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakIE.csv → input_data/diag-base/data/YearlyPeakIE.csv b/...stic_scen/diag-base/data/YearlyPeakIE.csv → input_data/diag-base/data/YearlyPeakIE.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakIT.csv → input_data/diag-base/data/YearlyPeakIT.csv b/...stic_scen/diag-base/data/YearlyPeakIT.csv → input_data/diag-base/data/YearlyPeakIT.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakLT.csv → input_data/diag-base/data/YearlyPeakLT.csv b/...stic_scen/diag-base/data/YearlyPeakLT.csv → input_data/diag-base/data/YearlyPeakLT.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakLU.csv → input_data/diag-base/data/YearlyPeakLU.csv b/...stic_scen/diag-base/data/YearlyPeakLU.csv → input_data/diag-base/data/YearlyPeakLU.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakLV.csv → input_data/diag-base/data/YearlyPeakLV.csv b/...stic_scen/diag-base/data/YearlyPeakLV.csv → input_data/diag-base/data/YearlyPeakLV.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakMT.csv → input_data/diag-base/data/YearlyPeakMT.csv b/...stic_scen/diag-base/data/YearlyPeakMT.csv → input_data/diag-base/data/YearlyPeakMT.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakNL.csv → input_data/diag-base/data/YearlyPeakNL.csv b/...stic_scen/diag-base/data/YearlyPeakNL.csv → input_data/diag-base/data/YearlyPeakNL.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakNO.csv → input_data/diag-base/data/YearlyPeakNO.csv b/...stic_scen/diag-base/data/YearlyPeakNO.csv → input_data/diag-base/data/YearlyPeakNO.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakPL.csv → input_data/diag-base/data/YearlyPeakPL.csv b/...stic_scen/diag-base/data/YearlyPeakPL.csv → input_data/diag-base/data/YearlyPeakPL.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakPT.csv → input_data/diag-base/data/YearlyPeakPT.csv b/...stic_scen/diag-base/data/YearlyPeakPT.csv → input_data/diag-base/data/YearlyPeakPT.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakRO.csv → input_data/diag-base/data/YearlyPeakRO.csv b/...stic_scen/diag-base/data/YearlyPeakRO.csv → input_data/diag-base/data/YearlyPeakRO.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakSE.csv → input_data/diag-base/data/YearlyPeakSE.csv b/...stic_scen/diag-base/data/YearlyPeakSE.csv → input_data/diag-base/data/YearlyPeakSE.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakSI.csv → input_data/diag-base/data/YearlyPeakSI.csv b/...stic_scen/diag-base/data/YearlyPeakSI.csv → input_data/diag-base/data/YearlyPeakSI.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakSK.csv → input_data/diag-base/data/YearlyPeakSK.csv b/...stic_scen/diag-base/data/YearlyPeakSK.csv → input_data/diag-base/data/YearlyPeakSK.csv
diff --git a/...stic_scen/diag-base/data/YearlyPeakUK.csv → input_data/diag-base/data/YearlyPeakUK.csv b/...stic_scen/diag-base/data/YearlyPeakUK.csv → input_data/diag-base/data/YearlyPeakUK.csv
diff --git a/...ic_scen/diag-base/data/default_values.csv → input_data/diag-base/data/default_values.csv b/...ic_scen/diag-base/data/default_values.csv → input_data/diag-base/data/default_values.csv
diff --git a/...iagnostic_scen/diag-base/datapackage.json → input_data/diag-base/datapackage.json b/...iagnostic_scen/diag-base/datapackage.json → input_data/diag-base/datapackage.json
diff --git a/...gr5/data/ATReserveMarginTagTechnology.csv → ...gr5/data/ATReserveMarginTagTechnology.csv b/...gr5/data/ATReserveMarginTagTechnology.csv → ...gr5/data/ATReserveMarginTagTechnology.csv
diff --git a/...to80-gr5/data/AccumulatedAnnualDemand.csv → ...to80-gr5/data/AccumulatedAnnualDemand.csv b/...to80-gr5/data/AccumulatedAnnualDemand.csv → ...to80-gr5/data/AccumulatedAnnualDemand.csv
diff --git a/...g-c0to80-gr5/data/AnnualEmissionLimit.csv → ...g-c0to80-gr5/data/AnnualEmissionLimit.csv b/...g-c0to80-gr5/data/AnnualEmissionLimit.csv → ...g-c0to80-gr5/data/AnnualEmissionLimit.csv
diff --git a/...to80-gr5/data/AnnualExogenousEmission.csv → ...to80-gr5/data/AnnualExogenousEmission.csv b/...to80-gr5/data/AnnualExogenousEmission.csv → ...to80-gr5/data/AnnualExogenousEmission.csv
diff --git a/...ag-c0to80-gr5/data/AvailabilityFactor.csv → ...ag-c0to80-gr5/data/AvailabilityFactor.csv b/...ag-c0to80-gr5/data/AvailabilityFactor.csv → ...ag-c0to80-gr5/data/AvailabilityFactor.csv
diff --git a/...gr5/data/BEReserveMarginTagTechnology.csv → ...gr5/data/BEReserveMarginTagTechnology.csv b/...gr5/data/BEReserveMarginTagTechnology.csv → ...gr5/data/BEReserveMarginTagTechnology.csv
diff --git a/...gr5/data/BGReserveMarginTagTechnology.csv → ...gr5/data/BGReserveMarginTagTechnology.csv b/...gr5/data/BGReserveMarginTagTechnology.csv → ...gr5/data/BGReserveMarginTagTechnology.csv
diff --git a/...gr5/data/CHReserveMarginTagTechnology.csv → ...gr5/data/CHReserveMarginTagTechnology.csv b/...gr5/data/CHReserveMarginTagTechnology.csv → ...gr5/data/CHReserveMarginTagTechnology.csv
diff --git a/...gr5/data/CYReserveMarginTagTechnology.csv → ...gr5/data/CYReserveMarginTagTechnology.csv b/...gr5/data/CYReserveMarginTagTechnology.csv → ...gr5/data/CYReserveMarginTagTechnology.csv
diff --git a/...gr5/data/CZReserveMarginTagTechnology.csv → ...gr5/data/CZReserveMarginTagTechnology.csv b/...gr5/data/CZReserveMarginTagTechnology.csv → ...gr5/data/CZReserveMarginTagTechnology.csv
diff --git a/...n/diag-c0to80-gr5/data/CapacityFactor.csv → ...a/diag-c0to80-gr5/data/CapacityFactor.csv b/...n/diag-c0to80-gr5/data/CapacityFactor.csv → ...a/diag-c0to80-gr5/data/CapacityFactor.csv
diff --git a/...-gr5/data/CapacityOfOneTechnologyUnit.csv → ...-gr5/data/CapacityOfOneTechnologyUnit.csv b/...-gr5/data/CapacityOfOneTechnologyUnit.csv → ...-gr5/data/CapacityOfOneTechnologyUnit.csv
diff --git a/...0to80-gr5/data/CapacityToActivityUnit.csv → ...0to80-gr5/data/CapacityToActivityUnit.csv b/...0to80-gr5/data/CapacityToActivityUnit.csv → ...0to80-gr5/data/CapacityToActivityUnit.csv
diff --git a/...scen/diag-c0to80-gr5/data/CapitalCost.csv → ...data/diag-c0to80-gr5/data/CapitalCost.csv b/...scen/diag-c0to80-gr5/data/CapitalCost.csv → ...data/diag-c0to80-gr5/data/CapitalCost.csv
diff --git a/...ag-c0to80-gr5/data/CapitalCostStorage.csv → ...ag-c0to80-gr5/data/CapitalCostStorage.csv b/...ag-c0to80-gr5/data/CapitalCostStorage.csv → ...ag-c0to80-gr5/data/CapitalCostStorage.csv
diff --git a/...cen/diag-c0to80-gr5/data/Conversionld.csv → ...ata/diag-c0to80-gr5/data/Conversionld.csv b/...cen/diag-c0to80-gr5/data/Conversionld.csv → ...ata/diag-c0to80-gr5/data/Conversionld.csv
diff --git a/...cen/diag-c0to80-gr5/data/Conversionlh.csv → ...ata/diag-c0to80-gr5/data/Conversionlh.csv b/...cen/diag-c0to80-gr5/data/Conversionlh.csv → ...ata/diag-c0to80-gr5/data/Conversionlh.csv
diff --git a/...cen/diag-c0to80-gr5/data/Conversionls.csv → ...ata/diag-c0to80-gr5/data/Conversionls.csv b/...cen/diag-c0to80-gr5/data/Conversionls.csv → ...ata/diag-c0to80-gr5/data/Conversionls.csv
diff --git a/...diag-c0to80-gr5/data/DAILYTIMEBRACKET.csv → ...diag-c0to80-gr5/data/DAILYTIMEBRACKET.csv b/...diag-c0to80-gr5/data/DAILYTIMEBRACKET.csv → ...diag-c0to80-gr5/data/DAILYTIMEBRACKET.csv
diff --git a/...tic_scen/diag-c0to80-gr5/data/DAYTYPE.csv → input_data/diag-c0to80-gr5/data/DAYTYPE.csv b/...tic_scen/diag-c0to80-gr5/data/DAYTYPE.csv → input_data/diag-c0to80-gr5/data/DAYTYPE.csv
diff --git a/...gr5/data/DEReserveMarginTagTechnology.csv → ...gr5/data/DEReserveMarginTagTechnology.csv b/...gr5/data/DEReserveMarginTagTechnology.csv → ...gr5/data/DEReserveMarginTagTechnology.csv
diff --git a/...gr5/data/DKReserveMarginTagTechnology.csv → ...gr5/data/DKReserveMarginTagTechnology.csv b/...gr5/data/DKReserveMarginTagTechnology.csv → ...gr5/data/DKReserveMarginTagTechnology.csv
diff --git a/...ic_scen/diag-c0to80-gr5/data/DaySplit.csv → input_data/diag-c0to80-gr5/data/DaySplit.csv b/...ic_scen/diag-c0to80-gr5/data/DaySplit.csv → input_data/diag-c0to80-gr5/data/DaySplit.csv
diff --git a/...en/diag-c0to80-gr5/data/DaysInDayType.csv → ...ta/diag-c0to80-gr5/data/DaysInDayType.csv b/...en/diag-c0to80-gr5/data/DaysInDayType.csv → ...ta/diag-c0to80-gr5/data/DaysInDayType.csv
diff --git a/...ag-c0to80-gr5/data/DepreciationMethod.csv → ...ag-c0to80-gr5/data/DepreciationMethod.csv b/...ag-c0to80-gr5/data/DepreciationMethod.csv → ...ag-c0to80-gr5/data/DepreciationMethod.csv
diff --git a/...cen/diag-c0to80-gr5/data/DiscountRate.csv → ...ata/diag-c0to80-gr5/data/DiscountRate.csv b/...cen/diag-c0to80-gr5/data/DiscountRate.csv → ...ata/diag-c0to80-gr5/data/DiscountRate.csv
diff --git a/...g-c0to80-gr5/data/DiscountRateStorage.csv → ...g-c0to80-gr5/data/DiscountRateStorage.csv b/...g-c0to80-gr5/data/DiscountRateStorage.csv → ...g-c0to80-gr5/data/DiscountRateStorage.csv
diff --git a/...gr5/data/EEReserveMarginTagTechnology.csv → ...gr5/data/EEReserveMarginTagTechnology.csv b/...gr5/data/EEReserveMarginTagTechnology.csv → ...gr5/data/EEReserveMarginTagTechnology.csv
diff --git a/...ic_scen/diag-c0to80-gr5/data/EMISSION.csv → input_data/diag-c0to80-gr5/data/EMISSION.csv b/...ic_scen/diag-c0to80-gr5/data/EMISSION.csv → input_data/diag-c0to80-gr5/data/EMISSION.csv
diff --git a/...gr5/data/ESReserveMarginTagTechnology.csv → ...gr5/data/ESReserveMarginTagTechnology.csv b/...gr5/data/ESReserveMarginTagTechnology.csv → ...gr5/data/ESReserveMarginTagTechnology.csv
diff --git a/...c0to80-gr5/data/EmissionActivityRatio.csv → ...c0to80-gr5/data/EmissionActivityRatio.csv b/...c0to80-gr5/data/EmissionActivityRatio.csv → ...c0to80-gr5/data/EmissionActivityRatio.csv
diff --git a/...diag-c0to80-gr5/data/EmissionsPenalty.csv → ...diag-c0to80-gr5/data/EmissionsPenalty.csv b/...diag-c0to80-gr5/data/EmissionsPenalty.csv → ...diag-c0to80-gr5/data/EmissionsPenalty.csv
diff --git a/...gr5/data/FIReserveMarginTagTechnology.csv → ...gr5/data/FIReserveMarginTagTechnology.csv b/...gr5/data/FIReserveMarginTagTechnology.csv → ...gr5/data/FIReserveMarginTagTechnology.csv
diff --git a/...gr5/data/FRReserveMarginTagTechnology.csv → ...gr5/data/FRReserveMarginTagTechnology.csv b/...gr5/data/FRReserveMarginTagTechnology.csv → ...gr5/data/FRReserveMarginTagTechnology.csv
diff --git a/...nostic_scen/diag-c0to80-gr5/data/FUEL.csv → input_data/diag-c0to80-gr5/data/FUEL.csv b/...nostic_scen/diag-c0to80-gr5/data/FUEL.csv → input_data/diag-c0to80-gr5/data/FUEL.csv
diff --git a/...c_scen/diag-c0to80-gr5/data/FixedCost.csv → ...t_data/diag-c0to80-gr5/data/FixedCost.csv b/...c_scen/diag-c0to80-gr5/data/FixedCost.csv → ...t_data/diag-c0to80-gr5/data/FixedCost.csv
diff --git a/...gr5/data/GRReserveMarginTagTechnology.csv → ...gr5/data/GRReserveMarginTagTechnology.csv b/...gr5/data/GRReserveMarginTagTechnology.csv → ...gr5/data/GRReserveMarginTagTechnology.csv
diff --git a/...gr5/data/HRReserveMarginTagTechnology.csv → ...gr5/data/HRReserveMarginTagTechnology.csv b/...gr5/data/HRReserveMarginTagTechnology.csv → ...gr5/data/HRReserveMarginTagTechnology.csv
diff --git a/...gr5/data/HUReserveMarginTagTechnology.csv → ...gr5/data/HUReserveMarginTagTechnology.csv b/...gr5/data/HUReserveMarginTagTechnology.csv → ...gr5/data/HUReserveMarginTagTechnology.csv
diff --git a/...gr5/data/IEReserveMarginTagTechnology.csv → ...gr5/data/IEReserveMarginTagTechnology.csv b/...gr5/data/IEReserveMarginTagTechnology.csv → ...gr5/data/IEReserveMarginTagTechnology.csv
diff --git a/...gr5/data/ITReserveMarginTagTechnology.csv → ...gr5/data/ITReserveMarginTagTechnology.csv b/...gr5/data/ITReserveMarginTagTechnology.csv → ...gr5/data/ITReserveMarginTagTechnology.csv
diff --git a/...ag-c0to80-gr5/data/InputActivityRatio.csv → ...ag-c0to80-gr5/data/InputActivityRatio.csv b/...ag-c0to80-gr5/data/InputActivityRatio.csv → ...ag-c0to80-gr5/data/InputActivityRatio.csv
diff --git a/...gr5/data/LTReserveMarginTagTechnology.csv → ...gr5/data/LTReserveMarginTagTechnology.csv b/...gr5/data/LTReserveMarginTagTechnology.csv → ...gr5/data/LTReserveMarginTagTechnology.csv
diff --git a/...gr5/data/LUReserveMarginTagTechnology.csv → ...gr5/data/LUReserveMarginTagTechnology.csv b/...gr5/data/LUReserveMarginTagTechnology.csv → ...gr5/data/LUReserveMarginTagTechnology.csv
diff --git a/...gr5/data/LVReserveMarginTagTechnology.csv → ...gr5/data/LVReserveMarginTagTechnology.csv b/...gr5/data/LVReserveMarginTagTechnology.csv → ...gr5/data/LVReserveMarginTagTechnology.csv
diff --git a/...iag-c0to80-gr5/data/MODE_OF_OPERATION.csv → ...iag-c0to80-gr5/data/MODE_OF_OPERATION.csv b/...iag-c0to80-gr5/data/MODE_OF_OPERATION.csv → ...iag-c0to80-gr5/data/MODE_OF_OPERATION.csv
diff --git a/...gr5/data/MTReserveMarginTagTechnology.csv → ...gr5/data/MTReserveMarginTagTechnology.csv b/...gr5/data/MTReserveMarginTagTechnology.csv → ...gr5/data/MTReserveMarginTagTechnology.csv
diff --git a/...diag-c0to80-gr5/data/MinStorageCharge.csv → ...diag-c0to80-gr5/data/MinStorageCharge.csv b/...diag-c0to80-gr5/data/MinStorageCharge.csv → ...diag-c0to80-gr5/data/MinStorageCharge.csv
diff --git a/...o80-gr5/data/ModelPeriodEmissionLimit.csv → ...o80-gr5/data/ModelPeriodEmissionLimit.csv b/...o80-gr5/data/ModelPeriodEmissionLimit.csv → ...o80-gr5/data/ModelPeriodEmissionLimit.csv
diff --git a/...gr5/data/ModelPeriodExogenousEmission.csv → ...gr5/data/ModelPeriodExogenousEmission.csv b/...gr5/data/ModelPeriodExogenousEmission.csv → ...gr5/data/ModelPeriodExogenousEmission.csv
diff --git a/...gr5/data/NLReserveMarginTagTechnology.csv → ...gr5/data/NLReserveMarginTagTechnology.csv b/...gr5/data/NLReserveMarginTagTechnology.csv → ...gr5/data/NLReserveMarginTagTechnology.csv
diff --git a/...gr5/data/NOReserveMarginTagTechnology.csv → ...gr5/data/NOReserveMarginTagTechnology.csv b/...gr5/data/NOReserveMarginTagTechnology.csv → ...gr5/data/NOReserveMarginTagTechnology.csv
diff --git a/.../diag-c0to80-gr5/data/OperationalLife.csv → .../diag-c0to80-gr5/data/OperationalLife.csv b/.../diag-c0to80-gr5/data/OperationalLife.csv → .../diag-c0to80-gr5/data/OperationalLife.csv
diff --git a/...0to80-gr5/data/OperationalLifeStorage.csv → ...0to80-gr5/data/OperationalLifeStorage.csv b/...0to80-gr5/data/OperationalLifeStorage.csv → ...0to80-gr5/data/OperationalLifeStorage.csv
diff --git a/...g-c0to80-gr5/data/OutputActivityRatio.csv → ...g-c0to80-gr5/data/OutputActivityRatio.csv b/...g-c0to80-gr5/data/OutputActivityRatio.csv → ...g-c0to80-gr5/data/OutputActivityRatio.csv
diff --git a/...gr5/data/PLReserveMarginTagTechnology.csv → ...gr5/data/PLReserveMarginTagTechnology.csv b/...gr5/data/PLReserveMarginTagTechnology.csv → ...gr5/data/PLReserveMarginTagTechnology.csv
diff --git a/...gr5/data/PTReserveMarginTagTechnology.csv → ...gr5/data/PTReserveMarginTagTechnology.csv b/...gr5/data/PTReserveMarginTagTechnology.csv → ...gr5/data/PTReserveMarginTagTechnology.csv
diff --git a/...stic_scen/diag-c0to80-gr5/data/REGION.csv → input_data/diag-c0to80-gr5/data/REGION.csv b/...stic_scen/diag-c0to80-gr5/data/REGION.csv → input_data/diag-c0to80-gr5/data/REGION.csv
diff --git a/...c0to80-gr5/data/REMinProductionTarget.csv → ...c0to80-gr5/data/REMinProductionTarget.csv b/...c0to80-gr5/data/REMinProductionTarget.csv → ...c0to80-gr5/data/REMinProductionTarget.csv
diff --git a/...c_scen/diag-c0to80-gr5/data/RETagFuel.csv → ...t_data/diag-c0to80-gr5/data/RETagFuel.csv b/...c_scen/diag-c0to80-gr5/data/RETagFuel.csv → ...t_data/diag-c0to80-gr5/data/RETagFuel.csv
diff --git a/.../diag-c0to80-gr5/data/RETagTechnology.csv → .../diag-c0to80-gr5/data/RETagTechnology.csv b/.../diag-c0to80-gr5/data/RETagTechnology.csv → .../diag-c0to80-gr5/data/RETagTechnology.csv
diff --git a/...gr5/data/ROReserveMarginTagTechnology.csv → ...gr5/data/ROReserveMarginTagTechnology.csv b/...gr5/data/ROReserveMarginTagTechnology.csv → ...gr5/data/ROReserveMarginTagTechnology.csv
diff --git a/...en/diag-c0to80-gr5/data/ReserveMargin.csv → ...ta/diag-c0to80-gr5/data/ReserveMargin.csv b/...en/diag-c0to80-gr5/data/ReserveMargin.csv → ...ta/diag-c0to80-gr5/data/ReserveMargin.csv
diff --git a/...-c0to80-gr5/data/ReserveMarginTagFuel.csv → ...-c0to80-gr5/data/ReserveMarginTagFuel.csv b/...-c0to80-gr5/data/ReserveMarginTagFuel.csv → ...-c0to80-gr5/data/ReserveMarginTagFuel.csv
diff --git a/...diag-c0to80-gr5/data/ResidualCapacity.csv → ...diag-c0to80-gr5/data/ResidualCapacity.csv b/...diag-c0to80-gr5/data/ResidualCapacity.csv → ...diag-c0to80-gr5/data/ResidualCapacity.csv
diff --git a/...to80-gr5/data/ResidualStorageCapacity.csv → ...to80-gr5/data/ResidualStorageCapacity.csv b/...to80-gr5/data/ResidualStorageCapacity.csv → ...to80-gr5/data/ResidualStorageCapacity.csv
diff --git a/...stic_scen/diag-c0to80-gr5/data/SEASON.csv → input_data/diag-c0to80-gr5/data/SEASON.csv b/...stic_scen/diag-c0to80-gr5/data/SEASON.csv → input_data/diag-c0to80-gr5/data/SEASON.csv
diff --git a/...gr5/data/SEReserveMarginTagTechnology.csv → ...gr5/data/SEReserveMarginTagTechnology.csv b/...gr5/data/SEReserveMarginTagTechnology.csv → ...gr5/data/SEReserveMarginTagTechnology.csv
diff --git a/...gr5/data/SIReserveMarginTagTechnology.csv → ...gr5/data/SIReserveMarginTagTechnology.csv b/...gr5/data/SIReserveMarginTagTechnology.csv → ...gr5/data/SIReserveMarginTagTechnology.csv
diff --git a/...gr5/data/SKReserveMarginTagTechnology.csv → ...gr5/data/SKReserveMarginTagTechnology.csv b/...gr5/data/SKReserveMarginTagTechnology.csv → ...gr5/data/SKReserveMarginTagTechnology.csv
diff --git a/...tic_scen/diag-c0to80-gr5/data/STORAGE.csv → input_data/diag-c0to80-gr5/data/STORAGE.csv b/...tic_scen/diag-c0to80-gr5/data/STORAGE.csv → input_data/diag-c0to80-gr5/data/STORAGE.csv
diff --git a/...c0to80-gr5/data/SpecifiedAnnualDemand.csv → ...c0to80-gr5/data/SpecifiedAnnualDemand.csv b/...c0to80-gr5/data/SpecifiedAnnualDemand.csv → ...c0to80-gr5/data/SpecifiedAnnualDemand.csv
diff --git a/...0to80-gr5/data/SpecifiedDemandProfile.csv → ...0to80-gr5/data/SpecifiedDemandProfile.csv b/...0to80-gr5/data/SpecifiedDemandProfile.csv → ...0to80-gr5/data/SpecifiedDemandProfile.csv
diff --git a/...iag-c0to80-gr5/data/StorageLevelStart.csv → ...iag-c0to80-gr5/data/StorageLevelStart.csv b/...iag-c0to80-gr5/data/StorageLevelStart.csv → ...iag-c0to80-gr5/data/StorageLevelStart.csv
diff --git a/...-c0to80-gr5/data/StorageMaxChargeRate.csv → ...-c0to80-gr5/data/StorageMaxChargeRate.csv b/...-c0to80-gr5/data/StorageMaxChargeRate.csv → ...-c0to80-gr5/data/StorageMaxChargeRate.csv
diff --git a/...to80-gr5/data/StorageMaxDischargeRate.csv → ...to80-gr5/data/StorageMaxDischargeRate.csv b/...to80-gr5/data/StorageMaxDischargeRate.csv → ...to80-gr5/data/StorageMaxDischargeRate.csv
diff --git a/..._scen/diag-c0to80-gr5/data/TECHNOLOGY.csv → ..._data/diag-c0to80-gr5/data/TECHNOLOGY.csv b/..._scen/diag-c0to80-gr5/data/TECHNOLOGY.csv → ..._data/diag-c0to80-gr5/data/TECHNOLOGY.csv
diff --git a/...c_scen/diag-c0to80-gr5/data/TIMESLICE.csv → ...t_data/diag-c0to80-gr5/data/TIMESLICE.csv b/...c_scen/diag-c0to80-gr5/data/TIMESLICE.csv → ...t_data/diag-c0to80-gr5/data/TIMESLICE.csv
diff --git a/...c0to80-gr5/data/TechnologyFromStorage.csv → ...c0to80-gr5/data/TechnologyFromStorage.csv b/...c0to80-gr5/data/TechnologyFromStorage.csv → ...c0to80-gr5/data/TechnologyFromStorage.csv
diff --git a/...g-c0to80-gr5/data/TechnologyToStorage.csv → ...g-c0to80-gr5/data/TechnologyToStorage.csv b/...g-c0to80-gr5/data/TechnologyToStorage.csv → ...g-c0to80-gr5/data/TechnologyToStorage.csv
diff --git a/...0to80-gr5/data/TotalAnnualMaxCapacity.csv → ...0to80-gr5/data/TotalAnnualMaxCapacity.csv b/...0to80-gr5/data/TotalAnnualMaxCapacity.csv → ...0to80-gr5/data/TotalAnnualMaxCapacity.csv
diff --git a/...data/TotalAnnualMaxCapacityInvestment.csv → ...data/TotalAnnualMaxCapacityInvestment.csv b/...data/TotalAnnualMaxCapacityInvestment.csv → ...data/TotalAnnualMaxCapacityInvestment.csv
diff --git a/...0to80-gr5/data/TotalAnnualMinCapacity.csv → ...0to80-gr5/data/TotalAnnualMinCapacity.csv b/...0to80-gr5/data/TotalAnnualMinCapacity.csv → ...0to80-gr5/data/TotalAnnualMinCapacity.csv
diff --git a/...data/TotalAnnualMinCapacityInvestment.csv → ...data/TotalAnnualMinCapacityInvestment.csv b/...data/TotalAnnualMinCapacityInvestment.csv → ...data/TotalAnnualMinCapacityInvestment.csv
diff --git a/...talTechnologyAnnualActivityLowerLimit.csv → ...talTechnologyAnnualActivityLowerLimit.csv b/...talTechnologyAnnualActivityLowerLimit.csv → ...talTechnologyAnnualActivityLowerLimit.csv
diff --git a/...talTechnologyAnnualActivityUpperLimit.csv → ...talTechnologyAnnualActivityUpperLimit.csv b/...talTechnologyAnnualActivityUpperLimit.csv → ...talTechnologyAnnualActivityUpperLimit.csv
diff --git a/...chnologyModelPeriodActivityLowerLimit.csv → ...chnologyModelPeriodActivityLowerLimit.csv b/...chnologyModelPeriodActivityLowerLimit.csv → ...chnologyModelPeriodActivityLowerLimit.csv
diff --git a/...chnologyModelPeriodActivityUpperLimit.csv → ...chnologyModelPeriodActivityUpperLimit.csv b/...chnologyModelPeriodActivityUpperLimit.csv → ...chnologyModelPeriodActivityUpperLimit.csv
diff --git a/..._scen/diag-c0to80-gr5/data/TradeRoute.csv → ..._data/diag-c0to80-gr5/data/TradeRoute.csv b/..._scen/diag-c0to80-gr5/data/TradeRoute.csv → ..._data/diag-c0to80-gr5/data/TradeRoute.csv
diff --git a/...gr5/data/UKReserveMarginTagTechnology.csv → ...gr5/data/UKReserveMarginTagTechnology.csv b/...gr5/data/UKReserveMarginTagTechnology.csv → ...gr5/data/UKReserveMarginTagTechnology.csv
diff --git a/...cen/diag-c0to80-gr5/data/VariableCost.csv → ...ata/diag-c0to80-gr5/data/VariableCost.csv b/...cen/diag-c0to80-gr5/data/VariableCost.csv → ...ata/diag-c0to80-gr5/data/VariableCost.csv
diff --git a/...nostic_scen/diag-c0to80-gr5/data/YEAR.csv → input_data/diag-c0to80-gr5/data/YEAR.csv b/...nostic_scen/diag-c0to80-gr5/data/YEAR.csv → input_data/diag-c0to80-gr5/data/YEAR.csv
diff --git a/...c_scen/diag-c0to80-gr5/data/YearSplit.csv → ...t_data/diag-c0to80-gr5/data/YearSplit.csv b/...c_scen/diag-c0to80-gr5/data/YearSplit.csv → ...t_data/diag-c0to80-gr5/data/YearSplit.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakAT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakAT.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakAT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakAT.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakBE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakBE.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakBE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakBE.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakBG.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakBG.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakBG.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakBG.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakCH.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakCH.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakCH.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakCH.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakCY.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakCY.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakCY.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakCY.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakCZ.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakCZ.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakCZ.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakCZ.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakDE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakDE.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakDE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakDE.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakDK.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakDK.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakDK.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakDK.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakEE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakEE.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakEE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakEE.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakES.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakES.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakES.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakES.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakFI.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakFI.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakFI.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakFI.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakFR.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakFR.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakFR.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakFR.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakGR.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakGR.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakGR.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakGR.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakHR.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakHR.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakHR.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakHR.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakHU.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakHU.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakHU.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakHU.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakIE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakIE.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakIE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakIE.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakIT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakIT.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakIT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakIT.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakLT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakLT.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakLT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakLT.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakLU.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakLU.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakLU.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakLU.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakLV.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakLV.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakLV.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakLV.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakMT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakMT.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakMT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakMT.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakNL.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakNL.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakNL.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakNL.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakNO.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakNO.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakNO.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakNO.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakPL.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakPL.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakPL.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakPL.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakPT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakPT.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakPT.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakPT.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakRO.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakRO.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakRO.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakRO.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakSE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakSE.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakSE.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakSE.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakSI.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakSI.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakSI.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakSI.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakSK.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakSK.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakSK.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakSK.csv
diff --git a/...cen/diag-c0to80-gr5/data/YearlyPeakUK.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakUK.csv b/...cen/diag-c0to80-gr5/data/YearlyPeakUK.csv → ...ata/diag-c0to80-gr5/data/YearlyPeakUK.csv
diff --git a/...n/diag-c0to80-gr5/data/default_values.csv → ...a/diag-c0to80-gr5/data/default_values.csv b/...n/diag-c0to80-gr5/data/default_values.csv → ...a/diag-c0to80-gr5/data/default_values.csv
diff --git a/...tic_scen/diag-c0to80-gr5/datapackage.json → input_data/diag-c0to80-gr5/datapackage.json b/...tic_scen/diag-c0to80-gr5/datapackage.json → input_data/diag-c0to80-gr5/datapackage.json
diff --git a/...bio/data/ATReserveMarginTagTechnology.csv → ...bio/data/ATReserveMarginTagTechnology.csv b/...bio/data/ATReserveMarginTagTechnology.csv → ...bio/data/ATReserveMarginTagTechnology.csv
diff --git a/...0-limbio/data/AccumulatedAnnualDemand.csv → ...0-limbio/data/AccumulatedAnnualDemand.csv b/...0-limbio/data/AccumulatedAnnualDemand.csv → ...0-limbio/data/AccumulatedAnnualDemand.csv
diff --git a/...-c400-limbio/data/AnnualEmissionLimit.csv → ...-c400-limbio/data/AnnualEmissionLimit.csv b/...-c400-limbio/data/AnnualEmissionLimit.csv → ...-c400-limbio/data/AnnualEmissionLimit.csv
diff --git a/...0-limbio/data/AnnualExogenousEmission.csv → ...0-limbio/data/AnnualExogenousEmission.csv b/...0-limbio/data/AnnualExogenousEmission.csv → ...0-limbio/data/AnnualExogenousEmission.csv
diff --git a/...g-c400-limbio/data/AvailabilityFactor.csv → ...g-c400-limbio/data/AvailabilityFactor.csv b/...g-c400-limbio/data/AvailabilityFactor.csv → ...g-c400-limbio/data/AvailabilityFactor.csv
diff --git a/...bio/data/BEReserveMarginTagTechnology.csv → ...bio/data/BEReserveMarginTagTechnology.csv b/...bio/data/BEReserveMarginTagTechnology.csv → ...bio/data/BEReserveMarginTagTechnology.csv
diff --git a/...bio/data/BGReserveMarginTagTechnology.csv → ...bio/data/BGReserveMarginTagTechnology.csv b/...bio/data/BGReserveMarginTagTechnology.csv → ...bio/data/BGReserveMarginTagTechnology.csv
diff --git a/...bio/data/CHReserveMarginTagTechnology.csv → ...bio/data/CHReserveMarginTagTechnology.csv b/...bio/data/CHReserveMarginTagTechnology.csv → ...bio/data/CHReserveMarginTagTechnology.csv
diff --git a/...bio/data/CYReserveMarginTagTechnology.csv → ...bio/data/CYReserveMarginTagTechnology.csv b/...bio/data/CYReserveMarginTagTechnology.csv → ...bio/data/CYReserveMarginTagTechnology.csv
diff --git a/...bio/data/CZReserveMarginTagTechnology.csv → ...bio/data/CZReserveMarginTagTechnology.csv b/...bio/data/CZReserveMarginTagTechnology.csv → ...bio/data/CZReserveMarginTagTechnology.csv
diff --git a/.../diag-c400-limbio/data/CapacityFactor.csv → .../diag-c400-limbio/data/CapacityFactor.csv b/.../diag-c400-limbio/data/CapacityFactor.csv → .../diag-c400-limbio/data/CapacityFactor.csv
diff --git a/...mbio/data/CapacityOfOneTechnologyUnit.csv → ...mbio/data/CapacityOfOneTechnologyUnit.csv b/...mbio/data/CapacityOfOneTechnologyUnit.csv → ...mbio/data/CapacityOfOneTechnologyUnit.csv
diff --git a/...00-limbio/data/CapacityToActivityUnit.csv → ...00-limbio/data/CapacityToActivityUnit.csv b/...00-limbio/data/CapacityToActivityUnit.csv → ...00-limbio/data/CapacityToActivityUnit.csv
diff --git a/...cen/diag-c400-limbio/data/CapitalCost.csv → ...ata/diag-c400-limbio/data/CapitalCost.csv b/...cen/diag-c400-limbio/data/CapitalCost.csv → ...ata/diag-c400-limbio/data/CapitalCost.csv
diff --git a/...g-c400-limbio/data/CapitalCostStorage.csv → ...g-c400-limbio/data/CapitalCostStorage.csv b/...g-c400-limbio/data/CapitalCostStorage.csv → ...g-c400-limbio/data/CapitalCostStorage.csv
diff --git a/...en/diag-c400-limbio/data/Conversionld.csv → ...ta/diag-c400-limbio/data/Conversionld.csv b/...en/diag-c400-limbio/data/Conversionld.csv → ...ta/diag-c400-limbio/data/Conversionld.csv
diff --git a/...en/diag-c400-limbio/data/Conversionlh.csv → ...ta/diag-c400-limbio/data/Conversionlh.csv b/...en/diag-c400-limbio/data/Conversionlh.csv → ...ta/diag-c400-limbio/data/Conversionlh.csv
diff --git a/...en/diag-c400-limbio/data/Conversionls.csv → ...ta/diag-c400-limbio/data/Conversionls.csv b/...en/diag-c400-limbio/data/Conversionls.csv → ...ta/diag-c400-limbio/data/Conversionls.csv
diff --git a/...iag-c400-limbio/data/DAILYTIMEBRACKET.csv → ...iag-c400-limbio/data/DAILYTIMEBRACKET.csv b/...iag-c400-limbio/data/DAILYTIMEBRACKET.csv → ...iag-c400-limbio/data/DAILYTIMEBRACKET.csv
diff --git a/...ic_scen/diag-c400-limbio/data/DAYTYPE.csv → input_data/diag-c400-limbio/data/DAYTYPE.csv b/...ic_scen/diag-c400-limbio/data/DAYTYPE.csv → input_data/diag-c400-limbio/data/DAYTYPE.csv
diff --git a/...bio/data/DEReserveMarginTagTechnology.csv → ...bio/data/DEReserveMarginTagTechnology.csv b/...bio/data/DEReserveMarginTagTechnology.csv → ...bio/data/DEReserveMarginTagTechnology.csv
diff --git a/...bio/data/DKReserveMarginTagTechnology.csv → ...bio/data/DKReserveMarginTagTechnology.csv b/...bio/data/DKReserveMarginTagTechnology.csv → ...bio/data/DKReserveMarginTagTechnology.csv
diff --git a/...c_scen/diag-c400-limbio/data/DaySplit.csv → ...t_data/diag-c400-limbio/data/DaySplit.csv b/...c_scen/diag-c400-limbio/data/DaySplit.csv → ...t_data/diag-c400-limbio/data/DaySplit.csv
diff --git a/...n/diag-c400-limbio/data/DaysInDayType.csv → ...a/diag-c400-limbio/data/DaysInDayType.csv b/...n/diag-c400-limbio/data/DaysInDayType.csv → ...a/diag-c400-limbio/data/DaysInDayType.csv
diff --git a/...g-c400-limbio/data/DepreciationMethod.csv → ...g-c400-limbio/data/DepreciationMethod.csv b/...g-c400-limbio/data/DepreciationMethod.csv → ...g-c400-limbio/data/DepreciationMethod.csv
diff --git a/...en/diag-c400-limbio/data/DiscountRate.csv → ...ta/diag-c400-limbio/data/DiscountRate.csv b/...en/diag-c400-limbio/data/DiscountRate.csv → ...ta/diag-c400-limbio/data/DiscountRate.csv
diff --git a/...-c400-limbio/data/DiscountRateStorage.csv → ...-c400-limbio/data/DiscountRateStorage.csv b/...-c400-limbio/data/DiscountRateStorage.csv → ...-c400-limbio/data/DiscountRateStorage.csv
diff --git a/...bio/data/EEReserveMarginTagTechnology.csv → ...bio/data/EEReserveMarginTagTechnology.csv b/...bio/data/EEReserveMarginTagTechnology.csv → ...bio/data/EEReserveMarginTagTechnology.csv
diff --git a/...c_scen/diag-c400-limbio/data/EMISSION.csv → ...t_data/diag-c400-limbio/data/EMISSION.csv b/...c_scen/diag-c400-limbio/data/EMISSION.csv → ...t_data/diag-c400-limbio/data/EMISSION.csv
diff --git a/...bio/data/ESReserveMarginTagTechnology.csv → ...bio/data/ESReserveMarginTagTechnology.csv b/...bio/data/ESReserveMarginTagTechnology.csv → ...bio/data/ESReserveMarginTagTechnology.csv
diff --git a/...400-limbio/data/EmissionActivityRatio.csv → ...400-limbio/data/EmissionActivityRatio.csv b/...400-limbio/data/EmissionActivityRatio.csv → ...400-limbio/data/EmissionActivityRatio.csv
diff --git a/...iag-c400-limbio/data/EmissionsPenalty.csv → ...iag-c400-limbio/data/EmissionsPenalty.csv b/...iag-c400-limbio/data/EmissionsPenalty.csv → ...iag-c400-limbio/data/EmissionsPenalty.csv
diff --git a/...bio/data/FIReserveMarginTagTechnology.csv → ...bio/data/FIReserveMarginTagTechnology.csv b/...bio/data/FIReserveMarginTagTechnology.csv → ...bio/data/FIReserveMarginTagTechnology.csv
diff --git a/...bio/data/FRReserveMarginTagTechnology.csv → ...bio/data/FRReserveMarginTagTechnology.csv b/...bio/data/FRReserveMarginTagTechnology.csv → ...bio/data/FRReserveMarginTagTechnology.csv
diff --git a/...ostic_scen/diag-c400-limbio/data/FUEL.csv → input_data/diag-c400-limbio/data/FUEL.csv b/...ostic_scen/diag-c400-limbio/data/FUEL.csv → input_data/diag-c400-limbio/data/FUEL.csv
diff --git a/..._scen/diag-c400-limbio/data/FixedCost.csv → ..._data/diag-c400-limbio/data/FixedCost.csv b/..._scen/diag-c400-limbio/data/FixedCost.csv → ..._data/diag-c400-limbio/data/FixedCost.csv
diff --git a/...bio/data/GRReserveMarginTagTechnology.csv → ...bio/data/GRReserveMarginTagTechnology.csv b/...bio/data/GRReserveMarginTagTechnology.csv → ...bio/data/GRReserveMarginTagTechnology.csv
diff --git a/...bio/data/HRReserveMarginTagTechnology.csv → ...bio/data/HRReserveMarginTagTechnology.csv b/...bio/data/HRReserveMarginTagTechnology.csv → ...bio/data/HRReserveMarginTagTechnology.csv
diff --git a/...bio/data/HUReserveMarginTagTechnology.csv → ...bio/data/HUReserveMarginTagTechnology.csv b/...bio/data/HUReserveMarginTagTechnology.csv → ...bio/data/HUReserveMarginTagTechnology.csv
diff --git a/...bio/data/IEReserveMarginTagTechnology.csv → ...bio/data/IEReserveMarginTagTechnology.csv b/...bio/data/IEReserveMarginTagTechnology.csv → ...bio/data/IEReserveMarginTagTechnology.csv
diff --git a/...bio/data/ITReserveMarginTagTechnology.csv → ...bio/data/ITReserveMarginTagTechnology.csv b/...bio/data/ITReserveMarginTagTechnology.csv → ...bio/data/ITReserveMarginTagTechnology.csv
diff --git a/...g-c400-limbio/data/InputActivityRatio.csv → ...g-c400-limbio/data/InputActivityRatio.csv b/...g-c400-limbio/data/InputActivityRatio.csv → ...g-c400-limbio/data/InputActivityRatio.csv
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ dependencies: @@
     - xlrd
     - pip
     - pip:
-      - otoole
+      - git+https://github.com/HauHe/otoole.git@osembe#egg=otoole