Commit ec6183f3e65839a64843f35bd8add95b9567dc8c

Authored by Antoine Goutenoir
2 parents 62cfd7a5 6fcf820b
Exists in master

Merge branch 'master' of https://gitlab.irap.omp.eu/carbon/travel-carbon-footprint.irap.omp.eu

Showing 1 changed file with 40 additions and 32 deletions   Show diff stats
content.yml
... ... @@ -70,7 +70,7 @@ models:
70 70 - [ 19999.9, 5606.129335551792 ]
71 71 - [ 25000.0, 7094.270252762378 ]
72 72  
73   - - name: ADEME (mul. factor=2, from Carbon database)
  73 + - name: ADEME (2021, mul. factor=2, from Carbon database)
74 74 # Slugged version of the display name above
75 75 # Only lowercase alphanumeric, starting with a letter, using - as liaison
76 76 # In other words, MUST match ^[a-z]([a-z0-9-]*[a-z0-9])?$ eg: icao-with-rfi
... ... @@ -101,35 +101,36 @@ models:
101 101 # The travel_emission_lerp_fit uses points instead of intervals
102 102 # List of (distance in km, footprint in kg)
103 103 points:
104   -
105 104 - [0.0, 0.0 ]
106   - - [299.9, 0.0 ]
107   - - [300.0, 279.25625 ]
108   - - [999.9, 429.60351875000003 ]
109   - - [1000.0, 429.6249999999999 ]
110   - - [1999.9, 887.2042375 ]
111   - - [2000, 887.2499999999999 ]
112   - - [2999.9, 1051.1086125 ]
113   - - [3000, 1051.1249999999993 ]
114   - - [3999.9, 1046.0005125000005 ]
115   - - [4000, 1046.0 ]
116   - - [4999.9, 1330.8048499999998 ]
117   - - [5000, 1330.833333333333 ]
118   - - [5999.9, 1386.994383333333 ]
119   - - [6000, 1387.0000000000005 ]
120   - - [6999.9, 1475.241175 ]
121   - - [7000, 1475.2499999999998 ]
122   - - [7999.9, 1727.9747249999996 ]
123   - - [8000, 1728.0000000000014 ]
124   - - [8999.9, 2006.9721000000009 ]
125   - - [9000, 2007.0000000000005 ]
126   - - [9999.9, 2177.4829500000005 ]
127   - - [10000, 2177.499999999999 ]
128   - - [10999.9, 2414.476299999998 ]
129   - - [11000, 2414.4999999999995 ]
130   - - [19999.9, 4459.977272222222 ]
131   - - [25000.0, 5596.388888888889 ]
132   -
  105 + - [500.0, 129.0 ]
  106 + - [1000.0, 258.0 ]
  107 + - [1500.0, 280.5 ]
  108 + - [2000.0, 374.0 ]
  109 + - [2500.0, 467.5 ]
  110 + - [3000.0, 561.0 ]
  111 + - [3500.0, 654.5 ]
  112 + - [4000.0, 608.0 ]
  113 + - [5000.0, 760.0 ]
  114 + - [6000.0, 912.0 ]
  115 + - [7000.0, 1064.0 ]
  116 + - [8000.0, 1216.0 ]
  117 + - [9000.0, 1368.0 ]
  118 + - [10000.0, 1520.0 ]
  119 + - [11000.0, 1672.0 ]
  120 + - [12000.0, 1824.0 ]
  121 + - [13000.0, 1976.0 ]
  122 + - [14000.0, 2128.0 ]
  123 + - [15000.0, 2280.0 ]
  124 + - [16000.0, 2432.0 ]
  125 + - [17000.0, 2584.0 ]
  126 + - [18000.0, 2736.0 ]
  127 + - [19000.0, 2888.0 ]
  128 + - [20000.0, 3040.0 ]
  129 + - [21000.0, 3192.0 ]
  130 + - [22000.0, 3344.0 ]
  131 + - [23000.0, 3496.0 ]
  132 + - [24000.0, 3648.0 ]
  133 + - [25000.0, 3800.0 ]
133 134  
134 135  
135 136 - name: MYCLIMATE (mul. factor=2)
... ... @@ -465,6 +466,13 @@ home:
465 466 _This list is obviously not exhaustive but represents
466 467 a variety of estimates from lower to higher values._
467 468  
  469 + - title: Updating the emission factors
  470 + content: |
  471 + The emission factors will be regularly updated. In April 2021, the emission factors
  472 + from ADEME were updated. The average emission factors for short, medium, long flights
  473 + are considered. The same data are considered by the
  474 + Labos1.5 organisation (https://labos1point5.org/ges-1point5).
  475 +
468 476  
469 477 - title: How are the different methods built?
470 478 content: |
... ... @@ -614,11 +622,11 @@ home:
614 622  
615 623 - title: Reference
616 624 content: |
617   - Results from the tool may reference to [Barret (2020,
  625 + Results from the tool may reference to [Barret (2020),
618 626 Estimating, monitoring and minimizing the travel footprint
619 627 associated with the development of the Athena X-ray Integral Field Unit,
620   - An on-line travel footprint calculator released to the science community,
621   - accepted for publication in Experimental Astronomy)](https://ui.adsabs.harvard.edu/abs/2020arXiv200405603B/abstract).
  628 + An on-line travel footprint calculator released to the science community,
  629 + Experimental Astronomy, 49, 183. doi:10.1007/s10686-020-09659-8](https://ui.adsabs.harvard.edu/abs/2020arXiv200405603B/abstract).
622 630  
623 631 - title: Original motivation
624 632 content: |
... ...