Skip to content

Commit 3f538f0

Browse files
kndehaankndehaan
authored
Merge pull request #3311 from quintel/carbon-modelling
Carbon modelling improvements
2 parents c7f96a7 + 2e87775 commit 3f538f0

File tree

2,352 files changed

+17186
-5285
lines changed

Some content is hidden

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

2,352 files changed

+17186
-5285
lines changed

‎carriers/bio_pyrolysis_oil.ad‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- sustainable = 1.0
2+
- infinite = false
3+
- mj_per_kg = 14.0
4+
- kg_per_liter = 1.175
5+
- graphviz_color = green
6+
7+
~ co2_conversion_per_mj = CARRIER(bio_pyrolysis_oil, co2_conversion_per_mj)
8+
~ cost_per_mj = CARRIER(bio_pyrolysis_oil, cost_per_mj)
9+
~ potential_co2_conversion_per_mj = CARRIER(bio_pyrolysis_oil, potential_co2_conversion_per_mj)

‎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/biomethanol.ad‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- sustainable = 1.0
2+
- infinite = false
3+
- mj_per_kg = 20.0
4+
- kg_per_liter = 0.8
5+
- graphviz_color = green
6+
7+
~ co2_conversion_per_mj = CARRIER(biomethanol, co2_conversion_per_mj)
8+
~ cost_per_mj = CARRIER(biomethanol, cost_per_mj)
9+
~ potential_co2_conversion_per_mj = CARRIER(biomethanol, potential_co2_conversion_per_mj)

‎carriers/bionaphtha.ad‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- sustainable = 1.0
2+
- infinite = false
3+
- mj_per_kg = 45.0
4+
- kg_per_liter = 0.667
5+
- graphviz_color = green
6+
7+
~ co2_conversion_per_mj = CARRIER(bionaphtha, co2_conversion_per_mj)
8+
~ cost_per_mj = CARRIER(bionaphtha, cost_per_mj)
9+
~ potential_co2_conversion_per_mj = CARRIER(bionaphtha, potential_co2_conversion_per_mj)

‎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/methanol_mix.ad‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- infinite = false
2+
- graphviz_color = saddlebrown

‎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/pyrolysis_oil.ad‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
- sustainable = 0.0
2+
- infinite = false
3+
- mj_per_kg = 44.6
4+
- kg_per_liter = 0.8146
5+
- graphviz_color = saddlebrown
6+
7+
~ co2_conversion_per_mj = CARRIER(pyrolysis_oil, co2_conversion_per_mj)
8+
~ cost_per_mj = CARRIER(pyrolysis_oil, cost_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)

0 commit comments

Comments
 (0)