Merge branch 'develop' into add-synfuels

calliope-project · Aug 5, 2024 · 9ebe186 · 9ebe186
2 parents d8d67ba + cff2374
commit 9ebe186
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 16 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,10 +8,12 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-added-large-files
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.4
+    rev: v0.5.5
     hooks:
         # Run the linter.
         - id: ruff
           args: [--fix]
         # Run the formatter.
         - id: ruff-format
+ci:  # https://pre-commit.ci/
+    autoupdate_schedule: monthly
diff --git a/config/default.yaml b/config/default.yaml
@@ -170,11 +170,11 @@ parameters:
             passenger-cars: Passenger cars
             motorcycles: Powered 2-wheelers
         ev-battery-sizes:
-            heavy-duty-vehicles: 0.2  # average from [EUCAR_2019]
-            light-duty-vehicles: 0.1  # own assumption based on passenger cars from [EUCAR_2019]
+            heavy-duty-vehicles: 0.2  # average from [@EUCAR:2019]
+            light-duty-vehicles: 0.1  # own assumption based on passenger cars from [@EUCAR:2019]
             motorcycles: 0.01  # own assumption
-            coaches-and-buses: 0.2  # own assumption based on HDVs from [EUCAR_2019]
-            passenger-cars: 0.08  # average from [EUCAR_2019]
+            coaches-and-buses: 0.2  # own assumption based on HDVs from [@EUCAR:2019]
+            passenger-cars: 0.08  # average from [@EUCAR:2019]
         uncontrolled-ev-charging-share: 1
         monthly-demand-bound-fraction:
             min: 0.9
@@ -191,25 +191,25 @@ parameters:
     heat:
         tech-efficiencies:
             space_heat:
-                gas-eff: 0.97  # [@DEA:2020a], but 70-80% according to [Qu_2014]
-                oil-eff: 0.9  # [@DEA:2020a], but 0.63 according to [martin_2014]
+                gas-eff: 0.97  # [@DEA:2017]
+                oil-eff: 0.9  # [@DEA:2017]
                 solid-fossil-eff: 0.8 # Assume same as biofuel
-                biofuel-eff: 0.8  # [@DEA:2020a] [mermoud_2015] [Chandrasekaran_2013] [DEA_2016]
+                biofuel-eff: 0.8  # [@DEA:2017][@Mermoud:2015][@Chandrasekaran:2013]
                 solar-thermal-eff: 1  # Eurostat energy balances method
                 electricity-eff: 1  # must be 1 for the time being (we assume 1 -> 1 electricity -> heat conversion)
             hot_water:
-                gas-eff: 0.97  # [@DEA:2020a], but 70-80% according to [Qu_2014]
-                oil-eff: 0.9  # [@DEA:2020a], but 0.63 according to [martin_2014]
+                gas-eff: 0.97  # [@DEA:2017]
+                oil-eff: 0.9  # [@DEA:2017]
                 solid-fossil-eff: 0.8 # Assume same as biofuel
-                biofuel-eff: 0.8  # [mermoud_2015] [Chandrasekaran_2013] [DEA_2016]
+                biofuel-eff: 0.8  # [@DEA:2017][@Mermoud:2015][@Chandrasekaran:2013]
                 solar-thermal-eff: 1  # Eurostat energy balances method
                 electricity-eff: 1  # must be 1 for the time being (we assume 1 -> 1 electricity -> heat conversion)
             cooking:
-                gas-eff: 0.28  # [Karunanithy_2016]
-                oil-eff: 0.28  # [Karunanithy_2016] assuming oil == gas efficiency
-                solid-fossil-eff: 0.15 # [Ramanathan_1994] scaled down 60%, based on values calculated by [Karunanithy_2016]
-                biofuel-eff: 0.1 #  [Ramanathan_1994] scaled down 60%, based on values calculated by [Karunanithy_2016]
-                electricity-eff: 0.5  # [Karunanithy_2016] based on 2/3 40% efficient direct electric, 1/3 70% efficient induction
+                gas-eff: 0.28  # [@Karunanithy:2016]
+                oil-eff: 0.28  # [@Karunanithy:2016], assuming oil == gas efficiency
+                solid-fossil-eff: 0.15 # [@Ramanathan:1994] scaled down 60%, based on values calculated by [@Karunanithy:2016]
+                biofuel-eff: 0.1 # [@Ramanathan:1994] scaled down 60%, based on values calculated by [@Karunanithy:2016]
+                electricity-eff: 0.5  # [@Karunanithy:2016] based on 2/3 40% efficient direct electric, 1/3 70% efficient induction
         sfh-mfh-shares:  # derived from https://doi.org/10.2908/CENS_11DWOB_R3 using EFTA total dwelling data.
             MFH: 0.45
             SFH: 0.55

diff --git a/docs/about/references.md b/docs/about/references.md
@@ -93,3 +93,23 @@ Böhm, H., Zauner, A., Rosenfeld, D.C. and Tichler, R. (2020). _Projecting cost
 ### @Fasihi:2019
 
 Fasihi, M., Efimova, O., and Breyer, C. (2019). _ Techno-economic assessment of CO2 direct air capture plants_. Journal of Cleaner Production 224, 957–980. <https://doi.org/10.1016/j.jclepro.2019.03.086>
+
+### @Mermoud:2015
+
+Mermoud, F., Haroutunian, A., Faessler, J., and Lachal, B.M. (2015). Impact of load variations on wood boiler efficiency and emissions: in-situ monitoring of two boilers (2 MW and 0.65 MW) supplying a district heating system. Archives des Sciences 68, 27–38.
+
+### @Chandrasekaran:2013
+
+Chandrasekaran, S.R., Hopke, P.K., Newtown, M., and Hurlbut, A. (2013). Residential-Scale Biomass Boiler Emissions and Efficiency Characterization for Several Fuels. Energy Fuels 27, 4840–4849. <https://doi.org/10.1021/ef400891r>.
+
+### @Karunanithy:2016
+
+Karunanithy, C., and Shafer, K. (2016). Heat transfer characteristics and cooking efficiency of different sauce pans on various cooktops. Applied Thermal Engineering 93, 1202–1215. <https://doi.org/10.1016/j.applthermaleng.2015.10.061>
+
+### @Ramanathan:1994
+
+Ramanathan, R., and Ganesh, L.S. (1994). A multi-objective analysis of cooking-energy alternatives. Energy 19, 469–478. <https://doi.org/10.1016/0360-5442(94)90125-2>
+
+### @EUCAR:2019
+
+The European Council for Automotive R&D (EUCAR) (2019). Battery requirements for future automotive applications. <https://eucar.be/wp-content/uploads/2019/08/20190710-EG-BEV-FCEV-Battery-requirements-FINAL.pdf>