Battery electric vehicle meta facade

src/oemof/tabular/constraint_facades.py

@@ -4,7 +4,7 @@
 from oemof.solph.constraints.integral_limit import generic_integral_limit
 from pyomo.environ import Constraint
 
-from oemof.tabular.facades import Bev
+from oemof.tabular.facades import BevTech
 
 
 def var2str(var):
@@ -88,7 +88,7 @@ class BevShareMob(ConstraintFacade):
     def map_share2vars(model, share_mob, period):
         invest_vars = []
         for node in model.es.nodes:
-            if isinstance(node, Bev):
+            if isinstance(node, BevTech):
                 invest_vars.extend(
                     [
                         inv
@@ -172,7 +172,7 @@ def double_with_offset(lst):
     def get_bev_invest_vars(model, period):
         all_invest_vars = {}
         for node in model.es.nodes:
-            if isinstance(node, Bev):
+            if isinstance(node, BevTech):
                 invest_vars_bev = list(
                     set(
                         inv

src/oemof/tabular/datapackage/reading.py

@@ -482,12 +482,13 @@ def unpack_sequences(facade, period_data):
         facade
         """
 
-        yearly_values = ["fixed_costs", "marginal_costs"]
+        yearly_values = ["fixed_costs", "marginal_cost"]
         periodical_values = [
             "capacity",
             "capacity_cost",
             "capacity_potential",
             "storage_capacity",
+            "year",
         ]
 
         for value_name, value in facade.items():

src/oemof/tabular/facades/__init__.py

@@ -7,7 +7,7 @@
 from .conversion import Conversion
 from .dispatchable import Dispatchable
 from .excess import Excess
-from .experimental.battery_electric_vehicle import Bev
+from .experimental.battery_electric_vehicle import BevFleet, BevTech
 from .extraction_turbine import ExtractionTurbine
 from .generator import Generator
 from .heatpump import HeatPump
@@ -36,7 +36,8 @@
     "shortage": Shortage,
     "storage": Storage,
     "volatile": Volatile,
-    "bev": Bev,
+    "bev_tech": BevTech,
+    "bev_fleet": BevFleet,
 }
 
 TECH_COLOR_MAP = {
@@ -60,7 +61,6 @@
     "reservoir": "slateblue",
     "biomass": "olivedrab",
     "storage": "lightsalmon",
-    "battery": "lightsalmon",
     "import": "crimson",
 }