Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add methanol techs #1207

Merged
merged 23 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d142717
add methanol techs for master to branch
p-glaum Jul 29, 2024
5c1d817
Merge branch 'methanol_to_master' into bio_methanol
p-glaum Jul 29, 2024
acb0a8d
get methanol to kerosene cost form technology data
p-glaum Aug 5, 2024
8579689
Merge remote-tracking branch 'upstream/master' into bio_methanol
p-glaum Aug 5, 2024
9757162
add bus0 for methanol-to-kerosene process
p-glaum Aug 5, 2024
b298d58
fix missing biomass-to-methanol due to wrong if statement
p-glaum Aug 5, 2024
280e8d6
use correct colorcode for biomass-to-methanol
p-glaum Aug 5, 2024
7738572
Merge remote-tracking branch 'upstream/master' into add_methanol_techs
p-glaum Aug 12, 2024
5c577b6
remove methanol transport because it has no impact
p-glaum Aug 12, 2024
d14ced2
cleanup
p-glaum Aug 12, 2024
560929a
add release note
p-glaum Aug 12, 2024
aa91c7b
add documentation for configuration
p-glaum Aug 12, 2024
a76cb29
fix spelling mistake
p-glaum Aug 12, 2024
2b4a1cd
Merge remote-tracking branch 'upstream/master' into add_methanol_techs
p-glaum Aug 26, 2024
0b0de7b
Merge remote-tracking branch 'upstream/master' into add_methanol_techs
p-glaum Aug 26, 2024
25f6c01
adress review comments
p-glaum Aug 26, 2024
6a76aa4
Merge remote-tracking branch 'upstream/master' into add_methanol_techs
p-glaum Aug 30, 2024
cae63a3
prepare_sector_network: get tech data for allam cycle from data base
p-glaum Aug 30, 2024
51c5e39
cleanup
p-glaum Aug 30, 2024
3f4a7a1
Merge remote-tracking branch 'upstream/master' into add_methanol_techs
p-glaum Sep 10, 2024
424ae3b
Merge branch 'master' into add_methanol_techs
lisazeyen Sep 10, 2024
6cb68b1
address Lisa's comments
p-glaum Sep 11, 2024
8e068c8
Merge branch 'master' into add_methanol_techs
lisazeyen Sep 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions config/config.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,6 @@ sector:
hydrogen_turbine: false
SMR: true
SMR_cc: true
regional_methanol_demand: false
regional_oil_demand: false
regional_coal_demand: false
regional_co2_sequestration_potential:
Expand Down Expand Up @@ -638,6 +637,19 @@ sector:
# - onshore # more than 50 km from sea
- nearshore # within 50 km of sea
# - offshore
methanol:
regional_methanol_demand: false
methanol_reforming: false
methanol_reforming_cc: false
methanol_to_kerosene: false
methanol_to_olefins: false
methanol_to_power:
ccgt: false
ccgt_cc: false
ocgt: false
allam: false
biomass_to_methanol: false
biomass_to_methanol_cc: false
ammonia: false
min_part_load_fischer_tropsch: 0.5
min_part_load_methanolisation: 0.3
Expand Down Expand Up @@ -803,7 +815,7 @@ industry:
# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#costs
costs:
year: 2030
version: v0.9.1
version: v0.9.2
social_discountrate: 0.02
fill_values:
FOM: 0
Expand Down Expand Up @@ -1254,8 +1266,19 @@ plotting:
liquid: '#25c49a'
kerosene for aviation: '#a1ffe6'
naphtha for industry: '#57ebc4'
methanolisation: '#83d6d5'
methanol: '#468c8b'
methanol-to-kerosene: '#C98468'
methanol-to-olefins/aromatics: '#FFA07A'
Methanol steam reforming: '#FFBF00'
Methanol steam reforming CC: '#A2EA8A'
methanolisation: '#00FFBF'
biomass-to-methanol: '#EAD28A'
biomass-to-methanol CC: '#EADBAD'
allam methanol: '#B98F76'
CCGT methanol: '#B98F76'
CCGT methanol CC: '#B98F76'
OCGT methanol: '#B98F76'
methanol: '#FF7B00'
methanol transport: '#FF7B00'
shipping methanol: '#468c8b'
industry methanol: '#468c8b'
# co2
Expand Down
Loading
Loading