Commit 384c85359ce51d4089ecccc0150f110785ce48cf
1 parent
8a693e06
Exists in
master
Updated coefficient to account for the jumps. Remains to be done ICAO and MyClimate.
Showing
1 changed file
with
50 additions
and
40 deletions
Show diff stats
content.yml
... | ... | @@ -50,12 +50,13 @@ models: |
50 | 50 | # The travel_emission_lerp_fit uses points instead of intervals |
51 | 51 | # List of (distance in km, footprint in kg) |
52 | 52 | points: |
53 | - - [ 0.0, 0.0 ] | |
54 | - - [ 300.0, 0.0 ] | |
55 | - - [ 300.1, 100.77107567722328 ] | |
56 | - - [ 4000.0, 866.2580844227083 ] | |
57 | - - [ 4000.0, 844.2034018149334 ] | |
58 | - - [ 25000.0, 7094.270252762378 ] | |
53 | + - [0.0, 0.0 ] | |
54 | + - [299.9, 0.0 ] | |
55 | + - [300.0, 100.77107567722328 ] | |
56 | + - [3999.9, 866.2373955846341 ] | |
57 | + - [4000.0, 844.2034018149334 ] | |
58 | + - [19999.9, 5606.129335551792 ] | |
59 | + - [25000.0, 7094.270252762378 ] | |
59 | 60 | |
60 | 61 | |
61 | 62 | - name: MyClimate (RFI=2) |
... | ... | @@ -123,24 +124,33 @@ models: |
123 | 124 | # The travel_emission_lerp_fit uses points instead of intervals |
124 | 125 | # List of (distance in km, footprint in kg) |
125 | 126 | points: |
126 | - - [ 0.0, 0.0 ] | |
127 | - - [ 300.0, 0.0 ] | |
128 | - - [ 300.1, 371.92025 ] | |
129 | - - [ 1000.0, 572.185 ] | |
130 | - - [ 2000.0, 903.70333 ] | |
131 | - - [ 3000.0, 1090.22 ] | |
132 | - - [ 4000.0, 1617.28 ] | |
133 | - - [ 5000.0, 2120.875 ] | |
134 | - - [ 6000.0, 2198.49 ] | |
135 | - - [ 7000.0, 2274.3 ] | |
136 | - - [ 8000.0, 2599.2 ] | |
137 | - - [ 9000.0, 2745.405 ] | |
138 | - - [ 10000.0, 3122.65 ] | |
139 | - # Not sure which is the right one | |
140 | -# - [ 11000.0, 3752.595 ] | |
141 | - - [ 11000.0, 3739.599 ] | |
142 | - - [ 20000.0, 6783.912 ] | |
143 | - - [ 25000.0, 8475.197 ] | |
127 | + - [0.0, 0.0 ] | |
128 | + - [299.9, 0.0 ] | |
129 | + - [300.0, 371.9202499999999 ] | |
130 | + - [999.9, 572.1563907499999 ] | |
131 | + - [1000.0, 572.1850000000001 ] | |
132 | + - [1999.9, 903.6701814999998 ] | |
133 | + - [2000, 903.7033333333329 ] | |
134 | + - [2999.9, 1090.2013483333333 ] | |
135 | + - [3000, 1090.2200000000014 ] | |
136 | + - [3999.9, 1617.2272940000014 ] | |
137 | + - [4000, 1617.2800000000007 ] | |
138 | + - [4999.9, 2120.8246405 ] | |
139 | + - [5000, 2120.8749999999995 ] | |
140 | + - [5999.9, 2198.482238499999 ] | |
141 | + - [6000, 2198.4900000000007 ] | |
142 | + - [6999.9, 2274.292419 ] | |
143 | + - [7000, 2274.2999999999993 ] | |
144 | + - [7999.9, 2599.1675099999984 ] | |
145 | + - [8000, 2599.2000000000007 ] | |
146 | + - [8999.9, 2745.390379500001 ] | |
147 | + - [9000, 2745.404999999999 ] | |
148 | + - [9999.9, 3122.6122754999988 ] | |
149 | + - [10000, 3122.650000000001 ] | |
150 | + - [10999.9, 3752.532005499996 ] | |
151 | + - [11000, 3739.599000000005 ] | |
152 | + - [19999.9, 6783.878174300005 ] | |
153 | + - [25000.0, 8475.197000000006 ] | |
144 | 154 | |
145 | 155 | |
146 | 156 | - name: DEFRA (RFI=1.9) |
... | ... | @@ -173,15 +183,15 @@ models: |
173 | 183 | # The travel_emission_lerp_fit uses points instead of intervals |
174 | 184 | # List of (distance in km, footprint in kg) |
175 | 185 | points: |
176 | - - [ 0.0, 0.0 ] | |
177 | - - [ 300.0, 0.0 ] | |
178 | - - [ 300.1, 47.496 ] | |
179 | - - [ 500.0, 79.16 ] | |
180 | -# - [ 500.0, 78.032326759544 ] | |
181 | - - [ 3700.0, 576.082341595802 ] | |
182 | -# - [ 3700.0, 541.233427159656 ] | |
183 | - - [ 20000.0, 2878.919114979337 ] | |
184 | - - [ 25000.0, 3596.000614310528 ] | |
186 | + - [0.0, 0.0 ] | |
187 | + - [299.9, 0.0 ] | |
188 | + - [300.0, 47.496000000000016 ] | |
189 | + - [499.9, 79.14416800000002 ] | |
190 | + - [500.0, 78.03232675954409 ] | |
191 | + - [3699.9, 576.0667775328388 ] | |
192 | + - [3700.0, 541.2334271596557 ] | |
193 | + - [19999.9, 2878.9047733493503 ] | |
194 | + - [25000.0, 3596.0006143105275 ] | |
185 | 195 | |
186 | 196 | - name: KLM data (no RF, not recommended) |
187 | 197 | # Slugged version of the display name above |
... | ... | @@ -213,13 +223,13 @@ models: |
213 | 223 | # The travel_emission_lerp_fit uses points instead of intervals |
214 | 224 | # List of (distance in km, footprint in kg) |
215 | 225 | points: |
216 | - - [ 0.0, 0.0 ] | |
217 | - - [ 300.0, 0.0 ] | |
218 | - - [ 300.1, 36.5684840763858 ] | |
219 | -# - [ 2000.0, 186.8081593437083 ] | |
220 | - - [ 2000.0, 202.8769421141676 ] | |
221 | - - [ 20000.0, 1291.6001262464672 ] | |
222 | - - [ 25000.0, 1594.0232329498838 ] | |
226 | + - [0.0, 0.0 ] | |
227 | + - [299.9, 0.0 ] | |
228 | + - [300.0, 41.883578628476144 ] | |
229 | + - [2499.9, 214.70184186944394 ] | |
230 | + - [2500.0, 261.6807087092951 ] | |
231 | + - [14999.9, 962.2587735768744 ] | |
232 | + - [25000.0, 1522.7313138757793 ] | |
223 | 233 | |
224 | 234 | - name: ICAO (no RF, not recommended) |
225 | 235 | # Slugged version of the display name above |
... | ... |