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 |
|
pre-commit-ci[bot]
|
326aeb682b
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-09 14:28:08 +00:00 |
|
Fabian Neumann
|
ce609b6ebe
|
Merge branch 'master' into ukraine_hackathon
|
2023-10-09 16:25:49 +02:00 |
|
Fabian Neumann
|
42692c3ca5
|
UA-MD availability matrix: plot shape_availability
|
2023-10-09 16:21:04 +02:00 |
|
Fabian Neumann
|
27ebbaba24
|
UA-MD availability matrix: consider WDPA protection areas as substitute for Natura
|
2023-10-09 16:20:23 +02:00 |
|
Fabian Neumann
|
9d7b250230
|
UA-MD availability matrix: consider ship density
|
2023-10-09 16:19:31 +02:00 |
|
Fabian Neumann
|
9a13748d34
|
UA-MD availability matrix: adjust corine/copernicus code selection
|
2023-10-09 16:18:58 +02:00 |
|
Fabian Neumann
|
725cece814
|
disable multiprocesing for MD-UA availability matrix
|
2023-10-09 16:18:16 +02:00 |
|
Fabian Neumann
|
a15157c788
|
add optional function to restore transmission connections to Crimea
|
2023-10-09 16:16:53 +02:00 |
|
Fabian Neumann
|
b94a797fed
|
do not remove large unconnected subnetworks
|
2023-10-09 10:00:10 +02:00 |
|
Fabian Neumann
|
ea99f3c43e
|
Merge branch 'master' into ukraine_hackathon
|
2023-10-09 09:53:42 +02:00 |
|
Fabian Neumann
|
7cb4742c75
|
Merge pull request #750 from PyPSA/sourcery/master
Sourcery refactored master branch
|
2023-10-08 17:52:45 +02:00 |
|
Fabian Neumann
|
2bab27e2f3
|
Merge pull request #718 from PyPSA/coke
add coal and coke demand for integrated steelworks
|
2023-10-08 11:58:48 +02:00 |
|
pre-commit-ci[bot]
|
f054180a62
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-08 09:20:59 +00:00 |
|
Sourcery AI
|
3c36c60bdd
|
'Refactored by Sourcery'
|
2023-10-08 09:20:36 +00:00 |
|
Fabian Neumann
|
679d09c170
|
follow-up to #637: remove duplicate code and update tsam version
|
2023-10-08 11:10:09 +02:00 |
|
lisazeyen
|
1eed747bde
|
remove spelling mistakes
|
2023-10-05 12:03:06 +02:00 |
|
Fabian Hofmann
|
51a90b3433
|
Merge branch 'master' into multi-horizon
|
2023-10-05 10:59:14 +02:00 |
|
Fabian
|
f5fb307f89
|
fix type, expand codespell ignore list
|
2023-10-04 17:31:46 +02:00 |
|
lisazeyen
|
08f1a0f313
|
remove comments for newer data version
|
2023-09-30 08:22:41 +02:00 |
|
lisazeyen
|
22fe2448a4
|
Update scripts/solve_network.py
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
|
2023-09-30 08:14:54 +02:00 |
|
lisazeyen
|
21d1109853
|
Merge branch 'master' into multi-horizon
|
2023-09-29 08:40:05 +02:00 |
|
ekatef
|
ce8b89d1e2
|
Fix structure of the grouped dataframe
|
2023-09-27 14:41:00 +03:00 |
|
ekatef
|
89d140cd7a
|
Fix a column name in buildings data
|
2023-09-27 12:51:38 +03:00 |
|
ekatef
|
36fe57938c
|
Replace pandas.append()
|
2023-09-27 12:47:23 +03:00 |
|
Fabian Neumann
|
5006bc4877
|
build_biomass_potentials: link to planning_horizons wildcard, interpolate missing years
|
2023-09-26 15:12:39 +02:00 |
|
euronion
|
02bffdbd06
|
Fix bug preventing inclusion of custom_powerplants (#732)
|
2023-09-05 17:21:11 +02:00 |
|
pre-commit-ci[bot]
|
3187081ec0
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-31 07:56:07 +00:00 |
|
lisazeyen
|
457a9e23e7
|
fixes CI perfect
|
2023-08-31 09:55:38 +02:00 |
|
lisazeyen
|
c0152c25a4
|
first fixes for CI
|
2023-08-30 15:57:47 +02:00 |
|
pre-commit-ci[bot]
|
64cbfd673c
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-30 12:33:27 +00:00 |
|
lisazeyen
|
c278a3159f
|
add benchmark back
|
2023-08-30 14:32:57 +02:00 |
|
pre-commit-ci[bot]
|
bdaa646ed6
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-30 10:05:18 +00:00 |
|
lisazeyen
|
9ec7442c69
|
merge master
|
2023-08-30 12:03:49 +02:00 |
|
lisazeyen
|
3247fb59e0
|
clean up
|
2023-08-30 11:50:49 +02:00 |
|
lisazeyen
|
22d61ad10e
|
add line expansion with DC links
|
2023-08-30 11:08:30 +02:00 |
|
lisazeyen
|
c35391d594
|
move SEG aggregation later
|
2023-08-29 15:46:58 +02:00 |
|
lisazeyen
|
4cd492bb6f
|
drop assets which reached end of lifetime
|
2023-08-28 13:52:55 +02:00 |
|
lisazeyen
|
abb584de45
|
add H2 boiler and constraint to avoid existing gas boiler back up
|
2023-08-28 13:31:02 +02:00 |
|
lisazeyen
|
369eaf3457
|
fix bug carbon budget
|
2023-08-28 10:21:02 +02:00 |
|
lisazeyen
|
b362c009f5
|
drop nan with SEG
|
2023-08-25 16:44:25 +02:00 |
|
lisazeyen
|
0cfd5fab58
|
add carbon budget constraint
|
2023-08-25 15:50:26 +02:00 |
|
lisazeyen
|
d646c09d60
|
intermediate solution back
|
2023-08-25 14:16:09 +02:00 |
|
lisazeyen
|
3fcf3f2fe6
|
move max growth assumptions to config
|
2023-08-25 13:27:34 +02:00 |
|
lisazeyen
|
e6d779a91f
|
first step add max_growth
|
2023-08-25 11:56:29 +02:00 |
|
lisazeyen
|
727aab92f5
|
rm intermediate solution
|
2023-08-25 10:50:25 +02:00 |
|
lisazeyen
|
ca0d67110e
|
add land use constraint
|
2023-08-25 10:49:03 +02:00 |
|
lisazeyen
|
6b07faf7cd
|
intermediate solution glc transmission
|
2023-08-24 15:50:37 +02:00 |
|
lisazeyen
|
73df378837
|
add memory logger
|
2023-08-24 15:48:06 +02:00 |
|
lisazeyen
|
be23b5c56a
|
add network plot for perfect
|
2023-08-24 15:32:23 +02:00 |
|
lisazeyen
|
f2b01fbbe0
|
plot summary with usual script
|
2023-08-24 14:43:36 +02:00 |
|
lisazeyen
|
49ec50171b
|
fix bug network dict
|
2023-08-24 14:21:02 +02:00 |
|
lisazeyen
|
c10afdc857
|
adjust co2_emission fct
|
2023-08-24 14:20:14 +02:00 |
|
lisazeyen
|
e41357e3d5
|
update carbon plot
|
2023-08-24 14:19:34 +02:00 |
|
pre-commit-ci[bot]
|
b8dee184a9
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-24 09:12:07 +00:00 |
|
Fabian Neumann
|
d0f2d52853
|
apply protected() to zenodo downloads; only retrieve monthly fuel/CO2 prices when necessary
|
2023-08-24 11:11:33 +02:00 |
|
lisazeyen
|
3679687ed7
|
add co2 store lifetime
|
2023-08-24 08:43:50 +02:00 |
|
lisazeyen
|
445216ae03
|
adjust co2 glcs
|
2023-08-24 08:43:29 +02:00 |
|
lisazeyen
|
8c5ca05eb4
|
add carbon constraint to perfect
|
2023-08-24 08:42:24 +02:00 |
|
pre-commit-ci[bot]
|
a77f0f6ab1
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-23 14:11:34 +02:00 |
|
lisazeyen
|
60b1968eb0
|
check for missing buses
|
2023-08-23 13:27:40 +02:00 |
|
lisazeyen
|
6585e2c623
|
adjust summary and plotting
|
2023-08-23 13:26:27 +02:00 |
|
lisazeyen
|
20bf1cdaf5
|
deal with global constraints
|
2023-08-23 13:26:08 +02:00 |
|
lisazeyen
|
f47ce1c432
|
add lifetime
|
2023-08-23 13:24:25 +02:00 |
|
Fabian Neumann
|
3ccc63aae4
|
build_carbon_budget: parse input_co2
|
2023-08-22 14:49:44 +02:00 |
|
Fabian Neumann
|
401fbb7be7
|
Merge branch 'fix-plot-summary' of github.com:daniel-rdt/pypsa-eur into daniel-rdt-fix-plot-summary
|
2023-08-22 14:46:48 +02:00 |
|
Fabian Neumann
|
49b2cd382d
|
Update scripts/plot_summary.py
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
|
2023-08-22 14:43:15 +02:00 |
|
Fabian Neumann
|
e12cad2789
|
simplify if-else expression
|
2023-08-22 14:42:21 +02:00 |
|
Fabian Neumann
|
33305f9761
|
Merge branch 'feature/myopic_existing_baseyear_fix' of github.com:daniel-rdt/pypsa-eur into daniel-rdt-feature/myopic_existing_baseyear_fix
|
2023-08-22 14:39:50 +02:00 |
|
Fabian Neumann
|
e4b220ff81
|
follow-up to #726: import country converter
|
2023-08-22 14:29:00 +02:00 |
|
Fabian Neumann
|
59d422a1f9
|
Merge pull request #726 from PyPSA/industrial_key_duplicates
drop duplicates in prepare_hotmaps_database
|
2023-08-22 14:26:42 +02:00 |
|
Fabian Neumann
|
f4d821ad2a
|
use country_converter instead of pycountry
|
2023-08-22 14:22:25 +02:00 |
|
Fabian Neumann
|
41a35ad129
|
bugfix: use of n.madd with singular value prevented
|
2023-08-22 11:53:02 +02:00 |
|
martavp
|
46cdf2bf3a
|
Merge branch 'fix-min-capacity-myopic' of https://github.com/PyPSA/pypsa-eur into fix-min-capacity-myopic
|
2023-08-22 11:08:57 +02:00 |
|
martavp
|
9cee4384bb
|
revert commented lines
|
2023-08-22 11:08:51 +02:00 |
|
lisazeyen
|
890c80e047
|
remove overrides
|
2023-08-22 11:00:25 +02:00 |
|
lisazeyen
|
e92fc4ff4d
|
merge master
|
2023-08-22 10:21:42 +02:00 |
|
pre-commit-ci[bot]
|
69132bd6e2
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-22 06:41:43 +00:00 |
|
martavp
|
2391a5c4e9
|
fix p_nom_min of renewable generators for myopic approach
as described in https://github.com/PyPSA/pypsa-eur/issues/727
|
2023-08-22 08:31:46 +02:00 |
|
pre-commit-ci[bot]
|
dadc372ecd
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-21 14:17:21 +00:00 |
|
lisazeyen
|
8d09e38627
|
drop duplicates in prepare_hotmaps_database
|
2023-08-21 16:16:53 +02:00 |
|
Fabian Neumann
|
6cdb194332
|
sanitize_carriers: do not invent nice names, use carrier where not available
|
2023-08-21 11:19:16 +02:00 |
|
Fabian Neumann
|
d7554bccff
|
Merge pull request #722 from PyPSA/carbon-management
Carbon management
|
2023-08-14 15:57:46 +02:00 |
|
Fabian
|
fc64649089
|
build_sequestration: switch to geopandas dissolve rather than groupby
|
2023-08-14 14:39:51 +02:00 |
|
pre-commit-ci[bot]
|
0d096d7388
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-14 10:40:07 +00:00 |
|
Fabian Neumann
|
def61ae769
|
industry distribution: use EPRTR as fallback if ETS missing
|
2023-08-14 12:39:33 +02:00 |
|
Fabian Neumann
|
1c1d45b1f5
|
add_electricity: make adding carriers in attach_wind_and_solar safer
|
2023-08-10 15:00:01 +02:00 |
|
pre-commit-ci[bot]
|
eed52d04ae
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-09 13:04:38 +00:00 |
|
daniel.rdt
|
e304efbf3c
|
fix in co2_emissions_year function and correspondigly in plot_summary and snakemake rule. Also changes to historical_emissions in plot_summary since some countries are not in eea dataset.
|
2023-08-09 14:49:36 +02:00 |
|
pre-commit-ci[bot]
|
ac04abb98c
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-09 09:02:22 +00:00 |
|
Fabian Neumann
|
9a68730745
|
fix: read investment year of time-dependent config
|
2023-08-09 11:01:58 +02:00 |
|
pre-commit-ci[bot]
|
c32d5249e1
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-09 08:12:52 +00:00 |
|
Fabian Neumann
|
ade8a003c6
|
add coal and coke demand for integrated steelworks (closes #717)
|
2023-08-09 10:11:28 +02:00 |
|
Fabian Neumann
|
8d19043205
|
handle monthly fuel price download through script
|
2023-08-06 09:01:56 +02:00 |
|
Fabian
|
62cb6fbdd8
|
validation: download input data files instead
|
2023-08-04 17:38:21 +02:00 |
|
Fabian Hofmann
|
17f4c2ddb0
|
Merge branch 'master' into validation
|
2023-08-04 15:23:42 +02:00 |
|
Fabian
|
ad6322bcb3
|
address review commments
|
2023-08-04 12:58:31 +02:00 |
|
Fabian Hofmann
|
6e7bbe1e08
|
Merge branch 'master' into validation
|
2023-08-03 18:28:10 +02:00 |
|
Fabian Hofmann
|
4a8af57a59
|
simplify network: remove 'underground' column to avoid consense error
|
2023-08-03 18:19:20 +02:00 |
|