From e4d70fdf4a10364687bab33f6407634858488865 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 15 May 2024 18:12:02 +0200
Subject: [PATCH] remove exogenous rooftop_share

---
 config/config.default.yaml | 1 -
 doc/configtables/costs.csv | 1 -
 doc/configuration.rst      | 3 ---
 doc/release_notes.rst      | 5 +++++
 scripts/add_electricity.py | 5 +----
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/config/config.default.yaml b/config/config.default.yaml
index 43a21a9e..0ac06847 100644
--- a/config/config.default.yaml
+++ b/config/config.default.yaml
@@ -714,7 +714,6 @@ industry:
 costs:
   year: 2030
   version: v0.9.0
-  rooftop_share: 0.14  # based on the potentials, assuming  (0.1 kW/m2 and 10 m2/person)
   social_discountrate: 0.02
   fill_values:
     FOM: 0
diff --git a/doc/configtables/costs.csv b/doc/configtables/costs.csv
index 03933c18..38079e34 100644
--- a/doc/configtables/costs.csv
+++ b/doc/configtables/costs.csv
@@ -1,7 +1,6 @@
 ,Unit,Values,Description
 year,--,YYYY; e.g. '2030',Year for which to retrieve cost assumptions of ``resources/costs.csv``.
 version,--,vX.X.X or <user>/<repo>/vX.X.X; e.g. 'v0.5.0',Version of ``technology-data`` repository to use. If this string is of the form <user>/<repo>/<version> then costs are instead retrieved from ``github.com/<user>/<repo>`` at the <version> tag.
-rooftop_share,--,float,Share of rooftop PV when calculating capital cost of solar (joint rooftop and utility-scale PV).
 social_discountrate,p.u.,float,Social discount rate to compare costs in different investment periods. 0.02 corresponds to a social discount rate of 2%.
 fill_values,--,float,Default values if not specified for a technology in ``resources/costs.csv``.
 capital_cost,EUR/MW,Keys should be in the 'technology' column of ``resources/costs.csv``. Values can be any float.,"For the given technologies, assumptions about their capital investment costs are set to the corresponding value. Optional; overwrites cost assumptions from ``resources/costs.csv``."
diff --git a/doc/configuration.rst b/doc/configuration.rst
index a6917eca..f34e9109 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -550,9 +550,6 @@ The list of available biomass is given by the category in `ENSPRESO_BIOMASS <htt
    :widths: 22,7,22,33
    :file: configtables/costs.csv
 
-.. note::
-   ``rooftop_share:`` are based on the potentials, assuming
-   (0.1 kW/m2 and 10 m2/person)
 
 .. _clustering_cf:
 
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index 333cbafd..2cb95beb 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -9,6 +9,11 @@ Release Notes
 
 Upcoming Release
 ================
+
+* Remove exogenously set share of rooftop PV (``costs: rooftop_share:``).
+  Rooftop and utility-scale PV are now largely handled as separate technologies
+  with endogenous shares.
+
 * New technology, solar PV with single-axis horizontal tracking (on a N-S axis),
   with a carrier called ``solar-hsat`` to the networks. The default option for adding
   this technology is set to ``true`` in the ``config.yaml``.
diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py
index a77a9921..0685e42f 100755
--- a/scripts/add_electricity.py
+++ b/scripts/add_electricity.py
@@ -230,10 +230,7 @@ def load_costs(tech_costs, config, max_hours, Nyears=1.0):
     costs.at["OCGT", "co2_emissions"] = costs.at["gas", "co2_emissions"]
     costs.at["CCGT", "co2_emissions"] = costs.at["gas", "co2_emissions"]
 
-    costs.at["solar", "capital_cost"] = (
-        config["rooftop_share"] * costs.at["solar-rooftop", "capital_cost"]
-        + (1 - config["rooftop_share"]) * costs.at["solar-utility", "capital_cost"]
-    )
+    costs.at["solar", "capital_cost"] = costs.at["solar-utility", "capital_cost"]
 
     costs = costs.rename({"solar-utility single-axis tracking": "solar-hsat"})