Update to v0.7.0dev4

calliope-project · Sep 17, 2024 · 5089a4f · 5089a4f
1 parent 2333b59
commit 5089a4f
Show file tree

Hide file tree

Showing 25 changed files with 95 additions and 94 deletions.
diff --git a/envs/test.yaml b/envs/test.yaml
@@ -1,7 +1,7 @@
 name: test
 channels:
-  - conda-forge
   - conda-forge/label/calliope_dev
+  - conda-forge
   - gurobi
 dependencies:
   - python=3.12
@@ -12,7 +12,7 @@ dependencies:
   - gurobi=11.0.3
   - pytest=8.2.2
   - pytest-html=3.2.0
-  - calliope=0.7.0
+  - calliope=0.7.0dev4
   - pyomo=6.7.1
   - netCDF4=1.6.5
   - hdf5=1.14.2

diff --git a/templates/environment.yaml b/templates/environment.yaml
@@ -1,7 +1,7 @@
 name: euro-calliope
 channels:
-  - conda-forge
   - conda-forge/label/calliope_dev
+  - conda-forge
   - gurobi
 dependencies:
   - python=3.12
@@ -12,5 +12,5 @@ dependencies:
   - hdf5=1.14.2
   - libnetcdf=4.9.2
   - gurobi=11.0.3
-  - calliope=0.7.0
+  - calliope=0.7.0dev4
   - pyomo=6.7.1
diff --git a/templates/models/interest-rate.yaml b/templates/models/interest-rate.yaml
@@ -1,4 +1,4 @@
-tech_groups:
+templates:
   interest_rate:
     cost_interest_rate:
       data: 0.073 # average wind onshore WACC OECD from [@Steffen:2019]

diff --git a/templates/models/techs/conversion/electricity-from-biofuel.yaml.jinja b/templates/models/techs/conversion/electricity-from-biofuel.yaml.jinja
@@ -1,7 +1,7 @@
 techs:
   electricity_from_biofuel:  # from [@JRC:2014] Table 48 Anaerobic digestion
     name: Electricity from anaerobically digested biofuel
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: biofuel
     carrier_out: electricity

diff --git a/templates/models/techs/conversion/heat-from-biofuel.yaml.jinja b/templates/models/techs/conversion/heat-from-biofuel.yaml.jinja
@@ -6,7 +6,7 @@ techs:
   biofuel_boiler: # [@DEA:2017] - Biomass boiler, automatic stoking , wood pellets or wood chips - 2050
     # Costs and efficiency are an average of data for existing single-family, new single-family, existing multi-family, and new multi-family homes.
     name: Biofuel boiler
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: biofuel
     carrier_out: heat

diff --git a/templates/models/techs/conversion/heat-from-electricity.yaml.jinja b/templates/models/techs/conversion/heat-from-electricity.yaml.jinja
@@ -5,7 +5,7 @@
 techs:
   heat_pump:   # [@DEA:2017] - 7.3 - 7.6 Air to water & 7.7 - 7.10 Ground source - 2050
     name: Heat pump
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: electricity
     carrier_out: heat
@@ -23,7 +23,7 @@ techs:
 
   electric_heater:  # [@DEA:2017] - 16 Electric heating - 2050
     name: Electrical heater
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: electricity
     carrier_out: heat
@@ -44,7 +44,7 @@ data_sources:
     source: timeseries/conversion/heat-pump-cop.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: heat_pump
       parameters: flow_out_eff
 

diff --git a/templates/models/techs/conversion/heat-from-methane.yaml.jinja b/templates/models/techs/conversion/heat-from-methane.yaml.jinja
@@ -4,7 +4,7 @@
 techs:
   methane_boiler:  # [@DEA:2017] - 202 Natural gas boiler - 2050
     name: Natural gas / methane boiler
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: methane
     carrier_out: heat

diff --git a/templates/models/techs/conversion/hydrogen-from-electricity.yaml.jinja b/templates/models/techs/conversion/hydrogen-from-electricity.yaml.jinja
@@ -4,7 +4,7 @@ techs:
   # Technology constraints and costs are averages over different electrolyser types: SOEC, PEM, and Alkaline
   electrolysis:  # [@DEA:2020b] - 86-88 Electrolysers - 2050
     name: Hydrogen by electrolysis
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: electricity
     carrier_out: hydrogen

diff --git a/templates/models/techs/conversion/synfuels-from-biofuel.yaml.jinja b/templates/models/techs/conversion/synfuels-from-biofuel.yaml.jinja
@@ -2,7 +2,7 @@ techs:
   biofuel_to_liquids: # [@DEA:2020b] - 85 Gasif. Ent. Flow FT, liq fu - 2050
     # ASSUME: Naptha production can be diverted to kerosene and diesel production, in equal measure.
     name: Biofuel to liquid fuels converter
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: biofuel
     carrier_out: [kerosene, diesel, electricity]
@@ -38,7 +38,7 @@ techs:
   # ASSUME: all vehicle fuel is diesel.
   biofuel_to_diesel: # [@DEA:2020b] - 101 Catalytic Hydropyrolysis 2 - 2050
     name: Biofuel to vehicle fuel converter
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: biofuel
     carrier_out: diesel
@@ -62,7 +62,7 @@ techs:
   # ASSUME: ignore electricity output, as it can cause numerical trouble.
   biofuel_to_methanol: # [@DEA:2020b] - 97 Methanol from biomass gasif. - 2050
     name: Biofuel to Methanol converter
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: biofuel
     carrier_out: methanol
@@ -84,7 +84,7 @@ techs:
   # ASSUME: ignore waste low grade heat (which could be used for district heating)
   biofuel_to_methane: # [@DEA:2020b] - 84 Biomass to SNG gassifier - 2050
     name: Biofuel to Methane converter
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: biofuel
     carrier_out: methane

diff --git a/templates/models/techs/conversion/synfuels-from-hydrogen.yaml.jinja b/templates/models/techs/conversion/synfuels-from-hydrogen.yaml.jinja
@@ -2,7 +2,7 @@ techs:
   # ASSUME: ignore waste low grade heat output (which could be used for district heating)
   hydrogen_to_liquids:  # [@DEA:2020b] - renewable fuels - 102 Hydrogen to Jet - 2050
     name: Hydrogen to liquid fuels converter
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: [hydrogen, electricity, co2]  # TODO: custom math to link these carrier flows
     carrier_out: [kerosene, diesel]  # TODO: custom math to link these carrier flows
@@ -42,7 +42,7 @@ techs:
   # ASSUME: Can run intermittently
   hydrogen_to_methanol:  # [@DEA:2020b] - renewable fuels - 98 Methanol from power - 2050
     name: Hydrogen to Methanol converter
-    inherit: interest_rate
+    template: interest_rate
     base_tech: conversion
     carrier_in: [hydrogen, co2] # TODO: custom math to link these carrier flows
     carrier_out: methanol

diff --git a/templates/models/techs/demand/electricity.yaml.jinja b/templates/models/techs/demand/electricity.yaml.jinja
@@ -9,7 +9,7 @@ data_sources:
     source: timeseries/demand/electricity.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: demand_elec
       parameters: sink_use_equals
 

diff --git a/templates/models/techs/demand/electrified-heat.yaml.jinja b/templates/models/techs/demand/electrified-heat.yaml.jinja
@@ -9,7 +9,7 @@ data_sources:
     source: timeseries/demand/electrified-heat.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: demand_heat_electrified
       parameters: sink_use_equals
 nodes:

diff --git a/templates/models/techs/demand/electrified-transport.yaml.jinja b/templates/models/techs/demand/electrified-transport.yaml.jinja
@@ -20,15 +20,15 @@ data_sources:
     source: timeseries/demand/uncontrolled-electrified-road-transport.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: demand_road_transport_electrified_uncontrolled
       parameters: sink_use_equals
 
   demand_uncontrolled_road_transport_historic_electrification:
     source: timeseries/demand/uncontrolled-road-transport-historic-electrification.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: demand_road_transport_historic_electrified_uncontrolled
       parameters: source_use_equals
 
@@ -56,14 +56,14 @@ overrides:
         source: timeseries/demand/demand-shape-min-ev.csv
         rows: monthsteps
         columns: nodes
-        add_dimensions:
+        add_dims:
           techs: demand_road_transport_electrified_controlled
           parameters: flow_in_per_month_min
       demand_shape_max_ev:
         source: timeseries/demand/demand-shape-max-ev.csv
         rows: monthsteps
         columns: nodes
-        add_dimensions:
+        add_dims:
           techs: demand_road_transport_electrified_controlled
           parameters: flow_in_per_month_max
 
@@ -75,7 +75,7 @@ overrides:
       source: timeseries/demand/plugin-profiles-ev.csv
       rows: timesteps
       columns: nodes
-      add_dimensions:
+      add_dims:
         techs: road_transport_controlled_dummy
         parameters: energy_cap_max_varying
     techs:

diff --git a/templates/models/techs/demand/heat.yaml.jinja b/templates/models/techs/demand/heat.yaml.jinja
@@ -9,7 +9,7 @@ data_sources:
     source: timeseries/demand/heat.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: demand_heat
       parameters: sink_use_equals
 

diff --git a/templates/models/techs/storage/electricity.yaml.jinja b/templates/models/techs/storage/electricity.yaml.jinja
@@ -1,7 +1,7 @@
 techs:
   battery:  # from [@schmidt:2019] Table S4
     name: 'Battery storage'
-    inherit: interest_rate
+    template: interest_rate
     base_tech: storage
     carrier_in: electricity
     carrier_out: electricity
@@ -29,7 +29,7 @@ techs:
 
   hydrogen:  # from [@schmidt:2019] Table S4
     name: Hydrogen power storage
-    inherit: interest_rate
+    template: interest_rate
     base_tech: storage
     carrier_in: electricity
     carrier_out: electricity

diff --git a/templates/models/techs/storage/heat.yaml.jinja b/templates/models/techs/storage/heat.yaml.jinja
@@ -1,9 +1,9 @@
-tech_groups:
+templates:
   heat_storage_small:  # [@DEA:2019] - energy storage - 142 small scale hot water tank - 2050
     base_tech: storage
     carrier_in: heat
     carrier_out: heat
-    inherit: interest_rate
+    template: interest_rate
     flow_cap_per_storage_cap_max: 6.67  # 20kW/3kWh
     storage_loss: 0.021  # fraction / hour
     lifetime: 30
@@ -16,22 +16,23 @@ tech_groups:
 techs:
   methane_boiler_storage:
     name: Small hot water tank linked to methane boilers
-    inherit: heat_storage_small
+    template: heat_storage_small
   biofuel_boiler_storage:
     name: Small hot water tank linked to biofuel boilers
-    inherit: heat_storage_small
+    template: heat_storage_small
   heat_pump_storage:
     name: Small hot water tank linked to heat pumps
-    inherit: heat_storage_small
+    template: heat_storage_small
   electric_heater_storage:
     name: Small hot water tank linked to electric heaters
-    inherit: heat_storage_small
+    template: heat_storage_small
 
 parameters:
   lookup_linked_storage_tech:
     data: [methane_boiler, biofuel_boiler, heat_pump, electric_heater]
     index: [methane_boiler_storage, biofuel_boiler_storage, heat_pump_storage, electric_heater_storage]
     dims: techs
+
 nodes:
   {% for id, location in locations.iterrows() %}
   {{ id }}.techs:

diff --git a/templates/models/techs/storage/hydro.yaml.jinja b/templates/models/techs/storage/hydro.yaml.jinja
@@ -1,7 +1,7 @@
 techs:
   pumped_hydro:  # from [@schmidt:2019] Table S4
     name: 'Pumped hydro power storage'
-    inherit: interest_rate
+    template: interest_rate
     base_tech: storage
     carrier_in: electricity
     carrier_out: electricity

diff --git a/templates/models/techs/supply/historic-electrified-heat.yaml.jinja b/templates/models/techs/supply/historic-electrified-heat.yaml.jinja
@@ -9,7 +9,7 @@ data_sources:
     source: timeseries/supply/historic-electrified-heat.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: historic_electrified_heat
       parameters: source_use_equals
 

diff --git a/templates/models/techs/supply/hydro.yaml.jinja b/templates/models/techs/supply/hydro.yaml.jinja
@@ -1,7 +1,7 @@
 techs:
   hydro_run_of_river:  # from [@JRC:2014] Table 14
     name: Run of river hydro electricity
-    inherit: interest_rate
+    template: interest_rate
     base_tech: supply
     carrier_out: electricity
     source_unit: per_cap
@@ -20,7 +20,7 @@ techs:
       dims: costs
   hydro_reservoir:  # from [@JRC:2014] Table 12
     name: Hydro electricity with a reservoir.
-    inherit: interest_rate
+    template: interest_rate
     base_tech: supply
     carrier_out: electricity
     source_unit: per_cap
@@ -44,14 +44,14 @@ data_sources:
     source: timeseries/supply/capacityfactors-hydro-run-of-river.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: hydro_run_of_river
       parameters: source_use_max
   capacityfactors_hydro_reservoir:
     source: timeseries/supply/capacityfactors-hydro-reservoir.csv
     rows: timesteps
     columns: nodes
-    add_dimensions:
+    add_dims:
       techs: hydro_reservoir
       parameters: source_use_max
 

diff --git a/templates/models/techs/supply/nuclear.yaml.jinja b/templates/models/techs/supply/nuclear.yaml.jinja
@@ -6,7 +6,7 @@
 techs:
   nuclear:
     name: Nuclear power
-    inherit: interest_rate
+    template: interest_rate
     carrier_out: electricity
     base_tech: supply
     flow_out_eff: 0.4