Merge pull request pypsa-meets-earth#1165 from yerbol-akhmetov/make_g…

…enerators_link Convert conventional ppls from generators to link with existing capacity
asolavi · Nov 15, 2024 · aea9d27 · aea9d27
2 parents a1a8474 + 394cc0a
commit aea9d27
Show file tree

Hide file tree

Showing 3 changed files with 182 additions and 110 deletions.
diff --git a/Snakefile b/Snakefile
@@ -1063,6 +1063,7 @@ if not config["custom_data"]["gas_network"]:
 rule prepare_sector_network:
     params:
         costs=config["costs"],
+        electricity=config["electricity"],
     input:
         network=RESDIR
         + "prenetworks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{sopts}_{planning_horizons}_{discountrate}_{demand}_presec.nc",

diff --git a/config.default.yaml b/config.default.yaml
@@ -517,7 +517,10 @@ sector:
     blue_share: 0.40
     pink_share: 0.05
   coal:
+    spatial_coal: true
     shift_to_elec: true # If true, residential and services demand of coal is shifted to electricity. If false, the final energy demand of coal is disregarded
+  lignite:
+    spatial_lignite: false
 
   international_bunkers: false #Whether or not to count the emissions of international aviation and navigation
 
@@ -674,7 +677,11 @@ sector:
 
   conventional_generation: # generator : carrier
     OCGT: gas
-    #Gen_Test: oil # Just for testing purposes
+    oil: oil
+    coal: coal
+    lignite: lignite
+    biomass: biomass
+  keep_existing_capacities: true
 
 
 solving: