Commit 8c12ca3828c5ed2f8ab3582f400dc61e7480bb14
1 parent
b0b76147
Exists in
master
Comment or remove the duplicates.
Showing
1 changed file
with
35 additions
and
44 deletions
Show diff stats
content.yml
| ... | ... | @@ -47,13 +47,13 @@ models: |
| 47 | 47 | # The travel_emission_lerp_fit uses points instead of intervals |
| 48 | 48 | # List of (distance in km, footprint in kg) |
| 49 | 49 | points: |
| 50 | - - [ 0.0, 0.0 ] | |
| 51 | - - [ 300.0, 0.0 ] | |
| 52 | - - [ 300.0, 100.77107567722328 ] | |
| 53 | - - [ 4000.0, 866.2580844227083 ] | |
| 54 | - - [ 4000.0, 844.2034018149334 ] | |
| 55 | - - [ 25000.0, 7094.270252762378 ] | |
| 56 | - | |
| 50 | + - [ 0.0, 0.0 ] | |
| 51 | + - [ 300.0, 0.0 ] | |
| 52 | + - [ 300.1, 100.77107567722328 ] | |
| 53 | + - [ 4000.0, 866.2580844227083 ] | |
| 54 | + - [ 4000.0, 844.2034018149334 ] | |
| 55 | + - [ 25000.0, 7094.270252762378 ] | |
| 56 | + | |
| 57 | 57 | |
| 58 | 58 | - name: MyClimate (RFI=2) |
| 59 | 59 | # Slugged version of the display name above |
| ... | ... | @@ -120,33 +120,24 @@ models: |
| 120 | 120 | # The travel_emission_lerp_fit uses points instead of intervals |
| 121 | 121 | # List of (distance in km, footprint in kg) |
| 122 | 122 | points: |
| 123 | - - [ 0.0, 0.0 ] | |
| 124 | - - [ 300.0, 0.0 ] | |
| 125 | - - [ 300.0, 371.9202499999999 ] | |
| 126 | - - [ 1000.0, 572.185 ] | |
| 127 | - - [ 1000.0, 572.185 ] | |
| 128 | - - [ 2000.0, 903.7033333333331 ] | |
| 129 | - - [ 2000.0, 903.7033333333329 ] | |
| 130 | - - [ 3000.0, 1090.2199999999998 ] | |
| 131 | - - [ 3000.0, 1090.2200000000014 ] | |
| 132 | - - [ 4000.0, 1617.2800000000013 ] | |
| 133 | - - [ 4000.0, 1617.2800000000007 ] | |
| 134 | - - [ 5000.0, 2120.875 ] | |
| 135 | - - [ 5000.0, 2120.8749999999995 ] | |
| 136 | - - [ 6000.0, 2198.489999999999 ] | |
| 137 | - - [ 6000.0, 2198.4900000000007 ] | |
| 138 | - - [ 7000.0, 2274.2999999999997 ] | |
| 139 | - - [ 7000.0, 2274.2999999999993 ] | |
| 140 | - - [ 8000.0, 2599.1999999999985 ] | |
| 141 | - - [ 8000.0, 2599.2000000000007 ] | |
| 142 | - - [ 9000.0, 2745.405000000001 ] | |
| 143 | - - [ 9000.0, 2745.404999999999 ] | |
| 144 | - - [ 10000.0, 3122.6499999999987 ] | |
| 145 | - - [ 10000.0, 3122.650000000001 ] | |
| 146 | - - [ 11000.0, 3752.594999999996 ] | |
| 147 | - - [ 11000.0, 3739.599000000005 ] | |
| 148 | - - [ 20000.0, 6783.912000000004 ] | |
| 149 | - - [ 25000.0, 8475.197000000006 ] | |
| 123 | + - [ 0.0, 0.0 ] | |
| 124 | + - [ 300.0, 0.0 ] | |
| 125 | + - [ 300.1, 371.92025 ] | |
| 126 | + - [ 1000.0, 572.185 ] | |
| 127 | + - [ 2000.0, 903.70333 ] | |
| 128 | + - [ 3000.0, 1090.22 ] | |
| 129 | + - [ 4000.0, 1617.28 ] | |
| 130 | + - [ 5000.0, 2120.875 ] | |
| 131 | + - [ 6000.0, 2198.49 ] | |
| 132 | + - [ 7000.0, 2274.3 ] | |
| 133 | + - [ 8000.0, 2599.2 ] | |
| 134 | + - [ 9000.0, 2745.405 ] | |
| 135 | + - [ 10000.0, 3122.65 ] | |
| 136 | + # Not sure which is the right one | |
| 137 | +# - [ 11000.0, 3752.595 ] | |
| 138 | + - [ 11000.0, 3739.599 ] | |
| 139 | + - [ 20000.0, 6783.912 ] | |
| 140 | + - [ 25000.0, 8475.197 ] | |
| 150 | 141 | |
| 151 | 142 | |
| 152 | 143 | - name: DEFRA (RF=1.9) |
| ... | ... | @@ -179,13 +170,13 @@ models: |
| 179 | 170 | # The travel_emission_lerp_fit uses points instead of intervals |
| 180 | 171 | # List of (distance in km, footprint in kg) |
| 181 | 172 | points: |
| 182 | - - [ 0.0, 0.000000000000 ] | |
| 183 | - - [ 300.0, 0.000000000000 ] | |
| 184 | - - [ 300.0, 47.496000000000 ] | |
| 185 | - - [ 500.0, 79.160000000000 ] | |
| 186 | - - [ 500.0, 78.032326759544 ] | |
| 173 | + - [ 0.0, 0.0 ] | |
| 174 | + - [ 300.0, 0.0 ] | |
| 175 | + - [ 300.1, 47.496 ] | |
| 176 | + - [ 500.0, 79.16 ] | |
| 177 | +# - [ 500.0, 78.032326759544 ] | |
| 187 | 178 | - [ 3700.0, 576.082341595802 ] |
| 188 | - - [ 3700.0, 541.233427159656 ] | |
| 179 | +# - [ 3700.0, 541.233427159656 ] | |
| 189 | 180 | - [ 20000.0, 2878.919114979337 ] |
| 190 | 181 | - [ 25000.0, 3596.000614310528 ] |
| 191 | 182 | |
| ... | ... | @@ -219,10 +210,10 @@ models: |
| 219 | 210 | # The travel_emission_lerp_fit uses points instead of intervals |
| 220 | 211 | # List of (distance in km, footprint in kg) |
| 221 | 212 | points: |
| 222 | - - [ 0.0, 0.0000000000000 ] | |
| 223 | - - [ 300.0, 0.0000000000000 ] | |
| 224 | - - [ 300.0, 36.5684840763858 ] | |
| 225 | - - [ 2000.0, 186.8081593437083 ] | |
| 213 | + - [ 0.0, 0.0 ] | |
| 214 | + - [ 300.0, 0.0 ] | |
| 215 | + - [ 300.1, 36.5684840763858 ] | |
| 216 | +# - [ 2000.0, 186.8081593437083 ] | |
| 226 | 217 | - [ 2000.0, 202.8769421141676 ] |
| 227 | 218 | - [ 20000.0, 1291.6001262464672 ] |
| 228 | 219 | - [ 25000.0, 1594.0232329498838 ] | ... | ... |