@open3cl/engine 1.3.8 → 1.3.10

package/14_generateur_ecs.js

@@ -14,12 +14,14 @@ import {
 } from './13.2_generateur_combustion.js';
 import { conso_aux_gen } from './15_conso_aux.js';
 import { scopOrCop } from './12.4_pac.js';
+import getFicheTechnique from './ficheTechnique.js';
 
-function tv_pertes_stockage(di, de) {
+function tv_pertes_stockage(di, de, VsCollectif) {
   let vb;
-  if (de.volume_stockage <= 100) vb = '≤ 100';
-  else if (de.volume_stockage <= 200) vb = '100 <   ≤ 200';
-  else if (de.volume_stockage <= 300) vb = '200 <   ≤ 300';
+  const Vs = VsCollectif ? VsCollectif : de.volume_stockage;
+  if (Vs <= 100) vb = '≤ 100';
+  else if (Vs <= 200) vb = '100 <   ≤ 200';
+  else if (Vs <= 300) vb = '200 <   ≤ 300';
   else vb = '> 300';
 
   let matcher = {
@@ -75,45 +77,33 @@ function tv_facteur_couverture_solaire(di, de, zc_id, th) {
   }
 }
 
-export function calc_Qdw_j(instal_ecs, becs_j) {
-  const de = instal_ecs.donnee_entree;
-  const du = instal_ecs.donnee_utilisateur || {};
-
-  const type_installation = requestInput(de, du, 'type_installation');
-
-  const Qdw_ind_vc = calc_Qdw_ind_j(instal_ecs, becs_j);
-  const Qdw_coll_vc = calc_Qdw_col_j(instal_ecs, becs_j, type_installation);
+function calc_Qgw(di, de, du, ecs_de, th, dpe) {
+  const type_stockage_ecs = requestInput(de, du, 'type_stockage_ecs');
+  const isInstCollectif = ecs_de.enum_type_installation_id !== '1';
+  const ratio = isInstCollectif ? ecs_de.ratio_virtualisation || 1 : 1;
 
-  return Qdw_ind_vc + Qdw_coll_vc;
-}
+  let Vs = requestInput(de, du, 'volume_stockage', 'float');
 
-// 15.2.3
-/**
- * @param instal_ecs {InstallationEcsItem}
- * @param becs_j {number}
- */
-export function calc_Qdw_ind_j(instal_ecs, becs_j) {
-  const Rat_ecs = instal_ecs.generateur_ecs_collection.generateur_ecs.length > 1 ? 0.5 : 1;
-  return 0.1 * Rat_ecs * becs_j;
-}
+  const gen_ecs_elec_ids = tvColumnIDs('pertes_stockage', 'type_generateur_ecs');
+  let isElectric = gen_ecs_elec_ids.includes(de.enum_type_generateur_ecs_id);
 
-export function calc_Qdw_col_j(instal_ecs, becs_j, type_installation) {
-  if (type_installation.includes('installation collective')) {
-    return 0.112 * becs_j;
+  /**
+   * Application du ratio uniquement pour les installations collectives
+   */
+  if (isInstCollectif) {
+    let fiche = getFicheTechnique(dpe, '8', 'stockage');
+    if (fiche) {
+      Vs = Number(fiche.valeur.toLowerCase().replace('l', '').replace('litres', ''));
+    }
+    if (!Vs) {
+      Vs = Number.parseFloat(Vs) / ratio;
+    }
   }
-  return 0;
-}
-
-function calc_Qgw(di, de, du, ecs_de) {
-  const type_stockage_ecs = requestInput(de, du, 'type_stockage_ecs');
-
   // stockage
   if (type_stockage_ecs === "abscence de stockage d'ecs (production instantanée)") {
     di.Qgw = 0;
     return;
   }
-  let Vs = requestInput(de, du, 'volume_stockage', 'float');
-  const gen_ecs_elec_ids = tvColumnIDs('pertes_stockage', 'type_generateur_ecs');
 
   if (bug_for_bug_compat) {
     /**
@@ -123,13 +113,11 @@ function calc_Qgw(di, de, du, ecs_de) {
      */
     const VsFromDescription = getVolumeStockageFromDescription(ecs_de.description);
 
-    if (VsFromDescription === Math.round(Number.parseFloat(Vs) / de.ratio_virtualisation)) {
+    if (VsFromDescription === Math.round(Number.parseFloat(Vs) / ratio)) {
       Vs = VsFromDescription;
     }
   }
 
-  let isElectric = gen_ecs_elec_ids.includes(de.enum_type_generateur_ecs_id);
-
   /**
    * Si le système ECS est inconnu -> on se base exclusivement sur le type d'énergie
    * enum_type_generateur_ecs_id = 84 - "système collectif par défaut en abscence d'information : chaudière fioul pénalisante"
@@ -139,11 +127,12 @@ function calc_Qgw(di, de, du, ecs_de) {
   }
 
   if (isElectric) {
-    tv_pertes_stockage(di, de, du);
-    di.Qgw = ((8592 * 45) / 24) * Vs * di.cr;
+    tv_pertes_stockage(di, de, isInstCollectif ? Vs : undefined);
+    di.Qgw = ((8592 * 45) / 24) * Vs * di.cr * ratio;
     delete di.cr;
   } else {
     di.Qgw = 67662 * Vs ** 0.55;
+    di.Qgw *= ratio;
   }
 }
 
@@ -264,14 +253,8 @@ export default function calc_gen_ecs(dpe, gen_ecs, ecs_di, ecs_de, GV, ca_id, zc
     }
   }
 
-  calc_Qgw(di, de, du, ecs_de);
+  calc_Qgw(di, de, du, ecs_de, th, dpe);
 
-  /**
-   * Application du ratio uniquement pour les installations collectives
-   */
-  if (ecs_de.enum_type_installation_id !== '1') {
-    di.Qgw *= de.ratio_virtualisation;
-  }
   let Iecs, Iecs_dep;
 
   if (isPacGenerator) {

package/README.md

@@ -167,36 +167,52 @@ deperdition_mur,
 
 Résultats des tests de corpus avec le mode de compatibilité activé.
 
-| Version librairie   | corpus                                | Nb en dessous du taux d'erreur | Taux de réussite  | Détail des valeurs                                                                                                  |
-| :------------------ | ------------------------------------- | ------------------------------ | ----------------- | ------------------------------------------------------------------------------------------------------------------- |
-| <ins>**1.2.3**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4489**<ins>             | <ins>**45%**<ins> |                                                                                                                     |
-| 1.2.3               | dpe_immeuble_chauffage_individuel.csv | 3257                           | 32%               |                                                                                                                     |
-| 1.2.3               | dpe_immeuble_chauffage_collectif.csv  | 5279                           | 53%               |                                                                                                                     |
-| 1.2.3               | dpe_immeuble_chauffage_mixte.csv      | 2728                           | 27%               |                                                                                                                     |
-| <ins>**1.2.8**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**489**<ins>              | <ins>**45%**<ins> |                                                                                                                     |
-| 1.2.8               | dpe_immeuble_chauffage_individuel.csv | 5275 (+2018)                   | 53% (+21%)        |                                                                                                                     |
-| 1.2.8               | dpe_immeuble_chauffage_collectif.csv  | 5747 (+468)                    | 57% (+4%)         |                                                                                                                     |
-| 1.2.8               | dpe_immeuble_chauffage_mixte.csv      | 3142 (+414)                    | 31% (+4%)         |                                                                                                                     |
-| <ins>**1.3.1**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4508 (+19)**<ins>       | <ins>**45%**<ins> |                                                                                                                     |
-| 1.3.1               | dpe_immeuble_chauffage_individuel.csv | 5459 (+184)                    | 55% (+2%)         |                                                                                                                     |
-| 1.3.1               | dpe_immeuble_chauffage_collectif.csv  | 5848 (+101)                    | 58% (+1%)         |                                                                                                                     |
-| 1.3.1               | dpe_immeuble_chauffage_mixte.csv      | 4018 (+876)                    | 40% (+9%)         |                                                                                                                     |
-| <ins>**1.3.2**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4519 (+11)**<ins>       | <ins>**45%**<ins> |                                                                                                                     |
-| 1.3.2               | dpe_immeuble_chauffage_individuel.csv | 5476 (+17)                     | 55%               |                                                                                                                     |
-| 1.3.2               | dpe_immeuble_chauffage_collectif.csv  | 5869 (+21)                     | 58%               |                                                                                                                     |
-| 1.3.2               | dpe_immeuble_chauffage_mixte.csv      | 4040 (+22)                     | 40%               |                                                                                                                     |
-| <ins>**1.3.5**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4522 (+3)**<ins>        | <ins>**45%**<ins> |                                                                                                                     |
-| 1.3.5               | dpe_immeuble_chauffage_individuel.csv | 5488 (+12)                     | 55%               |
-| 1.3.5               | dpe_immeuble_chauffage_collectif.csv  | 5869                           | 58%               |                                                                                                                     |
-| 1.3.5               | dpe_immeuble_chauffage_mixte.csv      | 4082 (+42)                     | 40%               |                                                                                                                     |
-| <ins>**1.3.6**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4522**<ins>             | <ins>**45%**<ins> |                                                                                                                     |
-| 1.3.6               | dpe_immeuble_chauffage_individuel.csv | 5650 (+162)                    | 56%               |                                                                                                                     |
-| 1.3.6               | dpe_immeuble_chauffage_collectif.csv  | 5894 (+25)                     | 59% (+1%)         |                                                                                                                     |
-| 1.3.6               | dpe_immeuble_chauffage_mixte.csv      | 4141 (+59)                     | 41% (+1%)         |                                                                                                                     |
-| <ins>**1.3.7**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4522**<ins>             | <ins>**45%**<ins> | [Voir le détail](https://open3cl.github.io/engine/reports/corpus?corpus_file=corpus_dpe.csv)                        |
-| 1.3.7               | dpe_immeuble_chauffage_individuel.csv | 6960 (+1310)                   | 69% (+13%)        | [Voir le détail](https://open3cl.github.io/engine/reports/corpus?corpus_file=dpe_immeuble_chauffage_individuel.csv) |
-| 1.3.7               | dpe_immeuble_chauffage_collectif.csv  | 6106 (+212)                    | 61% (+2%)         | [Voir le détail](https://open3cl.github.io/engine/reports/corpus?corpus_file=dpe_immeuble_chauffage_collectif.csv)  |
-| 1.3.7               | dpe_immeuble_chauffage_mixte.csv      | 4730 (+589)                    | 47% (+6%)         | [Voir le détail](https://open3cl.github.io/engine/reports/corpus?corpus_file=dpe_immeuble_chauffage_mixte.csv)      |
+<details>
+<summary>Voir les versions précédents</summary>
+
+| Version librairie   | corpus                                | Nb en dessous du taux d'erreur | Taux de réussite  | Description | Détail des valeurs |
+| :------------------ | ------------------------------------- | ------------------------------ | ----------------- | ----------- | ------------------ |
+| <ins>**1.2.3**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4489**<ins>             | <ins>**45%**<ins> |             |                    |
+| 1.2.3               | dpe_immeuble_chauffage_individuel.csv | 3257                           | 32%               |             |                    |
+| 1.2.3               | dpe_immeuble_chauffage_collectif.csv  | 5279                           | 53%               |             |                    |
+| 1.2.3               | dpe_immeuble_chauffage_mixte.csv      | 2728                           | 27%               |             |                    |
+| <ins>**1.2.8**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**489**<ins>              | <ins>**45%**<ins> |             |                    |
+| 1.2.8               | dpe_immeuble_chauffage_individuel.csv | 5275 (+2018)                   | 53% (+21%)        |             |                    |
+| 1.2.8               | dpe_immeuble_chauffage_collectif.csv  | 5747 (+468)                    | 57% (+4%)         |             |                    |
+| 1.2.8               | dpe_immeuble_chauffage_mixte.csv      | 3142 (+414)                    | 31% (+4%)         |             |                    |
+| <ins>**1.3.1**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4508 (+19)**<ins>       | <ins>**45%**<ins> |             |                    |
+| 1.3.1               | dpe_immeuble_chauffage_individuel.csv | 5459 (+184)                    | 55% (+2%)         |             |                    |
+| 1.3.1               | dpe_immeuble_chauffage_collectif.csv  | 5848 (+101)                    | 58% (+1%)         |             |                    |
+| 1.3.1               | dpe_immeuble_chauffage_mixte.csv      | 4018 (+876)                    | 40% (+9%)         |             |                    |
+| <ins>**1.3.2**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4519 (+11)**<ins>       | <ins>**45%**<ins> |             |                    |
+| 1.3.2               | dpe_immeuble_chauffage_individuel.csv | 5476 (+17)                     | 55%               |             |                    |
+| 1.3.2               | dpe_immeuble_chauffage_collectif.csv  | 5869 (+21)                     | 58%               |             |                    |
+| 1.3.2               | dpe_immeuble_chauffage_mixte.csv      | 4040 (+22)                     | 40%               |             |                    |
+| <ins>**1.3.5**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4522 (+3)**<ins>        | <ins>**45%**<ins> |             |                    |
+| 1.3.5               | dpe_immeuble_chauffage_individuel.csv | 5488 (+12)                     | 55%               |             |
+| 1.3.5               | dpe_immeuble_chauffage_collectif.csv  | 5869                           | 58%               |             |                    |
+| 1.3.5               | dpe_immeuble_chauffage_mixte.csv      | 4082 (+42)                     | 40%               |             |                    |
+| <ins>**1.3.6**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4522**<ins>             | <ins>**45%**<ins> |             |                    |
+| 1.3.6               | dpe_immeuble_chauffage_individuel.csv | 5650 (+162)                    | 56%               |             |                    |
+| 1.3.6               | dpe_immeuble_chauffage_collectif.csv  | 5894 (+25)                     | 59% (+1%)         |             |                    |
+| 1.3.6               | dpe_immeuble_chauffage_mixte.csv      | 4141 (+59)                     | 41% (+1%)         |             |                    |
+| <ins>**1.3.7**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4522**<ins>             | <ins>**45%**<ins> |             |                    |
+| 1.3.7               | dpe_immeuble_chauffage_individuel.csv | 6960 (+1310)                   | 69% (+13%)        |             |                    |
+| 1.3.7               | dpe_immeuble_chauffage_collectif.csv  | 6106 (+212)                    | 61% (+2%)         |             |                    |
+| 1.3.7               | dpe_immeuble_chauffage_mixte.csv      | 4730 (+589)                    | 47% (+6%)         |             |                    |
+
+</details>
+
+| Version librairie   | corpus                                | Nb en dessous du taux d'erreur | Taux de réussite        | Description                                       | Détail des valeurs                                                                                                  |
+| :------------------ | ------------------------------------- | ------------------------------ | ----------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| <ins>**1.3.8**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4522**<ins>             | <ins>**45%**<ins>       |                                                   |                                                                                                                     |
+| 1.3.8               | dpe_immeuble_chauffage_individuel.csv | 6965 (+5)                      | 69%                     |                                                   |                                                                                                                     |
+| 1.3.8               | dpe_immeuble_chauffage_collectif.csv  | 6110 (+4)                      | 61%                     |                                                   |                                                                                                                     |
+| 1.3.8               | dpe_immeuble_chauffage_mixte.csv      | 4735 (+5)                      | 47%                     |                                                   |                                                                                                                     |
+| <ins>**1.3.9**<ins> | <ins>**corpus_dpe.csv**<ins>          | <ins>**4460**<ins> (-62)       | <ins>**44% (-1%)**<ins> | Pertes liés au fix bug tribu zone 2hd valeur dh19 | [Voir le détail](https://open3cl.github.io/engine/reports/corpus?corpus_file=corpus_dpe.csv)                        |
+| 1.3.9               | dpe_immeuble_chauffage_individuel.csv | 6901 (-64)                     | 69%                     | Pertes liés au fix bug tribu zone 2hd valeur dh19 | [Voir le détail](https://open3cl.github.io/engine/reports/corpus?corpus_file=dpe_immeuble_chauffage_individuel.csv) |
+| 1.3.9               | dpe_immeuble_chauffage_collectif.csv  | 6058 (-58)                     | 60% (-1%)               | Pertes liés au fix bug tribu zone 2hd valeur dh19 | [Voir le détail](https://open3cl.github.io/engine/reports/corpus?corpus_file=dpe_immeuble_chauffage_collectif.csv)  |
+| 1.3.9               | dpe_immeuble_chauffage_mixte.csv      | 4728 (-7)                      | 47%                     | Pertes liés au fix bug tribu zone 2hd valeur dh19 | [Voir le détail](https://open3cl.github.io/engine/reports/corpus?corpus_file=dpe_immeuble_chauffage_mixte.csv)      |
 
 ## Roadmap
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open3cl/engine",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "Open Source 3CL-DPE engine",
   "main": "index.js",
   "directories": {

package/tv.js

@@ -83892,7 +83892,7 @@ export const tvs = {
       }
     }
   },
-  "dh19": {
+  "dh19_legacy": {
     "0": {
       "inférieur à 400m": {
         "Janvier": {
@@ -84630,6 +84630,744 @@ export const tvs = {
       }
     }
   },
+  "dh19": {
+    "0": {
+      "inférieur à 400m": {
+        "Janvier": {
+          "h1a": 11712.4,
+          "h1b": 10180.7,
+          "h1c": 10855.3,
+          "h2a": 9307.3,
+          "h2b": 9119.8,
+          "h2c": 9812.8,
+          "h2d": 10042,
+          "h3": 9264.6
+        },
+        "Février": {
+          "h1a": 9966.8,
+          "h1b": 8874.7,
+          "h1c": 9690.3,
+          "h2a": 9402.9,
+          "h2b": 9503.7,
+          "h2c": 7883.1,
+          "h2d": 8913.2,
+          "h3": 6041.6
+        },
+        "Mars": {
+          "h1a": 7922.7,
+          "h1b": 8207.7,
+          "h1c": 7369.8,
+          "h2a": 7252.2,
+          "h2b": 7178,
+          "h2c": 6489.1,
+          "h2d": 6834.6,
+          "h3": 6118.4
+        },
+        "Avril": {
+          "h1a": 5877.4,
+          "h1b": 5914.4,
+          "h1c": 5072.2,
+          "h2a": 5896.3,
+          "h2b": 5583.5,
+          "h2c": 4888,
+          "h2d": 4193,
+          "h3": 3445.8
+        },
+        "Mai": {
+          "h1a": 2762,
+          "h1b": 3555.9,
+          "h1c": 2340.3,
+          "h2a": 3619.8,
+          "h2b": 3506.8,
+          "h2c": 121.4,
+          "h2d": 877.2,
+          "h3": 0
+        },
+        "Juin": {
+          "h1a": 0,
+          "h1b": 104.7,
+          "h1c": 410,
+          "h2a": 880.2,
+          "h2b": 824,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Juillet": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Aout": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Septembre": {
+          "h1a": 2264.1,
+          "h1b": 215.8,
+          "h1c": 0,
+          "h2a": 1608.5,
+          "h2b": 0,
+          "h2c": 1388.2,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Octobre": {
+          "h1a": 3645.4,
+          "h1b": 4109.7,
+          "h1c": 3330.7,
+          "h2a": 4334.8,
+          "h2b": 3722,
+          "h2c": 2804.7,
+          "h2d": 1788.4,
+          "h3": 911.8
+        },
+        "Novembre": {
+          "h1a": 6861,
+          "h1b": 8473.8,
+          "h1c": 7720,
+          "h2a": 6404,
+          "h2b": 7387.1,
+          "h2c": 6725.2,
+          "h2d": 6851.3,
+          "h3": 6044.6
+        },
+        "Décembre": {
+          "h1a": 9573.3,
+          "h1b": 10452.5,
+          "h1c": 10884.4,
+          "h2a": 8679.6,
+          "h2b": 9081,
+          "h2c": 9535.9,
+          "h2d": 9539.4,
+          "h3": 7659.1
+        }
+      },
+      "400-800m": {
+        "Janvier": {
+          "h1a": 13200.4,
+          "h1b": 11668.7,
+          "h1c": 12341.2,
+          "h2a": 10795.3,
+          "h2b": 10607.8,
+          "h2c": 11300.8,
+          "h2d": 11520.5,
+          "h3": 10752.6
+        },
+        "Février": {
+          "h1a": 11310.8,
+          "h1b": 10218.7,
+          "h1c": 11034.3,
+          "h2a": 10746.9,
+          "h2b": 10847.7,
+          "h2c": 9225,
+          "h2d": 10257.2,
+          "h3": 7375.6
+        },
+        "Mars": {
+          "h1a": 9402.4,
+          "h1b": 9689.8,
+          "h1c": 8843.1,
+          "h2a": 8719.6,
+          "h2b": 8657.9,
+          "h2c": 7919.8,
+          "h2d": 8257.8,
+          "h3": 7568.3
+        },
+        "Avril": {
+          "h1a": 7283.3,
+          "h1b": 7285,
+          "h1c": 6396.5,
+          "h2a": 7309.9,
+          "h2b": 6967.5,
+          "h2c": 6225.4,
+          "h2d": 5355.9,
+          "h3": 4804.5
+        },
+        "Mai": {
+          "h1a": 4359.2,
+          "h1b": 4759.3,
+          "h1c": 3424.8,
+          "h2a": 4964.6,
+          "h2b": 4732.4,
+          "h2c": 1748.7,
+          "h2d": 2038.1,
+          "h3": 0
+        },
+        "Juin": {
+          "h1a": 2644,
+          "h1b": 152.7,
+          "h1c": 2088.6,
+          "h2a": 1396.7,
+          "h2b": 1309.3,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Juillet": {
+          "h1a": 1025.7,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Aout": {
+          "h1a": 1095.6,
+          "h1b": 588.9,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Septembre": {
+          "h1a": 4046.6,
+          "h1b": 4119.6,
+          "h1c": 1398.1,
+          "h2a": 2390.1,
+          "h2b": 2056.2,
+          "h2c": 1887.2,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Octobre": {
+          "h1a": 4977.9,
+          "h1b": 5278.8,
+          "h1c": 5280.4,
+          "h2a": 5770.5,
+          "h2b": 5365.9,
+          "h2c": 3962.5,
+          "h2d": 4000.2,
+          "h3": 1871.3
+        },
+        "Novembre": {
+          "h1a": 8298.6,
+          "h1b": 9913.8,
+          "h1c": 9154.2,
+          "h2a": 7844,
+          "h2b": 8822,
+          "h2c": 8128.7,
+          "h2d": 8239.6,
+          "h3": 7441.6
+        },
+        "Décembre": {
+          "h1a": 11061.3,
+          "h1b": 11940.5,
+          "h1c": 12372.4,
+          "h2a": 10167.6,
+          "h2b": 10569,
+          "h2c": 11023.9,
+          "h2d": 11019.9,
+          "h3": 9142.7
+        }
+      },
+      "supérieur à 800m": {
+        "Janvier": {
+          "h1a": 0,
+          "h1b": 13156.7,
+          "h1c": 13829.2,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 12788.8,
+          "h2d": 13007.7,
+          "h3": 12240.6
+        },
+        "Février": {
+          "h1a": 0,
+          "h1b": 11562.7,
+          "h1c": 12378.3,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 10569,
+          "h2d": 11601.2,
+          "h3": 8719.2
+        },
+        "Mars": {
+          "h1a": 0,
+          "h1b": 11177.8,
+          "h1c": 10330.9,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 9385.1,
+          "h2d": 9710.8,
+          "h3": 9039.1
+        },
+        "Avril": {
+          "h1a": 0,
+          "h1b": 8706.2,
+          "h1c": 7787,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 7623.4,
+          "h2d": 6609.3,
+          "h3": 6188
+        },
+        "Mai": {
+          "h1a": 0,
+          "h1b": 6074.9,
+          "h1c": 4637.2,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 4719.7,
+          "h2d": 4682.4,
+          "h3": 3085.5
+        },
+        "Juin": {
+          "h1a": 0,
+          "h1b": 2889.6,
+          "h1c": 2989.4,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 1577.8,
+          "h2d": 0,
+          "h3": 912.6
+        },
+        "Juillet": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Aout": {
+          "h1a": 0,
+          "h1b": 810.3,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Septembre": {
+          "h1a": 0,
+          "h1b": 4600.9,
+          "h1c": 3576,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 2611.9,
+          "h2d": 1345.3,
+          "h3": 0
+        },
+        "Octobre": {
+          "h1a": 0,
+          "h1b": 6562.7,
+          "h1c": 6634.5,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 5232.2,
+          "h2d": 4795.3,
+          "h3": 4431
+        },
+        "Novembre": {
+          "h1a": 0,
+          "h1b": 11353.8,
+          "h1c": 10593.5,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 9558,
+          "h2d": 9658.1,
+          "h3": 8871
+        },
+        "Décembre": {
+          "h1a": 0,
+          "h1b": 13428.5,
+          "h1c": 13860.4,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 12511.9,
+          "h2d": 12508.2,
+          "h3": 10630.7
+        }
+      }
+    },
+    "1": {
+      "inférieur à 400m": {
+        "Janvier": {
+          "h1a": 11712.4,
+          "h1b": 10180.7,
+          "h1c": 10855.3,
+          "h2a": 9307.3,
+          "h2b": 9119.8,
+          "h2c": 9812.8,
+          "h2d": 10042,
+          "h3": 9264.6
+        },
+        "Février": {
+          "h1a": 9966.8,
+          "h1b": 8874.7,
+          "h1c": 9690.3,
+          "h2a": 9402.9,
+          "h2b": 9503.7,
+          "h2c": 7883.1,
+          "h2d": 8913.2,
+          "h3": 6041.6
+        },
+        "Mars": {
+          "h1a": 7922.7,
+          "h1b": 8207.7,
+          "h1c": 7369.8,
+          "h2a": 7252.2,
+          "h2b": 7178,
+          "h2c": 6489.1,
+          "h2d": 6834.6,
+          "h3": 6118.4
+        },
+        "Avril": {
+          "h1a": 5877.4,
+          "h1b": 5914.4,
+          "h1c": 5072.2,
+          "h2a": 5896.3,
+          "h2b": 5583.5,
+          "h2c": 3120.2,
+          "h2d": 3813.8,
+          "h3": 2469.9
+        },
+        "Mai": {
+          "h1a": 1069.9,
+          "h1b": 2174.8,
+          "h1c": 1543.9,
+          "h2a": 3070,
+          "h2b": 3027.1,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Juin": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Juillet": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Aout": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Septembre": {
+          "h1a": 740.6,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Octobre": {
+          "h1a": 3645.4,
+          "h1b": 3218.1,
+          "h1c": 1865.2,
+          "h2a": 4227.7,
+          "h2b": 2055.7,
+          "h2c": 2791.8,
+          "h2d": 370,
+          "h3": 0
+        },
+        "Novembre": {
+          "h1a": 6861,
+          "h1b": 8473.8,
+          "h1c": 7720,
+          "h2a": 6404,
+          "h2b": 7387.1,
+          "h2c": 6725.2,
+          "h2d": 6851.3,
+          "h3": 5536.8
+        },
+        "Décembre": {
+          "h1a": 9573.3,
+          "h1b": 10452.5,
+          "h1c": 10884.4,
+          "h2a": 8679.6,
+          "h2b": 9081,
+          "h2c": 9535.9,
+          "h2d": 9539.4,
+          "h3": 7659.1
+        }
+      },
+      "400-800m": {
+        "Janvier": {
+          "h1a": 13200.4,
+          "h1b": 11668.7,
+          "h1c": 12341.2,
+          "h2a": 10795.3,
+          "h2b": 10607.8,
+          "h2c": 11300.8,
+          "h2d": 11520.5,
+          "h3": 10752.6
+        },
+        "Février": {
+          "h1a": 11310.8,
+          "h1b": 10218.7,
+          "h1c": 11034.3,
+          "h2a": 10746.9,
+          "h2b": 10847.7,
+          "h2c": 9225,
+          "h2d": 10257.2,
+          "h3": 7375.6
+        },
+        "Mars": {
+          "h1a": 9402.4,
+          "h1b": 9689.8,
+          "h1c": 8843.1,
+          "h2a": 8719.6,
+          "h2b": 8657.9,
+          "h2c": 7919.8,
+          "h2d": 8257.8,
+          "h3": 7568.3
+        },
+        "Avril": {
+          "h1a": 7283.3,
+          "h1b": 7285,
+          "h1c": 6396.5,
+          "h2a": 7309.9,
+          "h2b": 6967.5,
+          "h2c": 6225.4,
+          "h2d": 5355.9,
+          "h3": 3284.2
+        },
+        "Mai": {
+          "h1a": 4359.2,
+          "h1b": 2826.2,
+          "h1c": 3424.8,
+          "h2a": 4465,
+          "h2b": 4254.8,
+          "h2c": 1907.2,
+          "h2d": 69.5,
+          "h3": 0
+        },
+        "Juin": {
+          "h1a": 1795.8,
+          "h1b": 0,
+          "h1c": 729.2,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Juillet": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Aout": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Septembre": {
+          "h1a": 3385.3,
+          "h1b": 2766.9,
+          "h1c": 1458,
+          "h2a": 442.1,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Octobre": {
+          "h1a": 4977.9,
+          "h1b": 5278.8,
+          "h1c": 5280.4,
+          "h2a": 5770.5,
+          "h2b": 5365.9,
+          "h2c": 3925.9,
+          "h2d": 2673.9,
+          "h3": 151.2
+        },
+        "Novembre": {
+          "h1a": 8298.6,
+          "h1b": 9913.8,
+          "h1c": 9154.2,
+          "h2a": 7844,
+          "h2b": 8822,
+          "h2c": 8128.7,
+          "h2d": 8239.6,
+          "h3": 7441.6
+        },
+        "Décembre": {
+          "h1a": 11061.3,
+          "h1b": 11940.5,
+          "h1c": 12372.4,
+          "h2a": 10167.6,
+          "h2b": 10569,
+          "h2c": 11023.9,
+          "h2d": 11019.9,
+          "h3": 9142.7
+        }
+      },
+      "supérieur à 800m": {
+        "Janvier": {
+          "h1a": 0,
+          "h1b": 13156.7,
+          "h1c": 13829.2,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 12788.8,
+          "h2d": 13007.7,
+          "h3": 12240.6
+        },
+        "Février": {
+          "h1a": 0,
+          "h1b": 11562.7,
+          "h1c": 12378.3,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 10569,
+          "h2d": 11601.2,
+          "h3": 8719.2
+        },
+        "Mars": {
+          "h1a": 0,
+          "h1b": 11177.8,
+          "h1c": 10330.9,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 9385.1,
+          "h2d": 9710.8,
+          "h3": 9039.1
+        },
+        "Avril": {
+          "h1a": 0,
+          "h1b": 7551.9,
+          "h1c": 7787,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 7623.4,
+          "h2d": 6609.3,
+          "h3": 6188
+        },
+        "Mai": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 4637.2,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 4719.7,
+          "h2d": 4291,
+          "h3": 2768.5
+        },
+        "Juin": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 748.3,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 249,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Juillet": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Aout": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 0,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 0,
+          "h2d": 0,
+          "h3": 0
+        },
+        "Septembre": {
+          "h1a": 0,
+          "h1b": 0,
+          "h1c": 1612.4,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 431,
+          "h2d": 1585,
+          "h3": 0
+        },
+        "Octobre": {
+          "h1a": 0,
+          "h1b": 5281.6,
+          "h1c": 6634.5,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 5232.2,
+          "h2d": 4795.3,
+          "h3": 0
+        },
+        "Novembre": {
+          "h1a": 0,
+          "h1b": 11353.8,
+          "h1c": 10593.5,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 9558,
+          "h2d": 9658.1,
+          "h3": 8442.5
+        },
+        "Décembre": {
+          "h1a": 0,
+          "h1b": 13428.5,
+          "h1c": 13860.4,
+          "h2a": 0,
+          "h2b": 0,
+          "h2c": 12511.9,
+          "h2d": 12508.2,
+          "h3": 10630.7
+        }
+      }
+    }
+  },
   "dh21": {
     "0": {
       "inférieur à 400m": {