Skip to content

Commit 5b8e3b5

Browse files
authored
Merge pull request #3309 from quintel/carbon-modelling-add-processes
Carbon modelling add processes to main project branch
2 parents c68c5ea + 2c736ef commit 5b8e3b5

File tree

1,608 files changed

+11449
-3271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,608 files changed

+11449
-3271
lines changed

carriers/biogenic_waste.ad

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
- sustainable = 1.0
22
- infinite = false
3+
- mj_per_kg = 11.6
34
- typical_production_per_km2 = 0.0
45
- graphviz_color = green
56

carriers/dry_biomass.ad

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
- sustainable = 1.0
22
- infinite = false
3-
- mj_per_kg = 17.8
3+
- mj_per_kg = 11.6
44
- graphviz_color = green
55

66
~ co2_conversion_per_mj = CARRIER(dry_biomass, co2_conversion_per_mj)
77
~ cost_per_mj = CARRIER(dry_biomass, cost_per_mj)
8+
~ potential_co2_conversion_per_mj = CARRIER(dry_biomass, potential_co2_conversion_per_mj)

carriers/non_biogenic_waste.ad

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
- sustainable = 0.0
22
- infinite = false
3+
- mj_per_kg = 10.0
34
- graphviz_color = black
45

56
~ co2_conversion_per_mj = CARRIER(non_biogenic_waste, co2_conversion_per_mj)

carriers/oily_biomass.ad

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- sustainable = 1.0
22
- infinite = false
3-
- mj_per_kg = 17.8
3+
- mj_per_kg = 27.4
44
- graphviz_color = green
55

66
~ co2_conversion_per_mj = CARRIER(oily_biomass, co2_conversion_per_mj)

carriers/wet_biomass.ad

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
- sustainable = 1.0
22
- infinite = false
3-
- mj_per_kg = 17.8
3+
- mj_per_kg = 15.6
44
- graphviz_color = green
55

66
~ co2_conversion_per_mj = CARRIER(wet_biomass, co2_conversion_per_mj)
77
~ cost_per_mj = CARRIER(wet_biomass, cost_per_mj)
8+
~ potential_co2_conversion_per_mj = CARRIER(wet_biomass, potential_co2_conversion_per_mj)

config/energy_node_positions.yml

Lines changed: 153 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -627,20 +627,23 @@ energy_distribution_ammonia:
627627
x: 5720
628628
"y": 9980
629629
energy_distribution_bio_ethanol:
630-
x: 6240
631-
"y": 2440
630+
x: 6060
631+
"y": 10840
632632
energy_distribution_bio_kerosene:
633-
x: 6240
634-
"y": 2620
633+
x: 6060
634+
"y": 10780
635635
energy_distribution_bio_lng:
636-
x: 6240
637-
"y": 2560
636+
x: 6060
637+
"y": 11140
638638
energy_distribution_bio_oil:
639-
x: 6240
640-
"y": 2380
639+
x: 6060
640+
"y": 11200
641+
energy_distribution_bio_pyrolysis_oil:
642+
x: 6060
643+
"y": 11080
641644
energy_distribution_biodiesel:
642-
x: 6240
643-
"y": 2500
645+
x: 6060
646+
"y": 10900
644647
energy_distribution_biogas:
645648
x: 7340
646649
"y": 4700
@@ -649,10 +652,10 @@ energy_distribution_biogenic_waste:
649652
"y": 6600
650653
energy_distribution_biomethanol:
651654
x: 6060
652-
"y": 10160
655+
"y": 11020
653656
energy_distribution_bionaphtha:
654657
x: 6060
655-
"y": 10660
658+
"y": 10960
656659
energy_distribution_coal:
657660
x: 7340
658661
"y": 5080
@@ -709,7 +712,7 @@ energy_distribution_lt_steam_hot_water:
709712
"y": 5540
710713
energy_distribution_methanol:
711714
x: 6060
712-
"y": 10100
715+
"y": 10080
713716
energy_distribution_mt_steam_hot_water:
714717
x: 5600
715718
"y": 6500
@@ -731,6 +734,9 @@ energy_distribution_oily_biomass:
731734
energy_distribution_propane:
732735
x: 6060
733736
"y": 8740
737+
energy_distribution_pyrolysis_oil:
738+
x: 6060
739+
"y": 10660
734740
energy_distribution_torrefied_biomass_pellets:
735741
x: 7180
736742
"y": 4000
@@ -752,18 +758,42 @@ energy_export_ammonia_backup:
752758
energy_export_ammonia_baseload:
753759
x: 3200
754760
"y": 14820
761+
energy_export_bio_ethanol_backup:
762+
x: 3200
763+
"y": 15120
764+
energy_export_bio_ethanol_baseload:
765+
x: 3200
766+
"y": 15180
755767
energy_export_bio_kerosene_backup:
756768
x: 3200
757-
"y": 14460
769+
"y": 15360
770+
energy_export_bio_kerosene_baseload:
771+
x: 3200
772+
"y": 15420
773+
energy_export_bio_pyrolysis_oil_backup:
774+
x: 3200
775+
"y": 15240
776+
energy_export_bio_pyrolysis_oil_baseload:
777+
x: 3200
778+
"y": 15300
758779
energy_export_biodiesel_backup:
759780
x: 3200
760-
"y": 14520
781+
"y": 15500
782+
energy_export_biodiesel_baseload:
783+
x: 3200
784+
"y": 15560
761785
energy_export_biomethanol_backup:
762786
x: 3200
763-
"y": 12840
787+
"y": 15620
788+
energy_export_biomethanol_baseload:
789+
x: 3200
790+
"y": 15680
764791
energy_export_bionaphtha_backup:
765792
x: 3200
766-
"y": 15180
793+
"y": 15760
794+
energy_export_bionaphtha_baseload:
795+
x: 3200
796+
"y": 15820
767797
energy_export_coal_backup:
768798
x: 3200
769799
"y": 13860
@@ -845,6 +875,9 @@ energy_export_lpg_baseload:
845875
energy_export_methanol_backup:
846876
x: 3200
847877
"y": 14400
878+
energy_export_methanol_baseload:
879+
x: 3200
880+
"y": 14460
848881
energy_export_naphtha_backup:
849882
x: 3200
850883
"y": 14640
@@ -860,6 +893,12 @@ energy_export_natural_gas_baseload:
860893
energy_export_oil_products:
861894
x: 3200
862895
"y": 14280
896+
energy_export_pyrolysis_oil_backup:
897+
x: 3200
898+
"y": 14520
899+
energy_export_pyrolysis_oil_baseload:
900+
x: 3200
901+
"y": 14580
863902
energy_export_uranium_oxide:
864903
x: 3200
865904
"y": 14220
@@ -1172,15 +1211,27 @@ energy_hydrogen_wind_turbine_offshore:
11721211
energy_import_ammonia:
11731212
x: 7700
11741213
"y": 6940
1214+
energy_import_bio_ethanol:
1215+
x: 7700
1216+
"y": 10840
1217+
energy_import_bio_kerosene:
1218+
x: 7700
1219+
"y": 10780
1220+
energy_import_bio_pyrolysis_oil_baseload:
1221+
x: 7700
1222+
"y": 11080
1223+
energy_import_biodiesel:
1224+
x: 7700
1225+
"y": 10900
11751226
energy_import_biogenic_waste:
11761227
x: 7700
11771228
"y": 6640
11781229
energy_import_biomethanol:
11791230
x: 7700
1180-
"y": 6430
1231+
"y": 11020
11811232
energy_import_bionaphtha:
11821233
x: 7700
1183-
"y": 10560
1234+
"y": 10960
11841235
energy_import_coal:
11851236
x: 7700
11861237
"y": 6160
@@ -1247,6 +1298,9 @@ energy_import_oily_biomass:
12471298
energy_import_propane:
12481299
x: 7700
12491300
"y": 6280
1301+
energy_import_pyrolysis_oil_baseload:
1302+
x: 7700
1303+
"y": 10560
12501304
energy_import_uranium_oxide:
12511305
x: 7700
12521306
"y": 5860
@@ -1344,8 +1398,8 @@ energy_interconnector_9_imported_electricity:
13441398
x: 6240
13451399
"y": 3300
13461400
energy_methanol_production_coal_gas:
1347-
x: 6380
1348-
"y": 9780
1401+
x: 6400
1402+
"y": 9960
13491403
energy_mixer_for_gas_power_fuel:
13501404
x: 6060
13511405
"y": 8800
@@ -1515,20 +1569,20 @@ energy_production_aggregator_mt_steam_hot_water:
15151569
x: 5900
15161570
"y": 6500
15171571
energy_production_bio_ethanol:
1518-
x: 7340
1519-
"y": 4220
1520-
energy_production_bio_kerosene:
1521-
x: 7340
1522-
"y": 4140
1572+
x: 6400
1573+
"y": 10840
15231574
energy_production_bio_lng:
1524-
x: 7340
1525-
"y": 4280
1575+
x: 6400
1576+
"y": 11140
15261577
energy_production_bio_oil:
1527-
x: 7340
1528-
"y": 4520
1529-
energy_production_biodiesel:
1530-
x: 7340
1531-
"y": 4440
1578+
x: 6400
1579+
"y": 11200
1580+
energy_production_bio_pyrolysis_locally_available_steam_hot_water:
1581+
x: 5580
1582+
"y": 11480
1583+
energy_production_bio_pyrolysis_locally_available_steam_hot_water_unused:
1584+
x: 5300
1585+
"y": 11540
15321586
energy_production_biogenic_waste:
15331587
x: 7700
15341588
"y": 6580
@@ -1541,45 +1595,84 @@ energy_production_dry_biomass:
15411595
energy_production_excess_electricity:
15421596
x: 7700
15431597
"y": 6700
1598+
energy_production_fischer_tropsch_biogenic_waste_ccs:
1599+
x: 6400
1600+
"y": 10480
1601+
energy_production_fischer_tropsch_dry_biomass_ccs:
1602+
x: 6400
1603+
"y": 10540
1604+
energy_production_fischer_tropsch_non_biogenic_waste_ccs:
1605+
x: 6400
1606+
"y": 10420
1607+
energy_production_fischer_tropsch_synthetic_dispatchable:
1608+
x: 6400
1609+
"y": 10300
1610+
energy_production_fischer_tropsch_synthetic_must_run:
1611+
x: 6400
1612+
"y": 10360
1613+
energy_production_fractionation_bio_pyrolysis_oil:
1614+
x: 5300
1615+
"y": 11480
1616+
energy_production_fractionation_bio_pyrolysis_oil_burner_hydrogen:
1617+
x: 5920
1618+
"y": 11480
1619+
energy_production_fractionation_pyrolysis_oil:
1620+
x: 5300
1621+
"y": 11360
1622+
energy_production_fractionation_pyrolysis_oil_burner_hydrogen:
1623+
x: 5920
1624+
"y": 11360
1625+
energy_production_fractionation_pyrolysis_oil_hydrogen:
1626+
x: 5580
1627+
"y": 11300
1628+
energy_production_hvo_bio_kerosene:
1629+
x: 6400
1630+
"y": 10900
1631+
energy_production_hvo_biodiesel:
1632+
x: 6400
1633+
"y": 10960
1634+
energy_production_methanol_synthesis_biogenic_waste_ccs:
1635+
x: 6400
1636+
"y": 10160
1637+
energy_production_methanol_synthesis_dry_biomass_ccs:
1638+
x: 6400
1639+
"y": 10220
1640+
energy_production_methanol_synthesis_non_biogenic_waste_ccs:
1641+
x: 6400
1642+
"y": 10100
1643+
energy_production_methanol_synthesis_synthetic:
1644+
x: 6400
1645+
"y": 10040
15441646
energy_production_non_biogenic_waste:
15451647
x: 7700
15461648
"y": 6520
15471649
energy_production_oily_biomass:
15481650
x: 7700
15491651
"y": 4500
1652+
energy_production_pyrolysis_biogenic:
1653+
x: 6400
1654+
"y": 10720
1655+
energy_production_pyrolysis_biogenic_waste:
1656+
x: 6680
1657+
"y": 10700
1658+
energy_production_pyrolysis_dry_biomass:
1659+
x: 6680
1660+
"y": 10760
1661+
energy_production_pyrolysis_locally_available_steam_hot_water:
1662+
x: 5580
1663+
"y": 11360
1664+
energy_production_pyrolysis_locally_available_steam_hot_water_unused:
1665+
x: 5300
1666+
"y": 11420
1667+
energy_production_pyrolysis_non_biogenic_waste:
1668+
x: 6680
1669+
"y": 10640
15501670
energy_production_solar_thermal:
15511671
x: 7200
15521672
"y": 7120
15531673
energy_production_surface_water_ambient_heat:
15541674
x: 7200
15551675
"y": 7300
1556-
energy_production_synthetic_kerosene_dispatchable:
1557-
x: 6380
1558-
"y": 9960
1559-
energy_production_synthetic_kerosene_electricity_dispatchable:
1560-
x: 6620
1561-
"y": 9920
1562-
energy_production_synthetic_kerosene_electricity_must_run:
1563-
x: 6620
1564-
"y": 10040
1565-
energy_production_synthetic_kerosene_hydrogen_non_energetic_dispatchable:
1566-
x: 6620
1567-
"y": 9980
1568-
energy_production_synthetic_kerosene_hydrogen_non_energetic_must_run:
1569-
x: 6620
1570-
"y": 10100
1571-
energy_production_synthetic_kerosene_must_run:
1572-
x: 6380
1573-
"y": 10080
1574-
energy_production_synthetic_methanol:
1575-
x: 6380
1576-
"y": 9840
1577-
energy_production_synthetic_methanol_electricity:
1578-
x: 6620
1579-
"y": 9800
1580-
energy_production_synthetic_methanol_hydrogen_non_energetic:
1581-
x: 6620
1582-
"y": 9860
15831676
energy_production_waste_water_ambient_heat:
15841677
x: 7200
15851678
"y": 7360
@@ -1595,12 +1688,6 @@ energy_regasification_lng:
15951688
energy_residual_heat:
15961689
x: 7700
15971690
"y": 5740
1598-
energy_synthetic_products_electricity:
1599-
x: 7060
1600-
"y": 9800
1601-
energy_synthetic_products_hydrogen_non_energetic:
1602-
x: 7060
1603-
"y": 9860
16041691
energy_torrefaction_wood:
16051692
x: 7340
16061693
"y": 4000

0 commit comments

Comments
 (0)