carbon / travel-carbon-footprint.irap.omp.eu

Commit 1bdf58ebb6b291746461993e4e552526b967f93d

Authored by Antoine Goutenoir
1 parent c0e54666
Exists in master

Review the new ICAO model.

Showing 1 changed file with 7 additions and 6 deletions   Show diff stats
Inline Side-by-side
@@ -28,7 +28,7 @@ models: @@ -28,7 +28,7 @@ models:
28 # Please keep this lowercased, letters-only (or I will breathe fire) 28 # Please keep this lowercased, letters-only (or I will breathe fire)
29 file: travel_emission_lerp_fit 29 file: travel_emission_lerp_fit
30 # Color MUST be in the hex form, without alpha 30 # Color MUST be in the hex form, without alpha
31 - color: "#ff9933" 31 + color: "#99ff33"
32 # The configuration that will be fed to the model. 32 # The configuration that will be fed to the model.
33 # May be anything, really. Go bonkers! 33 # May be anything, really. Go bonkers!
34 config: 34 config:
@@ -49,6 +49,7 @@ models: @@ -49,6 +49,7 @@ models:
49 - [ 1500.0, 278.88301355 ] 49 - [ 1500.0, 278.88301355 ]
50 - [ 2500.0, 438.31863895 ] 50 - [ 2500.0, 438.31863895 ]
51 - [ 20000.0, 3335.62849772 ] 51 - [ 20000.0, 3335.62849772 ]
  52 +
52 - name: MyClimate with RFI=1.9 53 - name: MyClimate with RFI=1.9
53 # Slugged version of the display name above 54 # Slugged version of the display name above
54 # Only lowercase alphanumeric, starting with a letter, using - as liaison 55 # Only lowercase alphanumeric, starting with a letter, using - as liaison
@@ -93,7 +94,7 @@ models: @@ -93,7 +94,7 @@ models:
93 # Please keep this lowercased, letters-only (or I will breathe fire) 94 # Please keep this lowercased, letters-only (or I will breathe fire)
94 file: travel_emission_lerp_fit 95 file: travel_emission_lerp_fit
95 # Color MUST be in the hex form, without alpha 96 # Color MUST be in the hex form, without alpha
96 - color: "#ff9934" 97 + color: "#9933ff"
97 # The configuration that will be fed to the model. 98 # The configuration that will be fed to the model.
98 # May be anything, really. Go bonkers! 99 # May be anything, really. Go bonkers!
99 config: 100 config:
@@ -108,11 +109,11 @@ models: @@ -108,11 +109,11 @@ models:
108 # Flat scalar to multiply before scaling with laws 109 # Flat scalar to multiply before scaling with laws
109 scale_before: 1 110 scale_before: 1
110 # The travel_emission_lerp_fit uses points instead of intervals 111 # The travel_emission_lerp_fit uses points instead of intervals
111 - # List of (distance in km, footprint in ??) 112 + # List of (distance in km, footprint in kg)
112 points: 113 points:
113 - - [0.0, 4.5735209613707415 ]  
114 - - [500.0, 84.22292312970939 ]  
115 - - [3000.0, 223.78236761444174 ] 114 + - [ 0.0, 4.5735209613707 ]
  115 + - [ 500.0, 84.2229231297094 ]
  116 + - [ 3000.0, 223.7823676144418 ]
116 - [ 25000.0, 1033.0117495994948 ] 117 - [ 25000.0, 1033.0117495994948 ]
117 118
118 # The content is Markdown. HTML is also allowed. 119 # The content is Markdown. HTML is also allowed.