Skip to content

Commit 46ed854

Browse files
committed
update including corine optional
1 parent e3e724d commit 46ed854

4 files changed

Lines changed: 172 additions & 102 deletions

File tree

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Release
22

33
on:
4-
push:
5-
tags:
6-
- v*.*.*
4+
# push:
5+
# tags:
6+
# - v*.*.*
77

88
env:
99
PREPARATION_COMMIT: '[github-actions.ci] prepare release ${{ github.ref_name }}'

.github/workflows/update-lockfile.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Update locked envs
22
on:
3-
push:
4-
paths:
5-
- pixi.toml
6-
schedule:
7-
- cron: "0 8 1,16 * *" # Bi-weekly
3+
# push:
4+
# paths:
5+
# - pixi.toml
6+
# schedule:
7+
# - cron: "0 8 1,16 * *" # Bi-weekly
88
workflow_dispatch:
99

1010
jobs:

config/config_ES.yaml

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pypsa_spain:
2727
nc_ES_file: data_ES/interconnections/neighbouring_countries.yaml
2828
ic_ES_file: data_ES/interconnections/interconnections.yaml
2929
update_elec_capacities:
30-
enable: true
30+
enable: false
3131
carriers_to_update:
3232
onwind: data_ES/esios/esios_onwind_capacity_2023.csv
3333
solar: data_ES/esios/esios_solar_capacity_2023.csv
@@ -93,7 +93,7 @@ scenario:
9393
- 2030
9494

9595
# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#countries
96-
countries: #####
96+
countries:
9797
- ES
9898

9999
# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#snapshots
@@ -140,8 +140,29 @@ electricity:
140140
contingency: 4000
141141
max_hours:
142142
battery: 6
143+
"li-ion": 6
144+
lfp: 6
145+
vanadium: 10
146+
lair: 12
147+
pair: 24
148+
"iron-air": 100
143149
H2: 168
144-
powerplants_filter: (DateOut >= 2024 or DateOut != DateOut) and not (Country == 'ES' and Fueltype == 'Nuclear' and DateOut < 2031) #####
150+
extendable_carriers:
151+
Generator:
152+
- solar
153+
# - "solar-hsat"
154+
- onwind
155+
# - "offwind-ac"
156+
# - "offwind-dc"
157+
- "offwind-float"
158+
# - OCGT
159+
- CCGT
160+
StorageUnit: []
161+
Store:
162+
- battery
163+
- H2
164+
Link: []
165+
powerplants_filter: "(DateOut >= 2024 or DateOut != DateOut) and not (Country == 'ES' and Fueltype == 'Nuclear' and DateOut < 2031)" ##### Check the nuclear phase-out plan in Spain
145166
custom_powerplants: false
146167
everywhere_powerplants: []
147168
conventional_carriers: #####
@@ -217,7 +238,7 @@ renewable:
217238
resource_classes: 1
218239
capacity_per_sqkm: 3 ##### Tecnology density: ~10 MW/km2
219240
correction_factor: 1.0
220-
corine: false
241+
corine: false ##### 'false' when using the Spanish ISA ('Indice de Sensibilidad Ambiental')
221242
# grid_codes:
222243
# - 12
223244
# - 13
@@ -332,7 +353,7 @@ renewable:
332353
resource_classes: 1
333354
capacity_per_sqkm: 5.1 ##### Tecnology density: ~50 MW/km2
334355
correction_factor: 1.0
335-
corine: false
356+
corine: false ##### 'false' when using the Spanish ISA ('Indice de Sensibilidad Ambiental')
336357
# - 1
337358
# - 2
338359
# - 3
@@ -372,7 +393,7 @@ renewable:
372393
resource_classes: 1
373394
capacity_per_sqkm: 4.43
374395
correction_factor: 1.0
375-
corine: false
396+
corine: false ##### 'false' when using the Spanish ISA ('Indice de Sensibilidad Ambiental')
376397
# - 1
377398
# - 2
378399
# - 3
@@ -486,7 +507,7 @@ transformers:
486507
load:
487508
fill_gaps:
488509
enable: true
489-
interpolate_limit: 3
510+
interpolate_limit: 6
490511
time_shift_for_large_gaps: 1w
491512
manual_adjustments: true
492513
scaling_factor: 1.0
@@ -892,6 +913,7 @@ sector:
892913
biomass_to_methanol: false # true #####
893914
biomass_to_methanol_cc: false
894915
ammonia: false # true #####
916+
min_part_load_electrolysis: 0
895917
min_part_load_fischer_tropsch: 0.5
896918
min_part_load_methanolisation: 0.3
897919
min_part_load_methanation: 0.3
@@ -903,6 +925,7 @@ sector:
903925
use_electrolysis_waste_heat: 0.25
904926
electricity_transmission_grid: true
905927
electricity_distribution_grid: false # true #####
928+
electricity_distribution_grid_cost_factor: 1.0
906929
electricity_grid_connection: true
907930
transmission_efficiency:
908931
enable:
@@ -1288,6 +1311,9 @@ data:
12881311
gem_europe_gas_tracker:
12891312
source: archive
12901313
version: latest
1314+
gem_gcct:
1315+
source: archive
1316+
version: latest
12911317
co2stop:
12921318
source: archive
12931319
version: latest
@@ -1327,6 +1353,15 @@ data:
13271353
synthetic_electricity_demand:
13281354
source: primary
13291355
version: latest
1356+
opsd_electricity_demand:
1357+
source: archive
1358+
version: latest
1359+
entsoe_electricity_demand:
1360+
source: archive
1361+
version: latest
1362+
neso_electricity_demand:
1363+
source: archive
1364+
version: latest
13301365
copernicus_land_cover:
13311366
source: primary
13321367
version: latest

0 commit comments

Comments
 (0)