small follow-up to #1066 solar-hsat

config/config.default.yaml

@@ -117,7 +117,7 @@ electricity:
   everywhere_powerplants: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
 
   conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
-  renewable_carriers: [solar, solar-hsat, onwind, offwind-ac, offwind-dc, hydro]
+  renewable_carriers: [solar, solar-hsat, onwind, offwind-ac, offwind-dc, offwind-float, hydro]
 
   estimate_renewable_capacities:
     enable: true
@@ -339,6 +339,8 @@ pypsa_eur:
   - onwind
   - offwind-ac
   - offwind-dc
+  - offwind-float
+  - solar-hsat
   - solar
   - ror
   - nuclear
@@ -602,7 +604,6 @@ sector:
   biogas_upgrading_cc: false
   conventional_generation:
     OCGT: gas
-  solar_utility_horizontal_axis_tracking: true
   biomass_to_liquid: false
   biosng: false
   limit_max_growth:
@@ -1185,4 +1186,6 @@ plotting:
     DC-DC: "#8a1caf"
     DC link: "#8a1caf"
     load: "#dd2e23"
+    waste CHP: '#e3d37d'
+    waste CHP CC: '#e3d3ff'
     HVC to air: 'k'

scripts/add_brownfield.py

@@ -195,10 +195,7 @@ def adjust_renewable_profiles(n, input_profiles, params, year):
     )
 
     for carrier in params["carriers"]:
-        if carrier == "hydro" or (
+        if carrier == "hydro":
-            carrier == "solar-hsat"
-            and not snakemake.config["sector"]["solar_utility_horizontal_axis_tracking"]
-        ):
             continue
 
         with xr.open_dataset(getattr(input_profiles, "profile_" + carrier)) as ds:

scripts/prepare_sector_network.py

@@ -3504,13 +3504,6 @@ def remove_h2_network(n):
         n.stores.drop("EU H2 Store", inplace=True)
 
 
-def remove_solar_tracking(n):
-
-    for tech in ["solar-hsat"]:
-        logger.info("removing " + tech)
-        n.mremove("Generator", n.generators.index[n.generators.carrier == tech])
-
-
 def limit_individual_line_extension(n, maxext):
     logger.info(f"Limiting new HVAC and HVDC extensions to {maxext} MW")
     n.lines["s_nom_max"] = n.lines["s_nom"] + maxext
@@ -3889,9 +3882,6 @@ if __name__ == "__main__":
     if options["electricity_distribution_grid"]:
         insert_electricity_distribution_grid(n, costs)
 
-    if not options["solar_utility_horizontal_axis_tracking"]:
-        remove_solar_tracking(n)
-
     maybe_adjust_costs_and_potentials(n, snakemake.params["adjustments"])
 
     if options["gas_distribution_grid"]:

scripts/solve_network.py

@@ -955,7 +955,7 @@ def extra_functionality(n, snapshots):
     if EQ_o := constraints["EQ"]:
         add_EQ_constraints(n, EQ_o.replace("EQ", ""))
 
-    if config["sector"]["solar_utility_horizontal_axis_tracking"]:
+    if {"solar-hsat", "solar"}.issubset(config["renewable"].keys()):
         add_solar_potential_constraints(n, config)
 
     add_battery_constraints(n)