diff --git a/content.yml b/content.yml index f20c523..ecb61e6 100644 --- a/content.yml +++ b/content.yml @@ -70,7 +70,7 @@ models: - [ 19999.9, 5606.129335551792 ] - [ 25000.0, 7094.270252762378 ] - - name: ADEME (2023, with trail impacts) + - name: ADEME (2021, with trail impacts) # 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 @@ -102,35 +102,35 @@ models: # List of (distance in km, footprint in kg) points: - [0.0, 0.0] - - [500.0, 115.0] - - [1000.0, 230.0] - - [1500.0, 267.6] - - [2000.0, 356.8] - - [2500.0, 446.0] - - [3000.0, 535.2] - - [3500.0, 624.4] - - [4000.0, 606.6] - - [5000.0, 758.3] - - [6000.0, 910.0] - - [7000.0, 1061.6] - - [8000.0, 1213.3] - - [9000.0, 1364.9] - - [10000.0, 1516.6] - - [11000.0, 1668.3] - - [12000.0, 1819.9] - - [13000.0, 1971.6] - - [14000.0, 2123.2] - - [15000.0, 2274.9] - - [16000.0, 2426.6] - - [17000.0, 2578.2] - - [18000.0, 2729.9] - - [19000.0, 2881.5] - - [20000.0, 3033.2] - - [21000.0, 3184.9] - - [22000.0, 3336.5] - - [23000.0, 3488.2] - - [24000.0, 3639.8] - - [25000.0, 3791.5] + - [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) @@ -237,7 +237,7 @@ models: - [24000.0, 4017.0] - [25000.0, 4184.4] - - name: ADEME (2023, without the trail impacts, not recommended) + - name: ADEME (2021, without the trail impacts, not recommended) # 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 @@ -269,35 +269,35 @@ models: # List of (distance in km, footprint in kg) points: - [0.0, 0.0] - - [500.0, 63.0] - - [1000.0, 126.0] - - [1500.0, 1465.5] - - [2000.0, 1954.0] - - [2500.0, 2442.5] - - [3000.0, 2931.0] - - [3500.0, 3419.5] - - [4000.0, 332.2] - - [5000.0, 415.3] - - [6000.0, 498.4] - - [7000.0, 581.4] - - [8000.0, 664.5] - - [9000.0, 747.5] - - [10000.0, 830.6] - - [11000.0, 913.7] - - [12000.0, 996.7] - - [13000.0, 1079.8] - - [14000.0, 1162.8] - - [15000.0, 1245.9] - - [16000.0, 1329.0] - - [17000.0, 1412.0] - - [18000.0, 1495.1] - - [19000.0, 1578.1] - - [20000.0, 1661.2] - - [21000.0, 1744.3] - - [22000.0, 1827.3] - - [23000.0, 1910.4] - - [24000.0, 1993.4] - - [25000.0, 2076.5] + - [500.0, 70.5] + - [1000.0, 141.0] + - [1500.0, 154.5] + - [2000.0, 206.0] + - [2500.0, 257.5] + - [3000.0, 309.0] + - [3500.0, 360.5] + - [4000.0, 332.8] + - [5000.0, 416.0] + - [6000.0, 499.2] + - [7000.0, 582.4] + - [8000.0, 665.6] + - [9000.0, 748.8] + - [10000.0, 832.0] + - [11000.0, 915.2] + - [12000.0, 998.4] + - [13000.0, 1081.6] + - [14000.0, 1164.8] + - [15000.0, 1248.0] + - [16000.0, 1331.2] + - [17000.0, 1414.4] + - [18000.0, 1497.6] + - [19000.0, 1580.8] + - [20000.0, 1664.0] + - [21000.0, 1747.2] + - [22000.0, 1830.4] + - [23000.0, 1913.6] + - [24000.0, 1996.8] + - [25000.0, 2080.0] - name: KLM data best fit (no mul. factor, not recommended) # Slugged version of the display name above -- libgit2 0.21.2