Fabian Neumann
|
2791e7bdc2
|
use packaging.version instead of deprecated distutils.StrictVersion
|
2022-07-25 14:27:31 +02:00 |
|
Fabian Neumann
|
503ecd2907
|
use + separator instead of :
|
2022-07-24 21:27:12 +02:00 |
|
Fabian Neumann
|
a65dd4e6c2
|
use snakemake.utils.update_config instead of mergedeep
|
2022-07-24 21:26:19 +02:00 |
|
Fabian Neumann
|
b3dac6d3c4
|
subworkflow flags amend
|
2022-07-20 15:53:57 +02:00 |
|
Fabian Neumann
|
d346e9c34a
|
Merge branch 'master' of github.com:pypsa/pypsa-eur-sec
|
2022-07-20 15:47:55 +02:00 |
|
Fabian Neumann
|
10243398e7
|
do not use subworkflow flags for pure data#
causes problems when config retrieve_databundle is disabled
|
2022-07-20 15:47:47 +02:00 |
|
Fabian Neumann
|
cb00ba58ce
|
add option to specify any config through sector opts with CF:<label>:...:value
|
2022-07-20 11:35:12 +02:00 |
|
Tom Brown
|
ec1aa1b76b
|
README, doc: add reference to hydrogen network paper as showcase of model
|
2022-07-18 20:40:21 +02:00 |
|
Fabian Neumann
|
51c76651ba
|
Merge pull request #248 from PyPSA/thermal-storage-bugfix
fix unit conversion for thermal energy storage
|
2022-07-11 19:04:53 +02:00 |
|
Fabian Neumann
|
adc0dd1e0c
|
fix unit conversion for thermal energy storage (closes #247)
|
2022-07-11 15:46:21 +02:00 |
|
Fabian Neumann
|
8143f7e0fd
|
remove accidental config file additions
|
2022-07-01 10:16:11 +02:00 |
|
Fabian Neumann
|
3986856282
|
merge master
|
2022-07-01 10:13:33 +02:00 |
|
Fabian Neumann
|
5082c8761b
|
Merge pull request #245 from PyPSA/bus_units
Document units of bus carriers
|
2022-06-30 17:43:14 +02:00 |
|
Irieo
|
5d60e8c6e6
|
Label oil and biomass buses also as MWh_LHV
|
2022-06-30 17:37:40 +02:00 |
|
Iegor Riepin
|
53ad90095a
|
Update scripts/prepare_sector_network.py
sync it up to Fabian's feeling of useful things
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2022-06-30 17:17:12 +02:00 |
|
Iegor Riepin
|
eddeb227a7
|
Update scripts/prepare_sector_network.py
code style update
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2022-06-30 17:15:41 +02:00 |
|
Fabian Neumann
|
3134bbb5c5
|
remove accidental file additions
|
2022-06-30 08:43:46 +02:00 |
|
Fabian Neumann
|
b96207c73e
|
store config and wildcards in n.meta
|
2022-06-30 08:42:18 +02:00 |
|
lisazeyen
|
b4d0a8404c
|
change unit from carrier gas from MWh_th -> MWh_LHV
|
2022-06-29 08:57:08 +02:00 |
|
lisazeyen
|
187c9cbaa3
|
add release notes
|
2022-06-29 08:49:29 +02:00 |
|
Irieo
|
7604bb1654
|
Document units of bus carriers
|
2022-06-28 18:31:45 +02:00 |
|
Fabian Neumann
|
a8171ec9f3
|
color adaptations, new features
|
2022-06-28 18:03:29 +02:00 |
|
Fabian Neumann
|
20e1fb40fb
|
update mock_snakemake for new snakemake versions
|
2022-06-28 17:18:09 +02:00 |
|
Fabian Neumann
|
8b134405dd
|
Merge pull request #243 from ebbekyhl/Coal-carbon-capture
Add coal with carbon capture
|
2022-06-28 14:04:31 +02:00 |
|
Ebbe Kyhl
|
e9f2d65cda
|
Indent by two layers
|
2022-06-28 13:35:44 +02:00 |
|
Ebbe Kyhl
|
5ae56cca7c
|
Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2022-06-27 18:06:59 +02:00 |
|
Fabian Neumann
|
2d2f5ba409
|
Merge pull request #238 from PyPSA/config-export
copy_config: copy actual snakemake.config
|
2022-06-23 17:19:08 +02:00 |
|
Fabian Neumann
|
bf61e83be0
|
Merge pull request #239 from PyPSA/ci-summaries
CI: include summary and plotting rules
|
2022-06-23 17:18:44 +02:00 |
|
Fabian Neumann
|
e1a6e13f75
|
add release note [no ci]
|
2022-06-23 15:28:00 +02:00 |
|
Fabian Neumann
|
2037534557
|
prepare: only add ammonia to spatial if config selected
|
2022-06-23 15:24:44 +02:00 |
|
Fabian Neumann
|
d69efe3d1f
|
add ammonia color to config.default.yaml
|
2022-06-23 15:22:21 +02:00 |
|
Fabian Neumann
|
9f91af28e7
|
fix syntax errors
|
2022-06-23 15:17:41 +02:00 |
|
Fabian Neumann
|
37c052667a
|
handle absent ammonia config flag
|
2022-06-22 15:50:32 +02:00 |
|
Ebbe Kyhl
|
2a3b576cbd
|
Add coal with carbon capture
|
2022-06-14 15:00:53 +02:00 |
|
Fabian Neumann
|
4ecfccea6c
|
handle ammonia demand both regionalised and copperplated
|
2022-06-10 17:07:48 +02:00 |
|
Fabian Neumann
|
9d5d88f565
|
Merge branch 'nh3' of github.com:pypsa/pypsa-eur-sec into nh3
|
2022-06-10 16:56:08 +02:00 |
|
Fabian Neumann
|
27ac40d2ea
|
use spatial namespace to manage ammonia resolution
|
2022-06-10 16:56:00 +02:00 |
|
Fabian Neumann
|
4984ba199e
|
use spatial namespace to manage ammonia resolution
|
2022-06-10 16:53:37 +02:00 |
|
Fabian Neumann
|
a2a4cf7c02
|
use config to manage conversion efficiencies
|
2022-06-10 16:43:29 +02:00 |
|
Fabian Neumann
|
2d562c1349
|
add coloring for ammonia
|
2022-06-10 14:57:03 +02:00 |
|
Fabian Neumann
|
2e9ee7b796
|
Merge branch 'nh3' of github.com:pypsa/pypsa-eur-sec into nh3
|
2022-06-10 14:46:51 +02:00 |
|
Fabian Neumann
|
6cfee1f98a
|
add ammonia as carrier: with Haber-Bosch, crackers, store, load
|
2022-06-10 14:46:39 +02:00 |
|
Fabian Neumann
|
9573f33860
|
add ammonia as carrier: with Haber-Bosch, crackers, store, load
|
2022-06-10 14:44:36 +02:00 |
|
Fabian Neumann
|
8dfd8b5a7f
|
Merge pull request #241 from PyPSA/agri-mach-oil
fix agriculture machinery oil load with spatial.oil.nodes
|
2022-06-03 14:30:02 +02:00 |
|
Fabian Neumann
|
b025622edf
|
fix agriculture machinery oil load with spatial.oil.nodes
|
2022-06-03 14:29:23 +02:00 |
|
Tom Brown
|
292d713817
|
README,doc: soften warnings, add limitations section to doc
|
2022-06-03 12:33:33 +02:00 |
|
Fabian Neumann
|
ba369cf782
|
Merge pull request #240 from PyPSA/fix_PPs_grouping_years
fix grouping years list issue caused by newer powerplant database
|
2022-05-31 17:25:56 +02:00 |
|
Irieo
|
aa2820c9b1
|
fix grouping years list issue caused by newer powerplant database
|
2022-05-31 16:16:40 +02:00 |
|
lisazeyen
|
f4e1d28be3
|
Merge pull request #236 from PyPSA/transport
separate rules for transport demand and nodal energy totals
|
2022-05-02 18:30:07 +02:00 |
|
lisazeyen
|
dc997c6ff2
|
Update build_population_weighted_energy_totals.py
adjust mocksnakemake
|
2022-05-02 18:19:59 +02:00 |
|