Preparation of release v0.6

.gitignore

@@ -11,11 +11,8 @@ gurobi.log
 /benchmarks
 /logs
 /notebooks
-/data/timezone_mappings.csv
-/data/urban_percent.csv
 /data/links_p_nom.csv
 /data/*totals.csv
-/data/*Jensen.csv
 /data/biomass*
 /data/emobility/
 /data/eea*

config.default.yaml

@@ -1,4 +1,4 @@
-version: 0.5.0
+version: 0.6.0
 
 logging_level: INFO
 
@@ -45,14 +45,14 @@ scenario:
 # CO2 budget as a fraction of 1990 emissions
 # this is over-ridden if CO2Lx is set in sector_opts
 # this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
+# co2_budget:
+#   2020: 0.7011648746
+#   2025: 0.5241935484
+#   2030: 0.2970430108
+#   2035: 0.1500896057
+#   2040: 0.0712365591
+#   2045: 0.0322580645
+#   2050: 0
 
 # snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
 snapshots:
@@ -146,11 +146,11 @@ sector:
     potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
      # increase of today's district heating demand to potential maximum district heating share
      # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress:
-      2020: 0.0
-      2030: 0.3
-      2040: 0.6
-      2050: 1.0
+    progress: 1
+      # 2020: 0.0
+      # 2030: 0.3
+      # 2040: 0.6
+      # 2050: 1.0
     district_heating_loss: 0.15
   bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
   bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
@@ -170,46 +170,46 @@ sector:
   bev_avail_mean: 0.8
   v2g: true #allows feed-in to grid from EV battery
   #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: # 1 means all FCEVs
-    2020: 0
-    2030: 0.05
-    2040: 0.1
-    2050: 0.15
-  land_transport_electric_share: # 1 means all EVs
-    2020: 0
-    2030: 0.25
-    2040: 0.6
-    2050: 0.85
+  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
+    # 2020: 0
+    # 2030: 0.05
+    # 2040: 0.1
+    # 2050: 0.15
+  land_transport_electric_share: 0.85 # 1 means all EVs
+    # 2020: 0
+    # 2030: 0.25
+    # 2040: 0.6
+    # 2050: 0.85
   transport_fuel_cell_efficiency: 0.5
   transport_internal_combustion_efficiency: 0.3
   agriculture_machinery_electric_share: 0
   agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
   agriculture_machinery_electric_efficiency: 0.3 # electricity per use
   shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
   shipping_hydrogen_liquefaction: false # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: # 1 means all hydrogen FC
-    2020: 0
-    2025: 0
-    2030: 0.05
-    2035: 0.15
-    2040: 0.3
-    2045: 0.6
-    2050: 1
+  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
+    # 2020: 0
+    # 2025: 0
+    # 2030: 0.05
+    # 2035: 0.15
+    # 2040: 0.3
+    # 2045: 0.6
+    # 2050: 1
   time_dep_hp_cop: true #time dependent heat pump coefficient of performance
   heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
    # conservatively high to cover hot water and space heating in poorly-insulated buildings
   reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
   # this can represent e.g. building renovation, building demolition, or if
   # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: # per unit reduction in space heat demand
+  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
   # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    2020: 0.10  # this results in a space heat demand reduction of 10%
-    2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    2030: 0.09
-    2035: 0.11
-    2040: 0.16
-    2045: 0.21
-    2050: 0.29
+    # 2020: 0.10  # this results in a space heat demand reduction of 10%
+    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
+    # 2030: 0.09
+    # 2035: 0.11
+    # 2040: 0.16
+    # 2045: 0.21
+    # 2050: 0.29
   retrofitting :  # co-optimises building renovation to reduce space heat demand
     retro_endogen: false  # co-optimise space heat savings
     cost_factor: 1.0   # weight costs for building renovation
@@ -251,32 +251,32 @@ sector:
 
 
 industry:
-  St_primary_fraction: # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    2020: 0.6
-    2025: 0.55
-    2030: 0.5
-    2035: 0.45
-    2040: 0.4
-    2045: 0.35
-    2050: 0.3
-  DRI_fraction: # fraction of the primary route converted to DRI + EAF
-    2020: 0
-    2025: 0
-    2030: 0.05
-    2035: 0.2
-    2040: 0.4
-    2045: 0.7
-    2050: 1
+  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
+    # 2020: 0.6
+    # 2025: 0.55
+    # 2030: 0.5
+    # 2035: 0.45
+    # 2040: 0.4
+    # 2045: 0.35
+    # 2050: 0.3
+  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
+    # 2020: 0
+    # 2025: 0
+    # 2030: 0.05
+    # 2035: 0.2
+    # 2040: 0.4
+    # 2045: 0.7
+    # 2050: 1
   H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
   elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction:  # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    2020: 0.4
-    2025: 0.375
-    2030: 0.35
-    2035: 0.325
-    2040: 0.3
-    2045: 0.25
-    2050: 0.2
+  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
+    # 2020: 0.4
+    # 2025: 0.375
+    # 2030: 0.35
+    # 2035: 0.325
+    # 2040: 0.3
+    # 2045: 0.25
+    # 2050: 0.2
   MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
   MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
   MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)

data/heat_load_profile_DK_AdamJensen.csv

@@ -0,0 +1,25 @@
+hour,weekday,weekend
+0,0.9181438689,0.9421512708
+1,0.9172359071,0.9400891069
+2,0.9269464481,0.9461062015
+3,0.9415047932,0.9535084941
+4,0.9656299507,0.9651094993
+5,1.0221166443,0.9834676747
+6,1.1553090493,1.0124171051
+7,1.2093411031,1.0446615927
+8,1.1470295942,1.088203419
+9,1.0877191341,1.1110334576
+10,1.0418327372,1.0926752822
+11,1.0062977133,1.055488209
+12,0.9837030359,1.0251266112
+13,0.9667570278,0.9990015154
+14,0.9548320932,0.9782897278
+15,0.9509232061,0.9698167237
+16,0.9636973319,0.974288587
+17,0.9799372563,0.9886456216
+18,1.0046501848,1.0084159643
+19,1.0079452419,1.0171243296
+20,0.9860566481,0.9994722379
+21,0.9705228074,0.982761591
+22,0.9586485819,0.9698167237
+23,0.9335023778,0.9515079292

data/urban_percent.csv

@@ -0,0 +1,30 @@
+AT,66
+BA,40
+BE,98
+BG,74
+CH,74
+CZ,73
+DE,75
+DK,88
+EE,68
+ES,80
+FI,84
+FR,80
+GB,83
+GR,78
+HR,59
+HU,71
+IE,63
+IT,69
+LT,67
+LU,90
+LV,67
+NL,90
+NO,80
+PL,61
+PT,63
+RO,55
+RS,56
+SE,86
+SI,50
+SK,54

doc/conf.py

@@ -56,23 +56,23 @@
 
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
-
+progress
 # The master toctree document.
 master_doc = 'index'
 
 # General information about the project.
 project = u'PyPSA-Eur-Sec'
-copyright = u'2019-2020 Tom Brown (KIT), Marta Victoria (Aarhus University), Lisa Zeyen (KIT)'
-author = u'2019-2020 Tom Brown (KIT), Marta Victoria (Aarhus University), Lisa Zeyen (KIT)'
+copyright = u'2019-2021 Tom Brown (KIT, TUB), Marta Victoria (Aarhus University), Lisa Zeyen (KIT, TUB), Fabian Neumann (TUB)'
+author = u'2019-2021 Tom Brown (KIT, TUB), Marta Victoria (Aarhus University), Lisa Zeyen (KIT, TUB), Fabian Neumann (TUB)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.5'
+version = u'0.6'
 # The full version, including alpha/beta/rc tags.
-release = u'0.5.0'
+release = u'0.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/data.csv

@@ -7,7 +7,6 @@ EEA emission statistics,eea/UNFCCC_v23.csv,EEA standard re-use policy,https://ww
 Eurostat Energy Balances,eurostat-energy_balances-*/,Eurostat,https://ec.europa.eu/eurostat/web/energy/data/energy-balances
 Swiss energy statistics from Swiss Federal Office of Energy,switzerland-sfoe/,unknown,http://www.bfe.admin.ch/themen/00526/00541/00542/02167/index.html?dossier_id=02169
 BASt emobility statistics,emobility/,unknown,http://www.bast.de/DE/Verkehrstechnik/Fachthemen/v2-verkehrszaehlung/Stundenwerte.html?nn=626916
-timezone mappings,timezone_mappings.csv,CC BY 4.0,Tom Brown
 BDEW heating profile,heat_load_profile_BDEW.csv,unknown,https://github.com/oemof/demandlib
 heating profiles for Aarhus,heat_load_profile_DK_AdamJensen.csv,unknown,Adam Jensen MA thesis at Aarhus University
 George Lavidas wind/wave costs,WindWaveWEC_GLTB.xlsx,unknown,George Lavidas

doc/installation.rst

@@ -66,15 +66,15 @@ Data requirements
 =================
 
 Small data files are included directly in the git repository, while
-larger ones are archived in a data bundle. The data bundle's size is
-around 640 MB.
+larger ones are archived in a data bundle on zenodo (`10.5281/zenodo.5546517 <https://doi.org/10.5281/zenodo.5546517>`_).
+The data bundle's size is around 640 MB.
 
 To download and extract the data bundle on the command line:
 
 .. code:: bash
-
-    projects/pypsa-eur-sec/data % wget "https://nworbmot.org/pypsa-eur-sec-data-bundle-210418.tar.gz"
-    projects/pypsa-eur-sec/data % tar xvzf pypsa-eur-sec-data-bundle-210418.tar.gz
+`
+    projects/pypsa-eur-sec/data % wget "https://zenodo.org/record/5546517/files/pypsa-eur-sec-data-bundle.tar.gz"
+    projects/pypsa-eur-sec/data % tar xvzf pypsa-eur-sec-data-bundle.tar.gz
 
 
 The data licences and sources are given in the following table.