lisazeyen
|
9752b4b4e6
|
Merge branch 'master' into pellet-boiler
|
2022-08-05 12:25:01 +02:00 |
|
lisazeyen
|
ff3d171bd7
|
move biomass boilers to add_biomass
|
2022-08-05 12:19:47 +02:00 |
|
lisazeyen
|
14f54304a8
|
Merge branch 'master' into pellet-boiler
|
2022-08-05 11:27:28 +02:00 |
|
lisazeyen
|
289c252688
|
remove link to co2 atmosphere
|
2022-08-04 17:42:57 +02:00 |
|
lisazeyen
|
8c62fb1b56
|
Merge branch 'master' into btl
|
2022-08-04 16:13:09 +02:00 |
|
lisazeyen
|
ee458eeafb
|
change names of buses
|
2022-08-04 16:03:16 +02:00 |
|
lisazeyen
|
2d625f5a80
|
Merge pull request #254 from millingermarkus/biosng
BioSNG (methane from solid biomass) with and without CC
|
2022-08-04 15:39:55 +02:00 |
|
Fabian Neumann
|
9cf5be84fd
|
bugfix: solve_network should look for wildcard sector_opts
|
2022-08-03 17:07:19 +02:00 |
|
Fabian Neumann
|
286520f396
|
compatibility: fix plotting for new pypsa version
|
2022-08-03 17:06:41 +02:00 |
|
Fabian Neumann
|
2857691367
|
Merge pull request #246 from PyPSA/meta
store config and wildcards in n.meta
|
2022-08-01 21:01:06 +02:00 |
|
millingermarkus
|
65aaa3d188
|
Added tech color for biomass boiler and minor adaptations to biomass boiler process
|
2022-08-01 15:28:53 +02:00 |
|
millingermarkus
|
6211823514
|
Added color for BioSNG and minor adaptations
|
2022-08-01 15:13:59 +02:00 |
|
millingermarkus
|
46310f0a30
|
Minor correction to prepare_sector_network
|
2022-08-01 15:00:27 +02:00 |
|
Markus Millinger
|
5b61d2f777
|
Added pellet boiler process
|
2022-08-01 13:38:01 +02:00 |
|
Markus Millinger
|
0019723262
|
Updated spatial nodes for biomass to liquid
|
2022-08-01 13:26:51 +02:00 |
|
Markus Millinger
|
abba2a4f3e
|
Added BioSNG process with and w/o CC
|
2022-08-01 13:22:58 +02:00 |
|
Markus Millinger
|
4bff921cf2
|
Adapted biomass_to_liquid toggle reference
|
2022-08-01 13:13:18 +02:00 |
|
Markus Millinger
|
46413dd88c
|
Added biomass to liquid process with an w/o CC
|
2022-08-01 13:07:59 +02:00 |
|
lisazeyen
|
530e453eba
|
Merge pull request #251 from PyPSA/cf-sector-opts
option to specify any config through sector opts with CF+<label>+<value>
|
2022-07-26 15:53:49 +02:00 |
|
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
|
cb00ba58ce
|
add option to specify any config through sector opts with CF:<label>:...:value
|
2022-07-20 11:35:12 +02:00 |
|
Fabian Neumann
|
adc0dd1e0c
|
fix unit conversion for thermal energy storage (closes #247)
|
2022-07-11 15:46:21 +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 |
|
Irieo
|
7604bb1654
|
Document units of bus carriers
|
2022-06-28 18:31:45 +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 |
|
Ebbe Kyhl
|
2a3b576cbd
|
Add coal with carbon capture
|
2022-06-14 15:00:53 +02:00 |
|
Fabian Neumann
|
b025622edf
|
fix agriculture machinery oil load with spatial.oil.nodes
|
2022-06-03 14:29:23 +02:00 |
|
lisazeyen
|
dc997c6ff2
|
Update build_population_weighted_energy_totals.py
adjust mocksnakemake
|
2022-05-02 18:19:59 +02:00 |
|
Fabian Neumann
|
361100bfab
|
Merge branch 'master' into transport
|
2022-05-02 10:28:43 +02:00 |
|
Fabian Neumann
|
cdd56288ff
|
fix EU bus location with new config setting
|
2022-04-12 16:21:09 +02:00 |
|
Fabian Neumann
|
c5ca8f4c20
|
fix: squeeze IDEES dataframe at correct location
|
2022-04-12 16:11:06 +02:00 |
|
Fabian Neumann
|
c54b4f9920
|
copy_config: copy actual snakemake.config
|
2022-04-12 15:16:05 +02:00 |
|
Fabian Neumann
|
d4fd472762
|
Merge branch 'master' into transport
|
2022-04-12 14:48:57 +02:00 |
|
Fabian Neumann
|
d4a82a2a41
|
Merge pull request #217 from PyPSA/myopic-fix
Myopic fix
|
2022-04-12 14:47:22 +02:00 |
|
Fabian Neumann
|
1625d9db75
|
address recent deprecations (#235)
* address recent deprecations
* address recent deprecations in pd.read_csv
|
2022-04-12 14:37:05 +02:00 |
|
lisazeyen
|
408b494612
|
bug fix with augmentation object
|
2022-04-12 10:45:11 +02:00 |
|
lisazeyen
|
9322f90318
|
add minimum capacity for AC and DC lines depending on previous year
|
2022-04-12 10:04:27 +02:00 |
|
lisazeyen
|
cfdec7e56d
|
simplify pipe retrofitting constraint
|
2022-04-12 10:04:27 +02:00 |
|