Merge branch 'release/v0.0.4' into main

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.8', '3.9', '3.10']
+        python-version: ['3.10']
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

.readthedocs.yml

@@ -5,12 +5,17 @@
 # Required
 version: 2
 
+# Optionally set the version of Python and requirements required to build your docs
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
    configuration: docs/conf.py
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-   version: "3.7"
    install:
    - requirements: docs/docs_requirements.txt

README.md

@@ -49,7 +49,7 @@ It is recommended to install poetry system-wide via the command below or
        cd oemof-B3
 3. Create virtual environment using conda:
 
-       conda env create environment.yml
+       conda env create -f environment.yml
 4. Activate environment:
 
        conda activate oemof-B3

docs/conf.py

@@ -23,7 +23,7 @@
 author = 'Reiner Lemoine Institut'
 
 # The full version, including alpha/beta/rc tags
-release = '0.0.3'
+release = '0.0.4'
 
 
 # -- General configuration ---------------------------------------------------

docs/docs_requirements.txt

@@ -1,4 +1,4 @@
 # Duplicates the docs requirements in pyproject.toml, but is necessary for readthedocs (rtd does not allow to poetry install -E docs).
-sphinx
+sphinx>=5.0.0
 sphinx-rtd-theme>=0.5.1
 sphinxcontrib_bibtex

docs/getting_started.rst

@@ -11,7 +11,7 @@ Using oemof-B3
 Installation
 ------------
 
-Currently, oemof-B3 needs python 3.8, 3.9 or 3.10 (newer versions may be supported, but installation can take very long).
+Currently, oemof-B3 needs python 3.10 (newer versions may be supported, but installation can take very long).
 
 Additionally, you need to install the python dependency manager `poetry <https://python-poetry.org/>`_.
 It is recommended to install poetry system-wide via the command below or
@@ -41,7 +41,7 @@ It is recommended to install poetry system-wide via the command below or
 
 ::
 
-    conda env create environment.yml
+    conda env create -f environment.yml
 
 4. Activate environment:
 

docs/whats_new.rst

@@ -4,6 +4,7 @@
 What's new
 ~~~~~~~~~~
 
+.. include:: whats_new/v0-0-4.rst
 .. include:: whats_new/v0-0-3.rst
 .. include:: whats_new/v0-0-2.rst
 .. include:: whats_new/v0-0-1.rst

docs/whats_new/v0-0-4.rst

@@ -0,0 +1,23 @@
+v0.0.4
+======
+
+# New features
+* oemof-B3 now runs with latest release of oemoflex -> v0.0.3
+* Hence it runs with oemof.tabular -> version v0.0.5
+
+# Bug fixes
+* Wrong zenodo link to raw data has been fixed
+* documentation build has been fixed (commit 07084684e8897ac34327a41bae990a3d881226d8)
+
+# Contributors
+- jnnr
+- MaGering
+- SabineHaas
+- juliusmeier
+- henhuy
+- monika-o
+- c-moeller
+- Stefanie08
+- chrwm
+- khelfen
+- mjazimm

oemof_b3/config/labels/de.yml

@@ -1,6 +1,6 @@
 # oil: Öl  Raises error as "oil" is in "boiler" -> duplicate mappings
 oil: Öl
-oil-gt: Oil GT
+oil-gt: Öl GT
 biomass: Biomasse
 biomass-gt: Biomasse GT
 biomass-st: Biomasse DT

oemof_b3/config/labels/en.yml

@@ -44,3 +44,4 @@ hydro-ror: Hydro ROR
 solar-pv: PV
 wind-onshore: Wind on
 oil: Oil
+oil-gt: Oil gas turbine

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oemof-B3"
-version = "0.0.3"
+version = "0.0.4"
 description = "oemof-B3 - an open-source energy system model for Brandenburg/Berlin"
 authors = [
   "Jann Launer <[email protected]>",
@@ -19,14 +19,14 @@ requires = ["poetry_core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.dependencies]
-python = ">=3.8, <3.11"
+python = ">=3.10, <3.11"
 numpy = ">=1.21.0"
 rtree = ">=0.9.7"
 pyyaml = ">=6.0"
 dynaconf = "^3.1.7"
 snakemake = ">=5"
-oemoflex = { git = "https://git@github.com/rl-institut/oemoflex", tag = "0.0.2a"}
-Sphinx = {version = "^4.3.2", optional = true}
+oemoflex = {git = "https://github.com/rl-institut/oemoflex.git", rev = "0.0.3"}
+Sphinx = {version = ">=5.0", optional = true}
 sphinx-rtd-theme = {version = "^1.0.0", optional = true}
 sphinxcontrib-bibtex = {version = "^2.4.1", optional = true}
 docutils = "^0.17"
@@ -35,6 +35,7 @@ demandlib = "^0.1.8"
 pandas = ">=1.1.0"
 boto3 = "1.26.125"
 oem2orm = "^0.3.2"
+pulp = ">=2.0.0,<2.8.0" # Todo: Delete with higher version. pulp==2.8.0 is error prone
 
 [tool.poetry.dev-dependencies]
 black = "20.8b1"

snakemake_rules/prepare_resource.smk

@@ -4,7 +4,7 @@ rule download_raw_data:
 
 rule download_zenodo:
     params:
-        url="https://zenodo.org/record/7533832/files/oemof-B3-raw-data.zip",
+        url="https://zenodo.org/record/8364204/files/oemof-B3-raw-data.zip",
         raw="raw"
     output: "raw/oemof-B3-raw-data.zip"
     shell: "python scripts/download_raw.py {params.url} {output}"

tests/_files/oemof_b3_resources_timeseries_elec_vehicle_demand.csv

@@ -1,3 +1,3 @@
 id_ts;scenario_key;region;var_name;timeindex_start;timeindex_stop;timeindex_resolution;series;var_unit;source;comment
-0;ALL;BB;electricity-bev_charging-profile;2019-01-01 00:00:00;2019-01-01 02:00:00;H;"[0.36641573208006967, 0.33080598089020347, 0.30277828702972687]";None;https://github.com/rl-institut/simbev;created with simBEV. contains a mix of hourly simBEV and a constant profile
-1;ALL;B;electricity-bev_charging-profile;2015-01-01 00:00:00;2015-01-01 02:00:00;H;"[0.3709718013655691, 0.3303502017829303, 0.2986779968515006]";None;https://github.com/rl-institut/simbev;created with simBEV. contains a mix of hourly simBEV and a constant profile
+0;ALL;BB;electricity-bev_charging-profile;2019-01-01 00:00:00;2019-01-01 02:00:00;h;"[0.36641573208006967, 0.33080598089020347, 0.30277828702972687]";None;https://github.com/rl-institut/simbev;created with simBEV. contains a mix of hourly simBEV and a constant profile
+1;ALL;B;electricity-bev_charging-profile;2015-01-01 00:00:00;2015-01-01 02:00:00;h;"[0.3709718013655691, 0.3303502017829303, 0.2986779968515006]";None;https://github.com/rl-institut/simbev;created with simBEV. contains a mix of hourly simBEV and a constant profile

tests/_files/oemof_b3_resources_timeseries_feedin.csv

@@ -1,5 +1,5 @@
 id_ts;scenario_key;region;var_name;timeindex_start;timeindex_stop;timeindex_resolution;series;var_unit;source;comment
-0;ALL;B;wind-profile;2012-01-01 10:00:00;2012-01-01 12:00:00;H;"[0.1593, 0.2175, 0.2113]";None;https://www.renewables.ninja/;navigate to country Germany
-1;ALL;BB;wind-profile;2012-01-01 10:00:00;2012-01-01 12:00:00;H;"[0.2299, 0.2635, 0.2866]";None;https://www.renewables.ninja/;navigate to country Germany
-0;ALL;B;pv-profile;2012-01-01 10:00:00;2012-01-01 12:00:00;H;"[0.013, 0.018, 0.011]";None;https://www.renewables.ninja/;navigate to country Germany
-1;ALL;BB;pv-profile;2012-01-01 10:00:00;2012-01-01 12:00:00;H;"[0.015, 0.019, 0.012]";None;https://www.renewables.ninja/;navigate to country Germany
+0;ALL;B;wind-profile;2012-01-01 10:00:00;2012-01-01 12:00:00;h;"[0.1593, 0.2175, 0.2113]";None;https://www.renewables.ninja/;navigate to country Germany
+1;ALL;BB;wind-profile;2012-01-01 10:00:00;2012-01-01 12:00:00;h;"[0.2299, 0.2635, 0.2866]";None;https://www.renewables.ninja/;navigate to country Germany
+0;ALL;B;pv-profile;2012-01-01 10:00:00;2012-01-01 12:00:00;h;"[0.013, 0.018, 0.011]";None;https://www.renewables.ninja/;navigate to country Germany
+1;ALL;BB;pv-profile;2012-01-01 10:00:00;2012-01-01 12:00:00;h;"[0.015, 0.019, 0.012]";None;https://www.renewables.ninja/;navigate to country Germany

tests/_files/oemof_b3_resources_timeseries_stacked.csv

@@ -1,19 +1,19 @@
 id_ts;region;var_name;timeindex_start;timeindex_stop;timeindex_resolution;series;var_unit;source;comment
-0;BB;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-1;BB;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-2;BB;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-3;BB;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;
-4;BB;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-5;BB;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[882505.2, 1194379.0, 1289504.5];;;
-6;BB;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-7;BB;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-8;BB;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1145114.0, 801141.1, 595497.8];;;
-9;BE;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-10;BE;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-11;BE;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-12;BE;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;
-13;BE;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-14;BE;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[882505.2, 1194379.0, 1289504.5];;;
-15;BE;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-16;BE;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-17;BE;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1145114.0, 801141.1, 595497.8];;;
+0;BB;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+1;BB;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+2;BB;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+3;BB;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;
+4;BB;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+5;BB;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[882505.2, 1194379.0, 1289504.5];;;
+6;BB;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+7;BB;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+8;BB;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1145114.0, 801141.1, 595497.8];;;
+9;BE;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+10;BE;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+11;BE;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+12;BE;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;
+13;BE;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+14;BE;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[882505.2, 1194379.0, 1289504.5];;;
+15;BE;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+16;BE;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+17;BE;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1145114.0, 801141.1, 595497.8];;;

tests/_files/oemof_b3_resources_timeseries_stacked_agg_region.csv

@@ -1,10 +1,10 @@
 id_ts;region;var_name;timeindex_start;timeindex_stop;timeindex_resolution;series;var_unit;source;comment
-0;All;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-1;All;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-2;All;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-3;All;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[3779589.614281981, 3740897.5602432936, 3607680.4021416325];;;
-4;All;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-5;All;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1765010.4, 2388758.0, 2579009.0];;;
-6;All;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-7;All;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-8;All;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[2290228.0, 1602282.2, 1190995.6];;;
+0;All;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+1;All;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+2;All;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+3;All;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[3779589.614281981, 3740897.5602432936, 3607680.4021416325];;;
+4;All;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+5;All;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1765010.4, 2388758.0, 2579009.0];;;
+6;All;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+7;All;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+8;All;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[2290228.0, 1602282.2, 1190995.6];;;

tests/_files/oemof_b3_resources_timeseries_stacked_comments.csv

@@ -1,19 +1,19 @@
 id_ts;region;var_name;timeindex_start;timeindex_stop;timeindex_resolution;series;var_unit;source;comment
-0;BB;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-1;BB;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-2;BB;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-3;BB;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;We have a comment here.
-4;BB;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-5;BB;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[882505.2, 1194379.0, 1289504.5];;;We have a comment here.
-6;BB;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-7;BB;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-8;BB;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1145114.0, 801141.1, 595497.8];;;We have a comment here.
-9;BE;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-10;BE;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-11;BE;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-12;BE;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;We have a comment here.
-13;BE;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-14;BE;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[882505.2, 1194379.0, 1289504.5];;;We have a comment here.
-15;BE;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-16;BE;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;We have a comment here.
-17;BE;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1145114.0, 801141.1, 595497.8];;;We have a comment here.
+0;BB;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+1;BB;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+2;BB;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+3;BB;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;We have a comment here.
+4;BB;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+5;BB;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[882505.2, 1194379.0, 1289504.5];;;We have a comment here.
+6;BB;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+7;BB;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+8;BB;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1145114.0, 801141.1, 595497.8];;;We have a comment here.
+9;BE;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+10;BE;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+11;BE;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+12;BE;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;We have a comment here.
+13;BE;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+14;BE;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[882505.2, 1194379.0, 1289504.5];;;We have a comment here.
+15;BE;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+16;BE;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;We have a comment here.
+17;BE;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1145114.0, 801141.1, 595497.8];;;We have a comment here.

tests/_files/oemof_b3_resources_timeseries_stacked_filtered_BE.csv

@@ -1,10 +1,10 @@
 id_ts;region;var_name;timeindex_start;timeindex_stop;timeindex_resolution;series;var_unit;source;comment
-9;BE;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-10;BE;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-11;BE;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-12;BE;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;
-13;BE;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-14;BE;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[882505.2, 1194379.0, 1289504.5];;;
-15;BE;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-16;BE;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[0.0, 0.0, 0.0];;;
-17;BE;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;H;[1145114.0, 801141.1, 595497.8];;;
+9;BE;biomass-st_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+10;BE;ch4-gt_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+11;BE;electricity-curtailment_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+12;BE;electricity-demand_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1889794.8071409904, 1870448.7801216468, 1803840.2010708163];;;
+13;BE;electricity-liion-battery_in_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+14;BE;electricity-liion-battery_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[882505.2, 1194379.0, 1289504.5];;;
+15;BE;electricity-shortage_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+16;BE;solar-pv_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[0.0, 0.0, 0.0];;;
+17;BE;wind-onshore_out_electricity;2019-01-01 00:00:00;2019-01-01 02:00:00;h;[1145114.0, 801141.1, 595497.8];;;