bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,228 Commits 1 Branch 0 Tags 133 MiB
1a7f093e03
Commit Graph

3228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Brown
1a7f093e03 solve: pass wildcards and config to additional_functionality 2023-12-15 17:18:36 +01:00
Tom Brown
c5a123b4f4 allow additional functionality for solving to be added by file 
To add this, overwrite the rule with a new argument:

snakemake.input.additional_functionality
 2023-12-15 14:57:03 +01:00
Tom Brown
830019a6e5 add rule that allows cost data to be modified 2023-12-15 09:50:47 +01:00
Tom Brown
326ed63329 add_brownfield: disable grid expansion if LV already hit 
Numerical problems were causing infeasibilities otherwise
 2023-12-08 17:53:28 +01:00
Tom Brown
00e86e6435 bug fix: route process emissions from steam cracker to correct bus 
Now naphtha demand causes process emissions from steak crackers to
route to process emissions bus, then rest of CO2 goes to atmosphere.
 2023-12-08 13:28:08 +01:00
Tom Brown
2d323d1b87 bug fix: ICE efficiency for land transport was applied twice 
This was overestimating ICE oil demand by factor 1/0.3.
 2023-12-08 12:27:07 +01:00
Tom Brown
bbf9ca2d9b bug fix: naming of p_set when co2_national is True 
Without this naming fix, the p_set is a NaN once added
 2023-12-08 11:58:28 +01:00
Tom Brown
66178a5a27 solve_network: fix sign for country CO2 when bus0=atmosphere 
So that DAC extracts CO2 rather than pumping into air; for p>0, link
withdraws from bus0, but injects into bus1/2/3, so you have to take
account of this sign difference-
 2023-12-04 16:46:45 +01:00
Tom Brown
cea62de438 solve_network: quick fix so duals can be read from CO2 constrain 2023-12-04 16:46:11 +01:00
lisazeyen
3ff925e797
add load shedding for all energy carriers 2023-11-24 10:00:07 +01:00
lisazeyen
e8324b9c27
fix bug when oil copper plated 2023-11-24 09:58:24 +01:00
chrstphtrs
d9ec127f99 Add process emissions to country emissions constraint, fix snapshot weighting 2023-11-21 14:55:32 +01:00
chrstphtrs
82ac430fd9 fix spatial resolution for solid biomass links and naphtha oil loads under 'co2_spatial: true' flag 2023-11-08 09:58:02 +01:00
chrstphtrs
2ad9ca8f7b add regionalised oil load for process emissions from naphtha as feedstock 2023-10-26 11:17:57 +02:00
chrstphtrs
e2b2eafbc1 add geographical resolution to oil and methanol for options['co2_budget_national'] to include all necessary links in national co2 budget constraints 2023-10-24 16:46:58 +02:00
chrstphtrs
7cb677d0e6 clean up function add_co2limit_country 2023-10-24 16:39:58 +02:00
chrstphtrs
94afba7c5d add coal tech_color to config 2023-10-24 16:39:33 +02:00
chrstphtrs
a35f5479ae add links instead of equal-and-opposite fuel/emissions load pairs for land transport oil (ICEs), naphtha for industry and kerosene for aviation (before summed as 'oil'), shipping oil, shipping methanol, agriculture machinery oil 2023-10-24 14:06:17 +02:00
chrstphtrs
9b9090c76c add option for additional national carbon budget constraints 2023-10-18 16:59:49 +02:00
Fabian Neumann
7884392326
Merge pull request #748 from PyPSA/follow-up-637 
follow-up to #637: remove duplicate code and update tsam version
 2023-10-18 10:27:29 +02:00
Fabian Neumann
df5b9e9943
Merge pull request #759 from ekatef/fix_retrofit 
Update calculations of retrofit costs
 2023-10-18 10:26:32 +02:00
Fabian Neumann
c254e95bb5
Merge pull request #756 from tgi-climact/feature/retrieve-irena 
Add rule to update IRENA renewables capacities
 2023-10-18 09:48:53 +02:00
Fabian Neumann
1e2159b5e0
Merge pull request #760 from PyPSA/pre-commit-ci-update-config 
[pre-commit.ci] pre-commit autoupdate
 2023-10-17 18:00:05 +02:00
pre-commit-ci[bot]
055cbc4fb2
[pre-commit.ci] pre-commit autoupdate 
updates:
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.10.0 → v2.11.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.10.0...v2.11.0)
 2023-10-16 18:21:48 +00:00
ekatef
6f0a73f169 Release dask constraint 2023-10-13 14:52:20 +03:00
ekatef
f88ce0ea07 Adjust data structure 2023-10-13 14:51:25 +03:00
pre-commit-ci[bot]
21148e3cc5 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-10-13 10:36:50 +00:00
Ekaterina
b0a95aefaa
Merge branch 'PyPSA:master' into fix_retrofit 2023-10-13 13:30:04 +03:00
Fabian Neumann
093ebfa696
Merge pull request #758 from PyPSA/xarray_hotfix 
hotfix to overcome xarray chunking error
 2023-10-12 17:43:22 +02:00
martacki
29fad3d638 change environment name back to pypsa-eur 2023-10-12 17:11:41 +02:00
martacki
9cde392227 hotfix to overcome xarray chunking error by reverting to an older version 2023-10-12 17:09:03 +02:00
ekatef
dccfabfdac Fix environment 2023-10-12 00:15:47 +03:00
ekatef
460fa00b28 Fix file name 2023-10-11 21:43:51 +03:00
pre-commit-ci[bot]
d10779ca34 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-10-11 14:27:25 +00:00
Thomas Gilon
4c5ea9e207
Specify input files required to retrieve irena data 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2023-10-11 16:27:08 +02:00
Thomas Gilon
c8fcbaad6e
Update default value in retrieve.smk 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2023-10-11 16:24:52 +02:00
Fabian Neumann
97a5be1e84
Merge branch 'master' into feature/retrieve-irena 2023-10-11 16:17:15 +02:00
Fabian Neumann
4fc9959f5a
Merge pull request #757 from tgi-climact/feature/SMR-cc-configuration 
Add option for SMR CC
 2023-10-11 16:07:41 +02:00
Fabian Neumann
892ee30d98
Update config/config.default.yaml 2023-10-11 16:07:00 +02:00
Thomas Gilon
124177b6db Add option for SMR CC 2023-10-11 14:32:47 +02:00
pre-commit-ci[bot]
230c1a327c [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-10-11 12:27:29 +00:00
Thomas Gilon
43e20a26e6 Add rule to update IRENA data for existing infrastructure 2023-10-11 14:26:04 +02:00
ekatef
fcef194566 Reference to a multiindex level by number instead of name 2023-10-11 12:29:38 +03:00
ekatef
7ad60cb7f9 Fix calculation of averages 2023-10-11 12:28:34 +03:00
ekatef
5ee9df000b Make an argument of pd.concat to a list 2023-10-11 12:28:08 +03:00
ekatef
b51d908bfa Fix computation of the mean 2023-10-11 12:27:31 +03:00
ekatef
5ec00c5d9d Fix type definition for a call of difference function 2023-10-11 12:27:10 +03:00
ekatef
f825544c3b Remove duplication in column names 2023-10-11 12:26:30 +03:00
ekatef
4294248518 Re-map country codes to account for "GB" 2023-10-11 12:26:10 +03:00
Fabian Neumann
ee5ce13c26
Merge pull request #755 from PyPSA/pre-commit-ci-update-config 
[pre-commit.ci] pre-commit autoupdate
 2023-10-10 09:21:44 +02:00