Reordering of ADEME before myclimate

Didier BARRET
1 parent da55ef2d
Showing 1 changed file with 43 additions and 42 deletions Show diff stats
content.yml
@@ -59,48 +59,6 @@ models:
           - [ 19999.9, 5606.129335551792 ]
           - [ 25000.0, 7094.270252762378 ]
- 
-  - name: MyClimate (RFI=2)
-    # 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
-    # MUST be unique, two models MUST NOT have the same slug.
-    slug: my-climate-rfi
-    # There MUST exist a python file named like this in `flaskr/laws`
-    # And it MUST contain a class named EmissionModel
-    # Please keep this lowercased, letters-only (or I will breathe fire)
-    file: travel_emission_lerp_fit
-    # Color MUST be in the hex form, without alpha
-    color: "#99ff33"
-    # Whether this model is selected by default in the list.
-    selected: true
-    # The configuration that will be fed to the model.
-    # May be anything, really.  Go bonkers!
-    config:
-      plane_emission_linear_fit:
-        # A coefficient applied to the distance
-        connecting_flights_scale: 1.05
-        # Radiative Forcing Index
-        # Multiplier after scaling
-        # DEPRECATED
-        rfi: 1.0
-        # Flat scalar to add before scaling with laws
-        offset_before: 95
-        # Flat scalar to multiply before scaling with laws
-        scale_before: 1
-        # 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, 120.42928309599999 ]
-          - [1499.9, 278.86980907246215 ]
-          - [1500.0, 278.8830135500002 ]
-          - [2499.9, 438.3026953954595 ]
-          - [2500, 438.3186389580005 ]
-          - [19999.9, 3335.611941663665 ]
-          - [25000.0, 4163.431314509144 ]
-
   - name: ADEME (RFI=2.0)
     # Slugged version of the display name above
     # Only lowercase alphanumeric, starting with a letter, using - as liaison
@@ -162,6 +120,49 @@ models:
           - [25000.0, 5596.388888888889 ]
+ 
+  - name: MyClimate (RFI=2)
+    # 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
+    # MUST be unique, two models MUST NOT have the same slug.
+    slug: my-climate-rfi
+    # There MUST exist a python file named like this in `flaskr/laws`
+    # And it MUST contain a class named EmissionModel
+    # Please keep this lowercased, letters-only (or I will breathe fire)
+    file: travel_emission_lerp_fit
+    # Color MUST be in the hex form, without alpha
+    color: "#99ff33"
+    # Whether this model is selected by default in the list.
+    selected: true
+    # The configuration that will be fed to the model.
+    # May be anything, really.  Go bonkers!
+    config:
+      plane_emission_linear_fit:
+        # A coefficient applied to the distance
+        connecting_flights_scale: 1.05
+        # Radiative Forcing Index
+        # Multiplier after scaling
+        # DEPRECATED
+        rfi: 1.0
+        # Flat scalar to add before scaling with laws
+        offset_before: 95
+        # Flat scalar to multiply before scaling with laws
+        scale_before: 1
+        # 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, 120.42928309599999 ]
+          - [1499.9, 278.86980907246215 ]
+          - [1500.0, 278.8830135500002 ]
+          - [2499.9, 438.3026953954595 ]
+          - [2500, 438.3186389580005 ]
+          - [19999.9, 3335.611941663665 ]
+          - [25000.0, 4163.431314509144 ]
+
+
   - name: DEFRA (RFI=1.9)
     # Slugged version of the display name above
     # Only lowercase alphanumeric, starting with a letter, using - as liaison