diff --git a/Snakefile b/Snakefile index cb50e3bf..ce79a421 100644 --- a/Snakefile +++ b/Snakefile @@ -232,7 +232,7 @@ rule add_electricity: log: "logs/add_electricity.log" benchmark: "benchmarks/add_electricity" threads: 1 - resources: mem=3000 + resources: mem=5000 script: "scripts/add_electricity.py" @@ -273,7 +273,7 @@ rule cluster_network: log: "logs/cluster_network/elec_s{simpl}_{clusters}.log" benchmark: "benchmarks/cluster_network/elec_s{simpl}_{clusters}" threads: 1 - resources: mem=3000 + resources: mem=6000 script: "scripts/cluster_network.py" diff --git a/config.default.yaml b/config.default.yaml index f70e7c2c..7a443a03 100755 --- a/config.default.yaml +++ b/config.default.yaml @@ -148,12 +148,13 @@ renewable: slope: 35. azimuth: 180. capacity_per_sqkm: 1.7 # ScholzPhd Tab 4.3.1: 170 MW/km^2 - # Determined by comparing uncorrected area-weighted full-load hours to those + # Correction factor determined by comparing uncorrected area-weighted full-load hours to those # published in Supplementary Data to # Pietzcker, Robert Carl, et al. "Using the sun to decarbonize the power # sector: The economic potential of photovoltaics and concentrating solar # power." Applied Energy 135 (2014): 704-720. - correction_factor: 0.854337 + # This correction factor of 0.854337 may be in order if using reanalysis data. + # correction_factor: 0.854337 corine: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 26, 31, 32] natura: true diff --git a/config.tutorial.yaml b/config.tutorial.yaml index 26ead242..ea624727 100755 --- a/config.tutorial.yaml +++ b/config.tutorial.yaml @@ -116,12 +116,13 @@ renewable: slope: 35. azimuth: 180. capacity_per_sqkm: 1.7 # ScholzPhd Tab 4.3.1: 170 MW/km^2 - # Determined by comparing uncorrected area-weighted full-load hours to those + # Correction factor determined by comparing uncorrected area-weighted full-load hours to those # published in Supplementary Data to # Pietzcker, Robert Carl, et al. "Using the sun to decarbonize the power # sector: The economic potential of photovoltaics and concentrating solar # power." Applied Energy 135 (2014): 704-720. - correction_factor: 0.854337 + # This correction factor of 0.854337 may be in order if using reanalysis data. + # correction_factor: 0.854337 corine: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 26, 31, 32] natura: true diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 0423a581..c379cf5c 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -18,6 +18,10 @@ Upcoming Release * The default deployment density of AC- and DC-connected offshore wind capacity is reduced from 3 MW/sqkm to a more conservative estimate of 2 MW/sqkm [`#280 `_]. +* Following discussion in `#285 `_ we have disabled the + correction factor for solar PV capacity factors by default while satellite data is used. + A correction factor of 0.854337 is recommended if reanalysis data like ERA5 is used. + PyPSA-Eur 0.4.0 (22th September 2021) =====================================