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

Antoine Goutenoir
2 parents 62cfd7a5 6fcf820b
Showing 1 changed file with 40 additions and 32 deletions Show diff stats
content.yml
@@ -70,7 +70,7 @@ models:
           - [ 19999.9, 5606.129335551792 ]
           - [ 25000.0, 7094.270252762378 ]
-  - name: ADEME (mul. factor=2, from Carbon database)
+  - name: ADEME (2021, mul. factor=2, from Carbon database)
     # Slugged version of the display name above
     # Only lowercase alphanumeric, starting with a letter, using - as liaison
     # In other words, MUST match ^[a-z]([a-z0-9-]*[a-z0-9])?$ eg: icao-with-rfi
@@ -101,35 +101,36 @@ models:
         # The travel_emission_lerp_fit uses points instead of intervals
         # List of (distance in km, footprint in kg)
         points:
-
           - [0.0, 0.0 ]
-          - [299.9, 0.0 ]
-          - [300.0, 279.25625 ]
-          - [999.9, 429.60351875000003 ]
-          - [1000.0, 429.6249999999999 ]
-          - [1999.9, 887.2042375 ]
-          - [2000, 887.2499999999999 ]
-          - [2999.9, 1051.1086125 ]
-          - [3000, 1051.1249999999993 ]
-          - [3999.9, 1046.0005125000005 ]
-          - [4000, 1046.0 ]
-          - [4999.9, 1330.8048499999998 ]
-          - [5000, 1330.833333333333 ]
-          - [5999.9, 1386.994383333333 ]
-          - [6000, 1387.0000000000005 ]
-          - [6999.9, 1475.241175 ]
-          - [7000, 1475.2499999999998 ]
-          - [7999.9, 1727.9747249999996 ]
-          - [8000, 1728.0000000000014 ]
-          - [8999.9, 2006.9721000000009 ]
-          - [9000, 2007.0000000000005 ]
-          - [9999.9, 2177.4829500000005 ]
-          - [10000, 2177.499999999999 ]
-          - [10999.9, 2414.476299999998 ]
-          - [11000, 2414.4999999999995 ]
-          - [19999.9, 4459.977272222222 ]
-          - [25000.0, 5596.388888888889 ]
-
+          - [500.0, 129.0 ]
+          - [1000.0, 258.0 ]
+          - [1500.0, 280.5 ]
+          - [2000.0, 374.0 ]
+          - [2500.0, 467.5 ]
+          - [3000.0, 561.0 ]
+          - [3500.0, 654.5 ]
+          - [4000.0, 608.0 ]
+          - [5000.0, 760.0 ]
+          - [6000.0, 912.0 ]
+          - [7000.0, 1064.0 ]
+          - [8000.0, 1216.0 ]
+          - [9000.0, 1368.0 ]
+          - [10000.0, 1520.0 ]
+          - [11000.0, 1672.0 ]
+          - [12000.0, 1824.0 ]
+          - [13000.0, 1976.0 ]
+          - [14000.0, 2128.0 ]
+          - [15000.0, 2280.0 ]
+          - [16000.0, 2432.0 ]
+          - [17000.0, 2584.0 ]
+          - [18000.0, 2736.0 ]
+          - [19000.0, 2888.0 ]
+          - [20000.0, 3040.0 ]
+          - [21000.0, 3192.0 ]
+          - [22000.0, 3344.0 ]
+          - [23000.0, 3496.0 ]
+          - [24000.0, 3648.0 ]
+          - [25000.0, 3800.0 ]
   - name: MYCLIMATE (mul. factor=2)
@@ -465,6 +466,13 @@ home:
           _This list is obviously not exhaustive but represents
           a variety of estimates from lower to higher values._
+      - title: Updating the emission factors 
+        content: |
+          The emission factors will be regularly updated. In April 2021, the emission factors 
+          from ADEME were updated. The average emission factors for short, medium, long flights 
+          are considered. The same data are considered by the 
+          Labos1.5 organisation (https://labos1point5.org/ges-1point5).
+
       - title: How are the different methods built? 
         content: |
@@ -614,11 +622,11 @@ home:
       - title: Reference
         content: |
-          Results from the tool may reference to [Barret (2020,
+          Results from the tool may reference to [Barret (2020),
           Estimating, monitoring and minimizing the travel footprint 
           associated with the development of the Athena X-ray Integral Field Unit,
-          An on-line travel footprint calculator released to the science community,
-          accepted for publication in Experimental Astronomy)](https://ui.adsabs.harvard.edu/abs/2020arXiv200405603B/abstract).
+          An on-line travel footprint calculator released to the science community, 
+          Experimental Astronomy, 49, 183. doi:10.1007/s10686-020-09659-8](https://ui.adsabs.harvard.edu/abs/2020arXiv200405603B/abstract).
       - title: Original motivation
         content: |