From 181082652a20b0d6a9e51d827f32d47a281f299b Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Wed, 23 Oct 2019 13:05:24 +0200
Subject: [PATCH] [all] add cpu_core_numbering

---
 .../grenoble/clusters/dahu/nodes/dahu-1.json  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-10.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-11.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-12.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-13.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-14.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-15.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-16.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-17.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-18.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-19.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-2.json  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-20.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-21.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-22.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-23.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-24.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-25.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-26.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-27.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-28.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-29.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-3.json  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-30.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-31.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-32.json |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-4.json  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-5.json  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-6.json  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-7.json  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-8.json  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-9.json  |  1 +
 .../grenoble/clusters/yeti/nodes/yeti-1.json  |  1 +
 .../grenoble/clusters/yeti/nodes/yeti-2.json  |  1 +
 .../grenoble/clusters/yeti/nodes/yeti-3.json  |  1 +
 .../grenoble/clusters/yeti/nodes/yeti-4.json  |  1 +
 .../clusters/chetemi/nodes/chetemi-1.json     |  1 +
 .../clusters/chetemi/nodes/chetemi-10.json    |  1 +
 .../clusters/chetemi/nodes/chetemi-11.json    |  1 +
 .../clusters/chetemi/nodes/chetemi-12.json    |  1 +
 .../clusters/chetemi/nodes/chetemi-13.json    |  1 +
 .../clusters/chetemi/nodes/chetemi-14.json    |  1 +
 .../clusters/chetemi/nodes/chetemi-15.json    |  1 +
 .../clusters/chetemi/nodes/chetemi-2.json     |  1 +
 .../clusters/chetemi/nodes/chetemi-3.json     |  1 +
 .../clusters/chetemi/nodes/chetemi-4.json     |  1 +
 .../clusters/chetemi/nodes/chetemi-5.json     |  1 +
 .../clusters/chetemi/nodes/chetemi-6.json     |  1 +
 .../clusters/chetemi/nodes/chetemi-7.json     |  1 +
 .../clusters/chetemi/nodes/chetemi-8.json     |  1 +
 .../clusters/chetemi/nodes/chetemi-9.json     |  1 +
 .../clusters/chiclet/nodes/chiclet-1.json     |  1 +
 .../clusters/chiclet/nodes/chiclet-2.json     |  1 +
 .../clusters/chiclet/nodes/chiclet-3.json     |  1 +
 .../clusters/chiclet/nodes/chiclet-4.json     |  1 +
 .../clusters/chiclet/nodes/chiclet-5.json     |  1 +
 .../clusters/chiclet/nodes/chiclet-6.json     |  1 +
 .../clusters/chiclet/nodes/chiclet-7.json     |  1 +
 .../clusters/chiclet/nodes/chiclet-8.json     |  1 +
 .../clusters/chifflet/nodes/chifflet-1.json   |  1 +
 .../clusters/chifflet/nodes/chifflet-2.json   |  1 +
 .../clusters/chifflet/nodes/chifflet-3.json   |  1 +
 .../clusters/chifflet/nodes/chifflet-4.json   |  1 +
 .../clusters/chifflet/nodes/chifflet-5.json   |  1 +
 .../clusters/chifflet/nodes/chifflet-6.json   |  1 +
 .../clusters/chifflet/nodes/chifflet-7.json   |  1 +
 .../clusters/chifflet/nodes/chifflet-8.json   |  1 +
 .../clusters/chifflot/nodes/chifflot-1.json   |  1 +
 .../clusters/chifflot/nodes/chifflot-2.json   |  1 +
 .../clusters/chifflot/nodes/chifflot-3.json   |  1 +
 .../clusters/chifflot/nodes/chifflot-4.json   |  1 +
 .../clusters/chifflot/nodes/chifflot-5.json   |  1 +
 .../clusters/chifflot/nodes/chifflot-6.json   |  1 +
 .../clusters/chifflot/nodes/chifflot-7.json   |  1 +
 .../clusters/chifflot/nodes/chifflot-8.json   |  1 +
 .../clusters/granduc/nodes/granduc-12.json    |  1 +
 .../clusters/granduc/nodes/granduc-15.json    |  1 +
 .../clusters/granduc/nodes/granduc-16.json    |  1 +
 .../clusters/granduc/nodes/granduc-18.json    |  1 +
 .../clusters/granduc/nodes/granduc-2.json     |  1 +
 .../clusters/granduc/nodes/granduc-20.json    |  1 +
 .../clusters/granduc/nodes/granduc-21.json    |  1 +
 .../clusters/granduc/nodes/granduc-3.json     |  1 +
 .../clusters/granduc/nodes/granduc-4.json     |  1 +
 .../clusters/granduc/nodes/granduc-6.json     |  1 +
 .../clusters/granduc/nodes/granduc-9.json     |  1 +
 .../petitprince/nodes/petitprince-1.json      |  1 +
 .../petitprince/nodes/petitprince-10.json     |  1 +
 .../petitprince/nodes/petitprince-11.json     |  1 +
 .../petitprince/nodes/petitprince-13.json     |  1 +
 .../petitprince/nodes/petitprince-14.json     |  1 +
 .../petitprince/nodes/petitprince-15.json     |  1 +
 .../petitprince/nodes/petitprince-16.json     |  1 +
 .../petitprince/nodes/petitprince-2.json      |  1 +
 .../petitprince/nodes/petitprince-3.json      |  1 +
 .../petitprince/nodes/petitprince-4.json      |  1 +
 .../petitprince/nodes/petitprince-5.json      |  1 +
 .../petitprince/nodes/petitprince-6.json      |  1 +
 .../petitprince/nodes/petitprince-7.json      |  1 +
 .../petitprince/nodes/petitprince-8.json      |  1 +
 .../petitprince/nodes/petitprince-9.json      |  1 +
 .../lyon/clusters/gemini/nodes/gemini-1.json  |  1 +
 .../lyon/clusters/gemini/nodes/gemini-2.json  |  1 +
 .../clusters/hercule/nodes/hercule-1.json     |  1 +
 .../clusters/hercule/nodes/hercule-2.json     |  1 +
 .../clusters/hercule/nodes/hercule-3.json     |  1 +
 .../clusters/hercule/nodes/hercule-4.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-1.json      |  1 +
 .../lyon/clusters/nova/nodes/nova-10.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-11.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-12.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-13.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-14.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-15.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-16.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-17.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-18.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-19.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-2.json      |  1 +
 .../lyon/clusters/nova/nodes/nova-20.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-21.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-22.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-23.json     |  1 +
 .../lyon/clusters/nova/nodes/nova-3.json      |  1 +
 .../lyon/clusters/nova/nodes/nova-4.json      |  1 +
 .../lyon/clusters/nova/nodes/nova-5.json      |  1 +
 .../lyon/clusters/nova/nodes/nova-6.json      |  1 +
 .../lyon/clusters/nova/nodes/nova-7.json      |  1 +
 .../lyon/clusters/nova/nodes/nova-8.json      |  1 +
 .../lyon/clusters/nova/nodes/nova-9.json      |  1 +
 .../lyon/clusters/orion/nodes/orion-1.json    |  1 +
 .../lyon/clusters/orion/nodes/orion-2.json    |  1 +
 .../lyon/clusters/orion/nodes/orion-3.json    |  1 +
 .../lyon/clusters/orion/nodes/orion-4.json    |  1 +
 .../sagittaire/nodes/sagittaire-1.json        |  1 +
 .../sagittaire/nodes/sagittaire-11.json       |  1 +
 .../sagittaire/nodes/sagittaire-12.json       |  1 +
 .../sagittaire/nodes/sagittaire-13.json       |  1 +
 .../sagittaire/nodes/sagittaire-14.json       |  1 +
 .../sagittaire/nodes/sagittaire-15.json       |  1 +
 .../sagittaire/nodes/sagittaire-16.json       |  1 +
 .../sagittaire/nodes/sagittaire-17.json       |  1 +
 .../sagittaire/nodes/sagittaire-18.json       |  1 +
 .../sagittaire/nodes/sagittaire-19.json       |  1 +
 .../sagittaire/nodes/sagittaire-2.json        |  1 +
 .../sagittaire/nodes/sagittaire-20.json       |  1 +
 .../sagittaire/nodes/sagittaire-24.json       |  1 +
 .../sagittaire/nodes/sagittaire-27.json       |  1 +
 .../sagittaire/nodes/sagittaire-29.json       |  1 +
 .../sagittaire/nodes/sagittaire-3.json        |  1 +
 .../sagittaire/nodes/sagittaire-30.json       |  1 +
 .../sagittaire/nodes/sagittaire-31.json       |  1 +
 .../sagittaire/nodes/sagittaire-4.json        |  1 +
 .../sagittaire/nodes/sagittaire-5.json        |  1 +
 .../sagittaire/nodes/sagittaire-6.json        |  1 +
 .../sagittaire/nodes/sagittaire-7.json        |  1 +
 .../lyon/clusters/taurus/nodes/taurus-1.json  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-10.json |  1 +
 .../lyon/clusters/taurus/nodes/taurus-11.json |  1 +
 .../lyon/clusters/taurus/nodes/taurus-12.json |  1 +
 .../lyon/clusters/taurus/nodes/taurus-13.json |  1 +
 .../lyon/clusters/taurus/nodes/taurus-15.json |  1 +
 .../lyon/clusters/taurus/nodes/taurus-2.json  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-3.json  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-4.json  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-5.json  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-6.json  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-7.json  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-8.json  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-9.json  |  1 +
 .../clusters/graffiti/nodes/graffiti-1.json   |  1 +
 .../clusters/graffiti/nodes/graffiti-10.json  |  1 +
 .../clusters/graffiti/nodes/graffiti-11.json  |  1 +
 .../clusters/graffiti/nodes/graffiti-12.json  |  1 +
 .../clusters/graffiti/nodes/graffiti-13.json  |  1 +
 .../clusters/graffiti/nodes/graffiti-2.json   |  1 +
 .../clusters/graffiti/nodes/graffiti-3.json   |  1 +
 .../clusters/graffiti/nodes/graffiti-4.json   |  1 +
 .../clusters/graffiti/nodes/graffiti-5.json   |  1 +
 .../clusters/graffiti/nodes/graffiti-6.json   |  1 +
 .../clusters/graffiti/nodes/graffiti-7.json   |  1 +
 .../clusters/graffiti/nodes/graffiti-8.json   |  1 +
 .../clusters/graffiti/nodes/graffiti-9.json   |  1 +
 .../clusters/graoully/nodes/graoully-1.json   |  1 +
 .../clusters/graoully/nodes/graoully-10.json  |  1 +
 .../clusters/graoully/nodes/graoully-11.json  |  1 +
 .../clusters/graoully/nodes/graoully-12.json  |  1 +
 .../clusters/graoully/nodes/graoully-13.json  |  1 +
 .../clusters/graoully/nodes/graoully-14.json  |  1 +
 .../clusters/graoully/nodes/graoully-15.json  |  1 +
 .../clusters/graoully/nodes/graoully-16.json  |  1 +
 .../clusters/graoully/nodes/graoully-2.json   |  1 +
 .../clusters/graoully/nodes/graoully-3.json   |  1 +
 .../clusters/graoully/nodes/graoully-4.json   |  1 +
 .../clusters/graoully/nodes/graoully-5.json   |  1 +
 .../clusters/graoully/nodes/graoully-6.json   |  1 +
 .../clusters/graoully/nodes/graoully-7.json   |  1 +
 .../clusters/graoully/nodes/graoully-8.json   |  1 +
 .../clusters/graoully/nodes/graoully-9.json   |  1 +
 .../clusters/graphique/nodes/graphique-1.json |  1 +
 .../clusters/graphique/nodes/graphique-2.json |  1 +
 .../clusters/graphique/nodes/graphique-3.json |  1 +
 .../clusters/graphique/nodes/graphique-4.json |  1 +
 .../clusters/graphique/nodes/graphique-5.json |  1 +
 .../clusters/graphique/nodes/graphique-6.json |  1 +
 .../clusters/graphite/nodes/graphite-1.json   |  1 +
 .../clusters/graphite/nodes/graphite-2.json   |  1 +
 .../clusters/graphite/nodes/graphite-3.json   |  1 +
 .../clusters/graphite/nodes/graphite-4.json   |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-1.json |  1 +
 .../clusters/grcinq/nodes/grcinq-10.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-11.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-12.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-13.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-14.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-15.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-16.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-17.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-18.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-19.json      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-2.json |  1 +
 .../clusters/grcinq/nodes/grcinq-20.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-21.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-22.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-23.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-24.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-25.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-26.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-27.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-28.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-29.json      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-3.json |  1 +
 .../clusters/grcinq/nodes/grcinq-30.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-31.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-32.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-33.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-34.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-35.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-36.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-37.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-38.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-39.json      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-4.json |  1 +
 .../clusters/grcinq/nodes/grcinq-40.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-41.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-42.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-43.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-44.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-45.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-46.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-47.json      |  1 +
 .../clusters/grcinq/nodes/grcinq-48.json      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-5.json |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-6.json |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-7.json |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-8.json |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-9.json |  1 +
 .../nancy/clusters/grele/nodes/grele-1.json   |  1 +
 .../nancy/clusters/grele/nodes/grele-10.json  |  1 +
 .../nancy/clusters/grele/nodes/grele-11.json  |  1 +
 .../nancy/clusters/grele/nodes/grele-12.json  |  1 +
 .../nancy/clusters/grele/nodes/grele-13.json  |  1 +
 .../nancy/clusters/grele/nodes/grele-14.json  |  1 +
 .../nancy/clusters/grele/nodes/grele-2.json   |  1 +
 .../nancy/clusters/grele/nodes/grele-3.json   |  1 +
 .../nancy/clusters/grele/nodes/grele-4.json   |  1 +
 .../nancy/clusters/grele/nodes/grele-5.json   |  1 +
 .../nancy/clusters/grele/nodes/grele-6.json   |  1 +
 .../nancy/clusters/grele/nodes/grele-7.json   |  1 +
 .../nancy/clusters/grele/nodes/grele-8.json   |  1 +
 .../nancy/clusters/grele/nodes/grele-9.json   |  1 +
 .../clusters/grimani/nodes/grimani-1.json     |  1 +
 .../clusters/grimani/nodes/grimani-2.json     |  1 +
 .../clusters/grimani/nodes/grimani-3.json     |  1 +
 .../clusters/grimani/nodes/grimani-4.json     |  1 +
 .../clusters/grimani/nodes/grimani-5.json     |  1 +
 .../clusters/grimani/nodes/grimani-6.json     |  1 +
 .../clusters/grimoire/nodes/grimoire-1.json   |  1 +
 .../clusters/grimoire/nodes/grimoire-2.json   |  1 +
 .../clusters/grimoire/nodes/grimoire-3.json   |  1 +
 .../clusters/grimoire/nodes/grimoire-4.json   |  1 +
 .../clusters/grimoire/nodes/grimoire-5.json   |  1 +
 .../clusters/grimoire/nodes/grimoire-6.json   |  1 +
 .../clusters/grimoire/nodes/grimoire-7.json   |  1 +
 .../clusters/grimoire/nodes/grimoire-8.json   |  1 +
 .../nancy/clusters/grisou/nodes/grisou-1.json |  1 +
 .../clusters/grisou/nodes/grisou-10.json      |  1 +
 .../clusters/grisou/nodes/grisou-11.json      |  1 +
 .../clusters/grisou/nodes/grisou-12.json      |  1 +
 .../clusters/grisou/nodes/grisou-13.json      |  1 +
 .../clusters/grisou/nodes/grisou-14.json      |  1 +
 .../clusters/grisou/nodes/grisou-15.json      |  1 +
 .../clusters/grisou/nodes/grisou-16.json      |  1 +
 .../clusters/grisou/nodes/grisou-17.json      |  1 +
 .../clusters/grisou/nodes/grisou-18.json      |  1 +
 .../clusters/grisou/nodes/grisou-19.json      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-2.json |  1 +
 .../clusters/grisou/nodes/grisou-20.json      |  1 +
 .../clusters/grisou/nodes/grisou-21.json      |  1 +
 .../clusters/grisou/nodes/grisou-22.json      |  1 +
 .../clusters/grisou/nodes/grisou-23.json      |  1 +
 .../clusters/grisou/nodes/grisou-24.json      |  1 +
 .../clusters/grisou/nodes/grisou-25.json      |  1 +
 .../clusters/grisou/nodes/grisou-26.json      |  1 +
 .../clusters/grisou/nodes/grisou-27.json      |  1 +
 .../clusters/grisou/nodes/grisou-28.json      |  1 +
 .../clusters/grisou/nodes/grisou-29.json      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-3.json |  1 +
 .../clusters/grisou/nodes/grisou-30.json      |  1 +
 .../clusters/grisou/nodes/grisou-31.json      |  1 +
 .../clusters/grisou/nodes/grisou-32.json      |  1 +
 .../clusters/grisou/nodes/grisou-33.json      |  1 +
 .../clusters/grisou/nodes/grisou-34.json      |  1 +
 .../clusters/grisou/nodes/grisou-35.json      |  1 +
 .../clusters/grisou/nodes/grisou-36.json      |  1 +
 .../clusters/grisou/nodes/grisou-37.json      |  1 +
 .../clusters/grisou/nodes/grisou-38.json      |  1 +
 .../clusters/grisou/nodes/grisou-39.json      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-4.json |  1 +
 .../clusters/grisou/nodes/grisou-40.json      |  1 +
 .../clusters/grisou/nodes/grisou-41.json      |  1 +
 .../clusters/grisou/nodes/grisou-42.json      |  1 +
 .../clusters/grisou/nodes/grisou-43.json      |  1 +
 .../clusters/grisou/nodes/grisou-44.json      |  1 +
 .../clusters/grisou/nodes/grisou-45.json      |  1 +
 .../clusters/grisou/nodes/grisou-46.json      |  1 +
 .../clusters/grisou/nodes/grisou-47.json      |  1 +
 .../clusters/grisou/nodes/grisou-48.json      |  1 +
 .../clusters/grisou/nodes/grisou-49.json      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-5.json |  1 +
 .../clusters/grisou/nodes/grisou-50.json      |  1 +
 .../clusters/grisou/nodes/grisou-51.json      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-6.json |  1 +
 .../nancy/clusters/grisou/nodes/grisou-7.json |  1 +
 .../nancy/clusters/grisou/nodes/grisou-8.json |  1 +
 .../nancy/clusters/grisou/nodes/grisou-9.json |  1 +
 .../nancy/clusters/gros/nodes/gros-1.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-10.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-100.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-101.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-102.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-103.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-104.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-105.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-106.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-107.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-108.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-109.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-11.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-110.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-111.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-112.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-113.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-114.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-115.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-116.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-117.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-118.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-119.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-12.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-120.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-121.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-122.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-123.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-124.json   |  1 +
 .../nancy/clusters/gros/nodes/gros-13.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-14.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-15.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-16.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-17.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-18.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-19.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-2.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-20.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-21.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-22.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-23.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-24.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-25.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-26.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-27.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-28.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-29.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-3.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-30.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-31.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-32.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-33.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-34.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-35.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-36.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-37.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-38.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-39.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-4.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-40.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-41.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-42.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-43.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-44.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-45.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-46.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-47.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-48.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-49.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-5.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-50.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-51.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-52.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-53.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-54.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-55.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-56.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-57.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-58.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-59.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-6.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-60.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-61.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-62.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-63.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-64.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-65.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-66.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-67.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-68.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-69.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-7.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-70.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-71.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-72.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-73.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-74.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-75.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-76.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-77.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-78.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-79.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-8.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-80.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-81.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-82.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-83.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-84.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-85.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-86.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-87.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-88.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-89.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-9.json     |  1 +
 .../nancy/clusters/gros/nodes/gros-90.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-91.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-92.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-93.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-94.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-95.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-96.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-97.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-98.json    |  1 +
 .../nancy/clusters/gros/nodes/gros-99.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-1.json     |  1 +
 .../clusters/grvingt/nodes/grvingt-10.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-11.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-12.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-13.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-14.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-15.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-16.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-17.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-18.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-19.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-2.json     |  1 +
 .../clusters/grvingt/nodes/grvingt-20.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-21.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-22.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-23.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-24.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-25.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-26.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-27.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-28.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-29.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-3.json     |  1 +
 .../clusters/grvingt/nodes/grvingt-30.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-31.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-32.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-33.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-34.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-35.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-36.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-37.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-38.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-39.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-4.json     |  1 +
 .../clusters/grvingt/nodes/grvingt-40.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-41.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-42.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-43.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-44.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-45.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-46.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-47.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-48.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-49.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-5.json     |  1 +
 .../clusters/grvingt/nodes/grvingt-50.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-51.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-52.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-53.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-54.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-55.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-56.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-57.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-58.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-59.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-6.json     |  1 +
 .../clusters/grvingt/nodes/grvingt-60.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-61.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-62.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-63.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-64.json    |  1 +
 .../clusters/grvingt/nodes/grvingt-7.json     |  1 +
 .../clusters/grvingt/nodes/grvingt-8.json     |  1 +
 .../clusters/grvingt/nodes/grvingt-9.json     |  1 +
 .../clusters/econome/nodes/econome-1.json     |  1 +
 .../clusters/econome/nodes/econome-10.json    |  1 +
 .../clusters/econome/nodes/econome-11.json    |  1 +
 .../clusters/econome/nodes/econome-12.json    |  1 +
 .../clusters/econome/nodes/econome-13.json    |  1 +
 .../clusters/econome/nodes/econome-14.json    |  1 +
 .../clusters/econome/nodes/econome-15.json    |  1 +
 .../clusters/econome/nodes/econome-16.json    |  1 +
 .../clusters/econome/nodes/econome-17.json    |  1 +
 .../clusters/econome/nodes/econome-18.json    |  1 +
 .../clusters/econome/nodes/econome-19.json    |  1 +
 .../clusters/econome/nodes/econome-2.json     |  1 +
 .../clusters/econome/nodes/econome-20.json    |  1 +
 .../clusters/econome/nodes/econome-21.json    |  1 +
 .../clusters/econome/nodes/econome-22.json    |  1 +
 .../clusters/econome/nodes/econome-3.json     |  1 +
 .../clusters/econome/nodes/econome-4.json     |  1 +
 .../clusters/econome/nodes/econome-5.json     |  1 +
 .../clusters/econome/nodes/econome-6.json     |  1 +
 .../clusters/econome/nodes/econome-7.json     |  1 +
 .../clusters/econome/nodes/econome-8.json     |  1 +
 .../clusters/econome/nodes/econome-9.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-1.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-10.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-11.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-12.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-13.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-14.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-15.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-16.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-17.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-18.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-19.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-2.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-20.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-21.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-22.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-23.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-24.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-25.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-26.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-27.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-28.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-29.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-3.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-30.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-31.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-32.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-33.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-34.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-35.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-36.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-37.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-38.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-39.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-4.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-40.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-41.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-42.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-43.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-44.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-45.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-46.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-47.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-48.json    |  1 +
 .../clusters/ecotype/nodes/ecotype-5.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-6.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-7.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-8.json     |  1 +
 .../clusters/ecotype/nodes/ecotype-9.json     |  1 +
 .../clusters/paranoia/nodes/paranoia-1.json   |  1 +
 .../clusters/paranoia/nodes/paranoia-2.json   |  1 +
 .../clusters/paranoia/nodes/paranoia-3.json   |  1 +
 .../clusters/paranoia/nodes/paranoia-4.json   |  1 +
 .../clusters/paranoia/nodes/paranoia-5.json   |  1 +
 .../clusters/paranoia/nodes/paranoia-6.json   |  1 +
 .../clusters/paranoia/nodes/paranoia-7.json   |  1 +
 .../clusters/paranoia/nodes/paranoia-8.json   |  1 +
 .../clusters/parapide/nodes/parapide-1.json   |  1 +
 .../clusters/parapide/nodes/parapide-10.json  |  1 +
 .../clusters/parapide/nodes/parapide-11.json  |  1 +
 .../clusters/parapide/nodes/parapide-12.json  |  1 +
 .../clusters/parapide/nodes/parapide-13.json  |  1 +
 .../clusters/parapide/nodes/parapide-16.json  |  1 +
 .../clusters/parapide/nodes/parapide-18.json  |  1 +
 .../clusters/parapide/nodes/parapide-19.json  |  1 +
 .../clusters/parapide/nodes/parapide-2.json   |  1 +
 .../clusters/parapide/nodes/parapide-20.json  |  1 +
 .../clusters/parapide/nodes/parapide-21.json  |  1 +
 .../clusters/parapide/nodes/parapide-24.json  |  1 +
 .../clusters/parapide/nodes/parapide-25.json  |  1 +
 .../clusters/parapide/nodes/parapide-3.json   |  1 +
 .../clusters/parapide/nodes/parapide-4.json   |  1 +
 .../clusters/parapide/nodes/parapide-5.json   |  1 +
 .../clusters/parapide/nodes/parapide-6.json   |  1 +
 .../clusters/parapide/nodes/parapide-7.json   |  1 +
 .../clusters/parapide/nodes/parapide-8.json   |  1 +
 .../clusters/parapide/nodes/parapide-9.json   |  1 +
 .../clusters/parapluie/nodes/parapluie-1.json |  1 +
 .../parapluie/nodes/parapluie-11.json         |  1 +
 .../parapluie/nodes/parapluie-12.json         |  1 +
 .../parapluie/nodes/parapluie-13.json         |  1 +
 .../parapluie/nodes/parapluie-15.json         |  1 +
 .../parapluie/nodes/parapluie-19.json         |  1 +
 .../clusters/parapluie/nodes/parapluie-2.json |  1 +
 .../parapluie/nodes/parapluie-20.json         |  1 +
 .../parapluie/nodes/parapluie-21.json         |  1 +
 .../parapluie/nodes/parapluie-22.json         |  1 +
 .../parapluie/nodes/parapluie-25.json         |  1 +
 .../parapluie/nodes/parapluie-28.json         |  1 +
 .../parapluie/nodes/parapluie-31.json         |  1 +
 .../parapluie/nodes/parapluie-32.json         |  1 +
 .../parapluie/nodes/parapluie-35.json         |  1 +
 .../parapluie/nodes/parapluie-38.json         |  1 +
 .../clusters/parapluie/nodes/parapluie-8.json |  1 +
 .../clusters/parapluie/nodes/parapluie-9.json |  1 +
 .../clusters/parasilo/nodes/parasilo-1.json   |  1 +
 .../clusters/parasilo/nodes/parasilo-10.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-11.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-12.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-13.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-14.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-15.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-16.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-17.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-18.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-19.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-2.json   |  1 +
 .../clusters/parasilo/nodes/parasilo-20.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-21.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-22.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-23.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-24.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-25.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-26.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-27.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-28.json  |  1 +
 .../clusters/parasilo/nodes/parasilo-3.json   |  1 +
 .../clusters/parasilo/nodes/parasilo-4.json   |  1 +
 .../clusters/parasilo/nodes/parasilo-5.json   |  1 +
 .../clusters/parasilo/nodes/parasilo-6.json   |  1 +
 .../clusters/parasilo/nodes/parasilo-7.json   |  1 +
 .../clusters/parasilo/nodes/parasilo-8.json   |  1 +
 .../clusters/parasilo/nodes/parasilo-9.json   |  1 +
 .../clusters/paravance/nodes/paravance-1.json |  1 +
 .../paravance/nodes/paravance-10.json         |  1 +
 .../paravance/nodes/paravance-11.json         |  1 +
 .../paravance/nodes/paravance-12.json         |  1 +
 .../paravance/nodes/paravance-13.json         |  1 +
 .../paravance/nodes/paravance-14.json         |  1 +
 .../paravance/nodes/paravance-15.json         |  1 +
 .../paravance/nodes/paravance-16.json         |  1 +
 .../paravance/nodes/paravance-17.json         |  1 +
 .../paravance/nodes/paravance-18.json         |  1 +
 .../paravance/nodes/paravance-19.json         |  1 +
 .../clusters/paravance/nodes/paravance-2.json |  1 +
 .../paravance/nodes/paravance-20.json         |  1 +
 .../paravance/nodes/paravance-21.json         |  1 +
 .../paravance/nodes/paravance-22.json         |  1 +
 .../paravance/nodes/paravance-23.json         |  1 +
 .../paravance/nodes/paravance-24.json         |  1 +
 .../paravance/nodes/paravance-25.json         |  1 +
 .../paravance/nodes/paravance-26.json         |  1 +
 .../paravance/nodes/paravance-27.json         |  1 +
 .../paravance/nodes/paravance-28.json         |  1 +
 .../paravance/nodes/paravance-29.json         |  1 +
 .../clusters/paravance/nodes/paravance-3.json |  1 +
 .../paravance/nodes/paravance-30.json         |  1 +
 .../paravance/nodes/paravance-31.json         |  1 +
 .../paravance/nodes/paravance-32.json         |  1 +
 .../paravance/nodes/paravance-33.json         |  1 +
 .../paravance/nodes/paravance-34.json         |  1 +
 .../paravance/nodes/paravance-35.json         |  1 +
 .../paravance/nodes/paravance-36.json         |  1 +
 .../paravance/nodes/paravance-37.json         |  1 +
 .../paravance/nodes/paravance-38.json         |  1 +
 .../paravance/nodes/paravance-39.json         |  1 +
 .../clusters/paravance/nodes/paravance-4.json |  1 +
 .../paravance/nodes/paravance-40.json         |  1 +
 .../paravance/nodes/paravance-41.json         |  1 +
 .../paravance/nodes/paravance-42.json         |  1 +
 .../paravance/nodes/paravance-43.json         |  1 +
 .../paravance/nodes/paravance-44.json         |  1 +
 .../paravance/nodes/paravance-45.json         |  1 +
 .../paravance/nodes/paravance-46.json         |  1 +
 .../paravance/nodes/paravance-47.json         |  1 +
 .../paravance/nodes/paravance-48.json         |  1 +
 .../paravance/nodes/paravance-49.json         |  1 +
 .../clusters/paravance/nodes/paravance-5.json |  1 +
 .../paravance/nodes/paravance-50.json         |  1 +
 .../paravance/nodes/paravance-51.json         |  1 +
 .../paravance/nodes/paravance-52.json         |  1 +
 .../paravance/nodes/paravance-53.json         |  1 +
 .../paravance/nodes/paravance-54.json         |  1 +
 .../paravance/nodes/paravance-55.json         |  1 +
 .../paravance/nodes/paravance-56.json         |  1 +
 .../paravance/nodes/paravance-57.json         |  1 +
 .../paravance/nodes/paravance-58.json         |  1 +
 .../paravance/nodes/paravance-59.json         |  1 +
 .../clusters/paravance/nodes/paravance-6.json |  1 +
 .../paravance/nodes/paravance-60.json         |  1 +
 .../paravance/nodes/paravance-61.json         |  1 +
 .../paravance/nodes/paravance-62.json         |  1 +
 .../paravance/nodes/paravance-63.json         |  1 +
 .../paravance/nodes/paravance-64.json         |  1 +
 .../paravance/nodes/paravance-65.json         |  1 +
 .../paravance/nodes/paravance-66.json         |  1 +
 .../paravance/nodes/paravance-67.json         |  1 +
 .../paravance/nodes/paravance-68.json         |  1 +
 .../paravance/nodes/paravance-69.json         |  1 +
 .../clusters/paravance/nodes/paravance-7.json |  1 +
 .../paravance/nodes/paravance-70.json         |  1 +
 .../paravance/nodes/paravance-71.json         |  1 +
 .../paravance/nodes/paravance-72.json         |  1 +
 .../clusters/paravance/nodes/paravance-8.json |  1 +
 .../clusters/paravance/nodes/paravance-9.json |  1 +
 .../sophia/clusters/suno/nodes/suno-1.json    |  1 +
 .../sophia/clusters/suno/nodes/suno-10.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-11.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-12.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-13.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-14.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-15.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-16.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-17.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-18.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-19.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-2.json    |  1 +
 .../sophia/clusters/suno/nodes/suno-20.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-21.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-22.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-23.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-24.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-25.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-26.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-27.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-28.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-29.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-3.json    |  1 +
 .../sophia/clusters/suno/nodes/suno-30.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-31.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-32.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-33.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-34.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-35.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-36.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-37.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-38.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-39.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-4.json    |  1 +
 .../sophia/clusters/suno/nodes/suno-40.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-41.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-42.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-43.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-44.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-45.json   |  1 +
 .../sophia/clusters/suno/nodes/suno-5.json    |  1 +
 .../sophia/clusters/suno/nodes/suno-6.json    |  1 +
 .../sophia/clusters/suno/nodes/suno-7.json    |  1 +
 .../sophia/clusters/suno/nodes/suno-8.json    |  1 +
 .../sophia/clusters/suno/nodes/suno-9.json    |  1 +
 .../sophia/clusters/uvb/nodes/uvb-1.json      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-10.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-11.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-12.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-14.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-15.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-16.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-17.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-18.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-19.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-2.json      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-20.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-21.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-22.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-23.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-24.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-25.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-26.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-27.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-28.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-29.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-3.json      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-30.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-31.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-32.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-33.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-34.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-35.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-36.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-37.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-38.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-39.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-4.json      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-40.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-41.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-42.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-43.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-44.json     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-5.json      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-6.json      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-7.json      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-8.json      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-9.json      |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-1.yaml  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-10.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-11.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-12.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-13.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-14.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-15.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-16.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-17.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-18.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-19.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-2.yaml  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-20.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-21.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-22.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-23.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-24.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-25.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-26.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-27.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-28.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-29.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-3.yaml  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-30.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-31.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-32.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-33.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-34.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-35.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-36.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-37.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-38.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-39.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-4.yaml  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-40.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-41.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-42.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-43.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-44.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-45.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-46.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-47.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-48.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-49.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-5.yaml  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-50.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-51.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-52.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-53.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-54.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-55.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-56.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-57.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-58.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-59.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-6.yaml  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-60.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-61.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-62.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-63.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-64.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-65.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-66.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-67.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-68.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-69.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-7.yaml  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-70.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-71.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-72.yaml |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-8.yaml  |  1 +
 .../grenoble/clusters/dahu/nodes/dahu-9.yaml  |  1 +
 .../grenoble/clusters/yeti/nodes/yeti-1.yaml  |  1 +
 .../grenoble/clusters/yeti/nodes/yeti-2.yaml  |  1 +
 .../grenoble/clusters/yeti/nodes/yeti-3.yaml  |  1 +
 .../grenoble/clusters/yeti/nodes/yeti-4.yaml  |  1 +
 .../clusters/chetemi/nodes/chetemi-1.yaml     |  1 +
 .../clusters/chetemi/nodes/chetemi-10.yaml    |  1 +
 .../clusters/chetemi/nodes/chetemi-11.yaml    |  1 +
 .../clusters/chetemi/nodes/chetemi-12.yaml    |  1 +
 .../clusters/chetemi/nodes/chetemi-13.yaml    |  1 +
 .../clusters/chetemi/nodes/chetemi-14.yaml    |  1 +
 .../clusters/chetemi/nodes/chetemi-15.yaml    |  1 +
 .../clusters/chetemi/nodes/chetemi-2.yaml     |  1 +
 .../clusters/chetemi/nodes/chetemi-3.yaml     |  1 +
 .../clusters/chetemi/nodes/chetemi-4.yaml     |  1 +
 .../clusters/chetemi/nodes/chetemi-5.yaml     |  1 +
 .../clusters/chetemi/nodes/chetemi-6.yaml     |  1 +
 .../clusters/chetemi/nodes/chetemi-7.yaml     |  1 +
 .../clusters/chetemi/nodes/chetemi-8.yaml     |  1 +
 .../clusters/chetemi/nodes/chetemi-9.yaml     |  1 +
 .../clusters/chiclet/nodes/chiclet-1.yaml     |  1 +
 .../clusters/chiclet/nodes/chiclet-2.yaml     |  1 +
 .../clusters/chiclet/nodes/chiclet-3.yaml     |  1 +
 .../clusters/chiclet/nodes/chiclet-4.yaml     |  1 +
 .../clusters/chiclet/nodes/chiclet-5.yaml     |  1 +
 .../clusters/chiclet/nodes/chiclet-6.yaml     |  1 +
 .../clusters/chiclet/nodes/chiclet-7.yaml     |  1 +
 .../clusters/chiclet/nodes/chiclet-8.yaml     |  1 +
 .../clusters/chifflet/nodes/chifflet-1.yaml   |  1 +
 .../clusters/chifflet/nodes/chifflet-2.yaml   |  1 +
 .../clusters/chifflet/nodes/chifflet-3.yaml   |  1 +
 .../clusters/chifflet/nodes/chifflet-4.yaml   |  1 +
 .../clusters/chifflet/nodes/chifflet-5.yaml   |  1 +
 .../clusters/chifflet/nodes/chifflet-6.yaml   |  1 +
 .../clusters/chifflet/nodes/chifflet-7.yaml   |  1 +
 .../clusters/chifflet/nodes/chifflet-8.yaml   |  1 +
 .../clusters/chifflot/nodes/chifflot-1.yaml   |  1 +
 .../clusters/chifflot/nodes/chifflot-2.yaml   |  1 +
 .../clusters/chifflot/nodes/chifflot-3.yaml   |  1 +
 .../clusters/chifflot/nodes/chifflot-4.yaml   |  1 +
 .../clusters/chifflot/nodes/chifflot-5.yaml   |  1 +
 .../clusters/chifflot/nodes/chifflot-6.yaml   |  1 +
 .../clusters/chifflot/nodes/chifflot-7.yaml   |  1 +
 .../clusters/chifflot/nodes/chifflot-8.yaml   |  1 +
 .../clusters/granduc/nodes/granduc-1.yaml     |  1 +
 .../clusters/granduc/nodes/granduc-10.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-11.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-12.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-13.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-14.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-15.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-16.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-17.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-18.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-19.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-2.yaml     |  1 +
 .../clusters/granduc/nodes/granduc-20.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-21.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-22.yaml    |  1 +
 .../clusters/granduc/nodes/granduc-3.yaml     |  1 +
 .../clusters/granduc/nodes/granduc-4.yaml     |  1 +
 .../clusters/granduc/nodes/granduc-5.yaml     |  1 +
 .../clusters/granduc/nodes/granduc-6.yaml     |  1 +
 .../clusters/granduc/nodes/granduc-7.yaml     |  1 +
 .../clusters/granduc/nodes/granduc-8.yaml     |  1 +
 .../clusters/granduc/nodes/granduc-9.yaml     |  1 +
 .../petitprince/nodes/petitprince-1.yaml      |  1 +
 .../petitprince/nodes/petitprince-10.yaml     |  1 +
 .../petitprince/nodes/petitprince-11.yaml     |  1 +
 .../petitprince/nodes/petitprince-12.yaml     |  1 +
 .../petitprince/nodes/petitprince-13.yaml     |  1 +
 .../petitprince/nodes/petitprince-14.yaml     |  1 +
 .../petitprince/nodes/petitprince-15.yaml     |  1 +
 .../petitprince/nodes/petitprince-16.yaml     |  1 +
 .../petitprince/nodes/petitprince-2.yaml      |  1 +
 .../petitprince/nodes/petitprince-3.yaml      |  1 +
 .../petitprince/nodes/petitprince-4.yaml      |  1 +
 .../petitprince/nodes/petitprince-5.yaml      |  1 +
 .../petitprince/nodes/petitprince-6.yaml      |  1 +
 .../petitprince/nodes/petitprince-7.yaml      |  1 +
 .../petitprince/nodes/petitprince-8.yaml      |  1 +
 .../petitprince/nodes/petitprince-9.yaml      |  1 +
 .../lyon/clusters/gemini/nodes/gemini-1.yaml  |  1 +
 .../lyon/clusters/gemini/nodes/gemini-2.yaml  |  1 +
 .../clusters/hercule/nodes/hercule-1.yaml     |  1 +
 .../clusters/hercule/nodes/hercule-2.yaml     |  1 +
 .../clusters/hercule/nodes/hercule-3.yaml     |  1 +
 .../clusters/hercule/nodes/hercule-4.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-1.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-10.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-11.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-12.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-13.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-14.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-15.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-16.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-17.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-18.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-19.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-2.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-20.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-21.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-22.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-23.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-3.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-4.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-5.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-6.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-7.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-8.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-9.yaml      |  1 +
 .../lyon/clusters/orion/nodes/orion-1.yaml    |  1 +
 .../lyon/clusters/orion/nodes/orion-2.yaml    |  1 +
 .../lyon/clusters/orion/nodes/orion-3.yaml    |  1 +
 .../lyon/clusters/orion/nodes/orion-4.yaml    |  1 +
 .../sagittaire/nodes/sagittaire-1.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-10.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-11.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-12.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-13.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-14.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-15.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-16.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-17.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-18.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-19.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-2.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-20.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-21.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-22.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-23.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-24.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-25.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-26.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-27.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-28.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-29.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-3.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-30.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-31.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-32.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-33.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-34.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-35.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-36.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-37.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-38.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-39.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-4.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-40.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-41.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-42.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-43.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-44.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-45.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-47.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-48.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-49.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-5.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-50.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-51.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-52.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-53.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-54.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-55.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-56.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-57.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-58.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-59.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-6.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-60.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-61.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-62.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-63.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-64.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-65.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-66.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-67.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-68.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-69.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-7.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-70.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-71.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-72.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-73.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-74.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-75.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-76.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-77.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-78.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-79.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-8.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-9.yaml        |  1 +
 .../lyon/clusters/taurus/nodes/taurus-1.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-10.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-11.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-12.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-13.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-14.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-15.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-16.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-2.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-3.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-4.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-5.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-6.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-7.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-8.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-9.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-1.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-10.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-11.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-12.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-13.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-2.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-3.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-4.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-5.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-6.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-7.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-8.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-9.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-1.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-10.yaml  |  1 +
 .../clusters/graoully/nodes/graoully-11.yaml  |  1 +
 .../clusters/graoully/nodes/graoully-12.yaml  |  1 +
 .../clusters/graoully/nodes/graoully-13.yaml  |  1 +
 .../clusters/graoully/nodes/graoully-14.yaml  |  1 +
 .../clusters/graoully/nodes/graoully-15.yaml  |  1 +
 .../clusters/graoully/nodes/graoully-16.yaml  |  1 +
 .../clusters/graoully/nodes/graoully-2.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-3.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-4.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-5.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-6.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-7.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-8.yaml   |  1 +
 .../clusters/graoully/nodes/graoully-9.yaml   |  1 +
 .../clusters/graphique/nodes/graphique-1.yaml |  1 +
 .../clusters/graphique/nodes/graphique-2.yaml |  1 +
 .../clusters/graphique/nodes/graphique-3.yaml |  1 +
 .../clusters/graphique/nodes/graphique-4.yaml |  1 +
 .../clusters/graphique/nodes/graphique-5.yaml |  1 +
 .../clusters/graphique/nodes/graphique-6.yaml |  1 +
 .../clusters/graphite/nodes/graphite-1.yaml   |  1 +
 .../clusters/graphite/nodes/graphite-2.yaml   |  1 +
 .../clusters/graphite/nodes/graphite-3.yaml   |  1 +
 .../clusters/graphite/nodes/graphite-4.yaml   |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-1.yaml |  1 +
 .../clusters/grcinq/nodes/grcinq-10.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-11.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-12.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-13.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-14.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-15.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-16.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-17.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-18.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-19.yaml      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-2.yaml |  1 +
 .../clusters/grcinq/nodes/grcinq-20.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-21.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-22.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-23.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-24.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-25.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-26.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-27.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-28.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-29.yaml      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-3.yaml |  1 +
 .../clusters/grcinq/nodes/grcinq-30.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-31.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-32.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-33.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-34.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-35.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-36.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-37.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-38.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-39.yaml      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-4.yaml |  1 +
 .../clusters/grcinq/nodes/grcinq-40.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-41.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-42.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-43.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-44.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-45.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-46.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-47.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-48.yaml      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-5.yaml |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-6.yaml |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-7.yaml |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-8.yaml |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-9.yaml |  1 +
 .../nancy/clusters/grele/nodes/grele-1.yaml   |  1 +
 .../nancy/clusters/grele/nodes/grele-10.yaml  |  1 +
 .../nancy/clusters/grele/nodes/grele-11.yaml  |  1 +
 .../nancy/clusters/grele/nodes/grele-12.yaml  |  1 +
 .../nancy/clusters/grele/nodes/grele-13.yaml  |  1 +
 .../nancy/clusters/grele/nodes/grele-14.yaml  |  1 +
 .../nancy/clusters/grele/nodes/grele-2.yaml   |  1 +
 .../nancy/clusters/grele/nodes/grele-3.yaml   |  1 +
 .../nancy/clusters/grele/nodes/grele-4.yaml   |  1 +
 .../nancy/clusters/grele/nodes/grele-5.yaml   |  1 +
 .../nancy/clusters/grele/nodes/grele-6.yaml   |  1 +
 .../nancy/clusters/grele/nodes/grele-7.yaml   |  1 +
 .../nancy/clusters/grele/nodes/grele-8.yaml   |  1 +
 .../nancy/clusters/grele/nodes/grele-9.yaml   |  1 +
 .../clusters/grimani/nodes/grimani-1.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-2.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-3.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-4.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-5.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-6.yaml     |  1 +
 .../clusters/grimoire/nodes/grimoire-1.yaml   |  1 +
 .../clusters/grimoire/nodes/grimoire-2.yaml   |  1 +
 .../clusters/grimoire/nodes/grimoire-3.yaml   |  1 +
 .../clusters/grimoire/nodes/grimoire-4.yaml   |  1 +
 .../clusters/grimoire/nodes/grimoire-5.yaml   |  1 +
 .../clusters/grimoire/nodes/grimoire-6.yaml   |  1 +
 .../clusters/grimoire/nodes/grimoire-7.yaml   |  1 +
 .../clusters/grimoire/nodes/grimoire-8.yaml   |  1 +
 .../nancy/clusters/grisou/nodes/grisou-1.yaml |  1 +
 .../clusters/grisou/nodes/grisou-10.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-11.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-12.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-13.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-14.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-15.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-16.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-17.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-18.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-19.yaml      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-2.yaml |  1 +
 .../clusters/grisou/nodes/grisou-20.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-21.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-22.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-23.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-24.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-25.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-26.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-27.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-28.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-29.yaml      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-3.yaml |  1 +
 .../clusters/grisou/nodes/grisou-30.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-31.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-32.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-33.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-34.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-35.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-36.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-37.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-38.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-39.yaml      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-4.yaml |  1 +
 .../clusters/grisou/nodes/grisou-40.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-41.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-42.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-43.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-44.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-45.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-46.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-47.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-48.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-49.yaml      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-5.yaml |  1 +
 .../clusters/grisou/nodes/grisou-50.yaml      |  1 +
 .../clusters/grisou/nodes/grisou-51.yaml      |  1 +
 .../nancy/clusters/grisou/nodes/grisou-6.yaml |  1 +
 .../nancy/clusters/grisou/nodes/grisou-7.yaml |  1 +
 .../nancy/clusters/grisou/nodes/grisou-8.yaml |  1 +
 .../nancy/clusters/grisou/nodes/grisou-9.yaml |  1 +
 .../nancy/clusters/gros/nodes/gros-1.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-10.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-100.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-101.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-102.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-103.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-104.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-105.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-106.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-107.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-108.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-109.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-11.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-110.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-111.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-112.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-113.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-114.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-115.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-116.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-117.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-118.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-119.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-12.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-120.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-121.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-122.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-123.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-124.yaml   |  1 +
 .../nancy/clusters/gros/nodes/gros-13.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-14.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-15.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-16.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-17.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-18.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-19.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-2.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-20.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-21.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-22.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-23.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-24.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-25.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-26.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-27.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-28.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-29.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-3.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-30.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-31.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-32.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-33.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-34.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-35.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-36.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-37.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-38.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-39.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-4.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-40.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-41.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-42.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-43.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-44.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-45.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-46.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-47.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-48.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-49.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-5.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-50.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-51.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-52.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-53.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-54.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-55.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-56.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-57.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-58.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-59.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-6.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-60.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-61.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-62.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-63.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-64.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-65.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-66.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-67.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-68.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-69.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-7.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-70.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-71.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-72.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-73.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-74.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-75.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-76.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-77.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-78.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-79.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-8.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-80.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-81.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-82.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-83.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-84.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-85.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-86.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-87.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-88.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-89.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-9.yaml     |  1 +
 .../nancy/clusters/gros/nodes/gros-90.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-91.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-92.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-93.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-94.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-95.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-96.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-97.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-98.yaml    |  1 +
 .../nancy/clusters/gros/nodes/gros-99.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-1.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-10.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-11.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-12.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-13.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-14.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-15.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-16.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-17.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-18.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-19.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-2.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-20.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-21.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-22.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-23.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-24.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-25.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-26.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-27.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-28.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-29.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-3.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-30.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-31.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-32.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-33.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-34.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-35.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-36.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-37.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-38.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-39.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-4.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-40.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-41.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-42.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-43.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-44.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-45.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-46.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-47.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-48.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-49.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-5.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-50.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-51.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-52.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-53.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-54.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-55.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-56.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-57.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-58.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-59.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-6.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-60.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-61.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-62.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-63.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-64.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-7.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-8.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-9.yaml     |  1 +
 .../clusters/econome/nodes/econome-1.yaml     |  1 +
 .../clusters/econome/nodes/econome-10.yaml    |  1 +
 .../clusters/econome/nodes/econome-11.yaml    |  1 +
 .../clusters/econome/nodes/econome-12.yaml    |  1 +
 .../clusters/econome/nodes/econome-13.yaml    |  1 +
 .../clusters/econome/nodes/econome-14.yaml    |  1 +
 .../clusters/econome/nodes/econome-15.yaml    |  1 +
 .../clusters/econome/nodes/econome-16.yaml    |  1 +
 .../clusters/econome/nodes/econome-17.yaml    |  1 +
 .../clusters/econome/nodes/econome-18.yaml    |  1 +
 .../clusters/econome/nodes/econome-19.yaml    |  1 +
 .../clusters/econome/nodes/econome-2.yaml     |  1 +
 .../clusters/econome/nodes/econome-20.yaml    |  1 +
 .../clusters/econome/nodes/econome-21.yaml    |  1 +
 .../clusters/econome/nodes/econome-22.yaml    |  1 +
 .../clusters/econome/nodes/econome-3.yaml     |  1 +
 .../clusters/econome/nodes/econome-4.yaml     |  1 +
 .../clusters/econome/nodes/econome-5.yaml     |  1 +
 .../clusters/econome/nodes/econome-6.yaml     |  1 +
 .../clusters/econome/nodes/econome-7.yaml     |  1 +
 .../clusters/econome/nodes/econome-8.yaml     |  1 +
 .../clusters/econome/nodes/econome-9.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-1.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-10.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-11.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-12.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-13.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-14.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-15.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-16.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-17.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-18.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-19.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-2.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-20.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-21.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-22.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-23.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-24.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-25.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-26.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-27.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-28.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-29.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-3.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-30.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-31.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-32.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-33.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-34.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-35.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-36.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-37.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-38.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-39.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-4.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-40.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-41.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-42.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-43.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-44.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-45.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-46.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-47.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-48.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-5.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-6.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-7.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-8.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-9.yaml     |  1 +
 .../clusters/paranoia/nodes/paranoia-1.yaml   |  1 +
 .../clusters/paranoia/nodes/paranoia-2.yaml   |  1 +
 .../clusters/paranoia/nodes/paranoia-3.yaml   |  1 +
 .../clusters/paranoia/nodes/paranoia-4.yaml   |  1 +
 .../clusters/paranoia/nodes/paranoia-5.yaml   |  1 +
 .../clusters/paranoia/nodes/paranoia-6.yaml   |  1 +
 .../clusters/paranoia/nodes/paranoia-7.yaml   |  1 +
 .../clusters/paranoia/nodes/paranoia-8.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-1.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-10.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-11.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-12.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-13.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-14.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-15.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-16.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-17.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-18.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-19.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-2.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-20.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-21.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-22.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-23.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-24.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-25.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-3.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-4.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-5.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-6.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-7.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-8.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-9.yaml   |  1 +
 .../clusters/parapluie/nodes/parapluie-1.yaml |  1 +
 .../parapluie/nodes/parapluie-10.yaml         |  1 +
 .../parapluie/nodes/parapluie-11.yaml         |  1 +
 .../parapluie/nodes/parapluie-12.yaml         |  1 +
 .../parapluie/nodes/parapluie-13.yaml         |  1 +
 .../parapluie/nodes/parapluie-14.yaml         |  1 +
 .../parapluie/nodes/parapluie-15.yaml         |  1 +
 .../parapluie/nodes/parapluie-16.yaml         |  1 +
 .../parapluie/nodes/parapluie-17.yaml         |  1 +
 .../parapluie/nodes/parapluie-18.yaml         |  1 +
 .../parapluie/nodes/parapluie-19.yaml         |  1 +
 .../clusters/parapluie/nodes/parapluie-2.yaml |  1 +
 .../parapluie/nodes/parapluie-20.yaml         |  1 +
 .../parapluie/nodes/parapluie-21.yaml         |  1 +
 .../parapluie/nodes/parapluie-22.yaml         |  1 +
 .../parapluie/nodes/parapluie-23.yaml         |  1 +
 .../parapluie/nodes/parapluie-24.yaml         |  1 +
 .../parapluie/nodes/parapluie-25.yaml         |  1 +
 .../parapluie/nodes/parapluie-26.yaml         |  1 +
 .../parapluie/nodes/parapluie-27.yaml         |  1 +
 .../parapluie/nodes/parapluie-28.yaml         |  1 +
 .../parapluie/nodes/parapluie-29.yaml         |  1 +
 .../clusters/parapluie/nodes/parapluie-3.yaml |  1 +
 .../parapluie/nodes/parapluie-30.yaml         |  1 +
 .../parapluie/nodes/parapluie-31.yaml         |  1 +
 .../parapluie/nodes/parapluie-32.yaml         |  1 +
 .../parapluie/nodes/parapluie-33.yaml         |  1 +
 .../parapluie/nodes/parapluie-34.yaml         |  1 +
 .../parapluie/nodes/parapluie-35.yaml         |  1 +
 .../parapluie/nodes/parapluie-36.yaml         |  1 +
 .../parapluie/nodes/parapluie-37.yaml         |  1 +
 .../parapluie/nodes/parapluie-38.yaml         |  1 +
 .../parapluie/nodes/parapluie-39.yaml         |  1 +
 .../clusters/parapluie/nodes/parapluie-4.yaml |  1 +
 .../parapluie/nodes/parapluie-40.yaml         |  1 +
 .../clusters/parapluie/nodes/parapluie-5.yaml |  1 +
 .../clusters/parapluie/nodes/parapluie-6.yaml |  1 +
 .../clusters/parapluie/nodes/parapluie-7.yaml |  1 +
 .../clusters/parapluie/nodes/parapluie-8.yaml |  1 +
 .../clusters/parapluie/nodes/parapluie-9.yaml |  1 +
 .../clusters/parasilo/nodes/parasilo-1.yaml   |  1 +
 .../clusters/parasilo/nodes/parasilo-10.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-11.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-12.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-13.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-14.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-15.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-16.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-17.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-18.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-19.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-2.yaml   |  1 +
 .../clusters/parasilo/nodes/parasilo-20.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-21.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-22.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-23.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-24.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-25.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-26.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-27.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-28.yaml  |  1 +
 .../clusters/parasilo/nodes/parasilo-3.yaml   |  1 +
 .../clusters/parasilo/nodes/parasilo-4.yaml   |  1 +
 .../clusters/parasilo/nodes/parasilo-5.yaml   |  1 +
 .../clusters/parasilo/nodes/parasilo-6.yaml   |  1 +
 .../clusters/parasilo/nodes/parasilo-7.yaml   |  1 +
 .../clusters/parasilo/nodes/parasilo-8.yaml   |  1 +
 .../clusters/parasilo/nodes/parasilo-9.yaml   |  1 +
 .../clusters/paravance/nodes/paravance-1.yaml |  1 +
 .../paravance/nodes/paravance-10.yaml         |  1 +
 .../paravance/nodes/paravance-11.yaml         |  1 +
 .../paravance/nodes/paravance-12.yaml         |  1 +
 .../paravance/nodes/paravance-13.yaml         |  1 +
 .../paravance/nodes/paravance-14.yaml         |  1 +
 .../paravance/nodes/paravance-15.yaml         |  1 +
 .../paravance/nodes/paravance-16.yaml         |  1 +
 .../paravance/nodes/paravance-17.yaml         |  1 +
 .../paravance/nodes/paravance-18.yaml         |  1 +
 .../paravance/nodes/paravance-19.yaml         |  3 +-
 .../clusters/paravance/nodes/paravance-2.yaml |  1 +
 .../paravance/nodes/paravance-20.yaml         |  1 +
 .../paravance/nodes/paravance-21.yaml         |  1 +
 .../paravance/nodes/paravance-22.yaml         |  1 +
 .../paravance/nodes/paravance-23.yaml         |  1 +
 .../paravance/nodes/paravance-24.yaml         |  1 +
 .../paravance/nodes/paravance-25.yaml         |  1 +
 .../paravance/nodes/paravance-26.yaml         |  1 +
 .../paravance/nodes/paravance-27.yaml         |  1 +
 .../paravance/nodes/paravance-28.yaml         |  1 +
 .../paravance/nodes/paravance-29.yaml         |  1 +
 .../clusters/paravance/nodes/paravance-3.yaml |  1 +
 .../paravance/nodes/paravance-30.yaml         |  1 +
 .../paravance/nodes/paravance-31.yaml         |  1 +
 .../paravance/nodes/paravance-32.yaml         |  1 +
 .../paravance/nodes/paravance-33.yaml         |  1 +
 .../paravance/nodes/paravance-34.yaml         |  1 +
 .../paravance/nodes/paravance-35.yaml         |  1 +
 .../paravance/nodes/paravance-36.yaml         |  1 +
 .../paravance/nodes/paravance-37.yaml         |  1 +
 .../paravance/nodes/paravance-38.yaml         |  1 +
 .../paravance/nodes/paravance-39.yaml         |  1 +
 .../clusters/paravance/nodes/paravance-4.yaml |  1 +
 .../paravance/nodes/paravance-40.yaml         |  1 +
 .../paravance/nodes/paravance-41.yaml         |  1 +
 .../paravance/nodes/paravance-42.yaml         |  1 +
 .../paravance/nodes/paravance-43.yaml         |  1 +
 .../paravance/nodes/paravance-44.yaml         |  1 +
 .../paravance/nodes/paravance-45.yaml         |  1 +
 .../paravance/nodes/paravance-46.yaml         |  1 +
 .../paravance/nodes/paravance-47.yaml         |  5 +-
 .../paravance/nodes/paravance-48.yaml         |  1 +
 .../paravance/nodes/paravance-49.yaml         |  1 +
 .../clusters/paravance/nodes/paravance-5.yaml |  1 +
 .../paravance/nodes/paravance-50.yaml         |  1 +
 .../paravance/nodes/paravance-51.yaml         |  5 +-
 .../paravance/nodes/paravance-52.yaml         |  1 +
 .../paravance/nodes/paravance-53.yaml         |  1 +
 .../paravance/nodes/paravance-54.yaml         |  1 +
 .../paravance/nodes/paravance-55.yaml         |  1 +
 .../paravance/nodes/paravance-56.yaml         |  1 +
 .../paravance/nodes/paravance-57.yaml         |  1 +
 .../paravance/nodes/paravance-58.yaml         |  1 +
 .../paravance/nodes/paravance-59.yaml         |  1 +
 .../clusters/paravance/nodes/paravance-6.yaml |  1 +
 .../paravance/nodes/paravance-60.yaml         |  1 +
 .../paravance/nodes/paravance-61.yaml         |  1 +
 .../paravance/nodes/paravance-62.yaml         |  1 +
 .../paravance/nodes/paravance-63.yaml         |  1 +
 .../paravance/nodes/paravance-64.yaml         |  1 +
 .../paravance/nodes/paravance-65.yaml         |  1 +
 .../paravance/nodes/paravance-66.yaml         |  1 +
 .../paravance/nodes/paravance-67.yaml         |  1 +
 .../paravance/nodes/paravance-68.yaml         |  1 +
 .../paravance/nodes/paravance-69.yaml         |  1 +
 .../clusters/paravance/nodes/paravance-7.yaml |  1 +
 .../paravance/nodes/paravance-70.yaml         |  1 +
 .../paravance/nodes/paravance-71.yaml         |  1 +
 .../paravance/nodes/paravance-72.yaml         |  1 +
 .../clusters/paravance/nodes/paravance-8.yaml |  1 +
 .../clusters/paravance/nodes/paravance-9.yaml |  1 +
 .../sophia/clusters/suno/nodes/suno-1.yaml    |  1 +
 .../sophia/clusters/suno/nodes/suno-10.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-11.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-12.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-13.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-14.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-15.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-16.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-17.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-18.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-19.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-2.yaml    |  1 +
 .../sophia/clusters/suno/nodes/suno-20.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-21.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-22.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-23.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-24.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-25.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-26.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-27.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-28.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-29.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-3.yaml    |  1 +
 .../sophia/clusters/suno/nodes/suno-30.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-31.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-32.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-33.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-34.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-35.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-36.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-37.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-38.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-39.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-4.yaml    |  1 +
 .../sophia/clusters/suno/nodes/suno-40.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-41.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-42.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-43.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-44.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-45.yaml   |  1 +
 .../sophia/clusters/suno/nodes/suno-5.yaml    |  1 +
 .../sophia/clusters/suno/nodes/suno-6.yaml    |  1 +
 .../sophia/clusters/suno/nodes/suno-7.yaml    |  1 +
 .../sophia/clusters/suno/nodes/suno-8.yaml    |  1 +
 .../sophia/clusters/suno/nodes/suno-9.yaml    |  1 +
 .../sophia/clusters/uvb/nodes/uvb-1.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-10.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-11.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-12.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-13.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-14.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-15.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-16.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-17.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-18.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-19.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-2.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-20.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-21.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-22.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-23.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-24.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-25.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-26.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-27.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-28.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-29.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-3.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-30.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-31.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-32.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-33.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-34.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-35.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-36.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-37.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-38.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-39.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-4.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-40.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-41.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-42.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-43.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-44.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-5.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-6.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-7.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-8.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-9.yaml      |  1 +
 .../valid/input/schemas/schema-node.yaml      |  1 +
 .../edit-input-files-add-core-numbering.rb    | 49 +++++++++++++++++++
 1796 files changed, 1849 insertions(+), 5 deletions(-)
 create mode 100755 scripts/edit-input-files-add-core-numbering.rb

diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
index b38b6bc462..890203ac16 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
index 9300e9930e..ef0e36b36a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
index 2f8e606b0a..962c734ea9 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
index 3851430db6..69116be374 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
index 7cffd14c50..8c8b62a236 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
index 1c7e45cb5f..2530cee93d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
index 866f22cb80..c7e7bffffd 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
index fde0126768..7859b688c7 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
index 0a77cb9b93..87b2e53a54 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
index d9ce736041..48b42e644e 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
index e966af5656..a9a168bdfa 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
index e6e4cda6eb..67884eb9ab 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
index 9502f31395..9a04b50cac 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
index e02e10c2e5..c5a709b91c 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
index 99fcddbb5e..465d2e1fb7 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
index f1c2dbdac9..29d0f3f9c9 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
index 4e560c771f..9e15b7ceec 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
index c31d0b4872..266fe9e4b5 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
index af99368497..5358b49a33 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
index 0e01994482..3a117ec959 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
index c06356ee64..6c233d7fc1 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
index f79e45320a..afa673b6d3 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
index 49ddfc1966..666978506a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
index e769b09489..de67c096d9 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
index c41d3aaeb9..95f66f109a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
index 9d7fe7a1d9..c3650d8f07 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
index b8acf15f43..2a9e47e503 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
index 4d9d71a860..7e583d245f 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
index 851e52a545..09ca78196a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
index f0f9173e0d..8863938ccd 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
index 8c44f48272..4eba2c034a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
index 6c3b19a271..38698db58c 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
index 92469e5120..29956228a1 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 64,
     "nb_procs": 4,
     "nb_threads": 128,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
index aecd6cc77a..b94d5d9359 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 64,
     "nb_procs": 4,
     "nb_threads": 128,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
index 339505cc37..10ad5c6118 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 64,
     "nb_procs": 4,
     "nb_threads": 128,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
index ee2d784f56..6794e955f7 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 64,
     "nb_procs": 4,
     "nb_threads": 128,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
index 5f3c94d2e1..9258dee818 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
index 9107b26571..0ffc8e0e59 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
index 3b633726f7..29b88ee863 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
index 2184e9f8a0..659144d838 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
index d1ca25fd21..3e7a127ceb 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
index b59b0038ce..65fad29bba 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
index 38d4b011b1..9e9bb16185 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
index 3d2a0b3fb6..4e3eef9717 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
index 050a869859..f1fefd0b9e 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
index ed470dafeb..82dae6f811 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
index 20b4e6bdbf..15651bcd80 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
index 236467dc81..309d0bd2e5 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
index 5ec7aa3088..5afc2f5b08 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
index a44d5db739..e0eadf0532 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
index 755e124235..2178737aef 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json
index fb105a3153..eb3c4c7916 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json
index aabd3b13d4..6cbf8a6de1 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json
index c8c78bb188..28fff505d2 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json
index 89f90516c1..546edbc7c1 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json
index b5a8f25b73..54fd5fa9e2 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json
index 920aa69cd8..ae67db761d 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json
index 91ad793337..456e702c21 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json
index 8808081f61..48bfaa81b7 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
index 07483b614c..92df7ac787 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 28,
     "nb_procs": 2,
     "nb_threads": 56,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
index ac285f85e7..143990057d 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 28,
     "nb_procs": 2,
     "nb_threads": 56,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
index edd40c5e30..ec3edb56d1 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 28,
     "nb_procs": 2,
     "nb_threads": 56,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
index b7123c46ae..cb652b7293 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 28,
     "nb_procs": 2,
     "nb_threads": 56,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
index f187382152..5b849c2d15 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 28,
     "nb_procs": 2,
     "nb_threads": 56,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
index 11b1446a0e..ea1fb06bed 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 28,
     "nb_procs": 2,
     "nb_threads": 56,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
index 5296787b29..2f6a170922 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 28,
     "nb_procs": 2,
     "nb_threads": 56,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
index 548fb30f82..8e747277b4 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 28,
     "nb_procs": 2,
     "nb_threads": 56,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json
index 3120d72a68..cd858c22b3 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json
index d78d65621e..efcde40bfe 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json
index 46242e50f9..35d62b4575 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json
index 21a65633e1..c98949c677 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json
index 7f70b40e70..798025f33a 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json
index 296a516b63..fa9778a554 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json
index b945716f40..9e5869f9d1 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json
index 4dfaef9d78..c545b33f71 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
index 1b37688db7..ee6e50c90c 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
index cc4b9c876c..6d8705ef20 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
index 4dbe4fa7a8..e3017f3e78 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
index a7175e70c2..1135374c17 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
index 078f36b7b5..824c524782 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
index 5bf9770d05..70a5efbb8b 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
index b757fa5359..5bd1877156 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
index 9df0919fb8..c4e9fb1b60 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
index 1f87f73662..fda519e25f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
index c9c8cd04f9..d4ee9482c8 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
index 64c7bb45cf..a7d0d96d1b 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
index 6c87c9d07f..80d4919727 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
index 15af7b812f..23c91a1fb7 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
index 2a9779bd99..7d20e26a00 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
index 9201a96602..41341741a5 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
index ca09171164..b83eba2323 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
index 9aa71d54a7..e75ac75f04 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
index b0bc7b8875..7b1f68b280 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
index 35846d7603..e66899e779 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
index 2ac3073575..904135d069 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
index 182bd092d4..f74bc8689e 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
index 84edd2e439..9c0720dd05 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
index b1482f8273..176e3000b1 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
index 8966d49b2a..e9c8f3d2e4 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
index d19afefece..07e1bc8e37 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
index fef9eb4cf3..9054bb0842 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index 06a2c6ed9f..31e40d9b4a 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 40,
     "nb_procs": 2,
     "nb_threads": 80,
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index d1022fb111..6731089526 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 40,
     "nb_procs": 2,
     "nb_threads": 80,
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
index a49ff07215..ec05485981 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
index 9183fedbfa..e43a551638 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
index 99d3b926d1..f96a02a777 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
index 7ee52bf9be..be364531a0 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
index fd992386d8..d2b564501f 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
index 707616ebe6..aa7678bf23 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
index edc7cd82e0..3f5a059f0d 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
index 4158722699..bf046782e1 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
index cade1d8ef4..c7d10b70c2 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
index 2eff6f2763..e57bbe56d3 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
index 41f310965d..bd129caf3e 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
index 0c12c6d0e6..b7f2577400 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
index 55f99e3c07..639451cdcc 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
index 50b623badf..bc91c9354b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
index 1b100faea8..6f685b6f30 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
index f63d631ace..f64cf68bb9 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
index d498e2da90..028a2b40b1 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
index 532dea2bdc..bab2ca3542 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
index 6e56ac7b5c..a80e333ff6 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
index a48b05b81d..78547567ba 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
index aa5ec784ec..3ffc3b91b9 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
index c78eb6d58a..de49c364de 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
index c4c408e280..fa00cf863c 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
index c8305dce85..4590fc20ad 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
index 27748deb9c..df3de9ccf1 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
index 8eb4b3acc6..181e51e564 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
index 3d3e35037e..d975f7f12a 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
index 4209a8a0d7..012995b2ad 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
index b2191fe047..2eed8da0e5 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
index e601ff7707..1d7391eb84 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
index 04d27e2d88..b2cf5d014a 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
index 1fba628e5b..8b2703bb56 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
index 37c18264b5..671a725e7c 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
index 747a15976e..805e831e76 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
index cfd2432482..5c2f4f5fce 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
index 32f8865df3..a8e2f0e5d0 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
index 28f9723d6a..cf5065f4c4 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
index 2092d9c188..fec97bebd6 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
index e36d668975..18ff5888c2 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
index 7fe3703aa2..fc407cff90 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
index b14bf342b9..44510ac1ed 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index 09312c285d..07bce0e6af 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
index 6623236aa1..96028ebf40 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
index 53bbf52bd3..e0d26f90b0 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
index 669fb702db..e2c38580dc 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
index 1ec2076dd9..8bb1ba8534 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
index a1cac9798d..0fd289cf82 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
index 489c0c6a5c..1872de5c80 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
index 13626804c5..939cb099c1 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
index 4b9e45dce9..04b013f684 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
index 84a9d402ea..4084e4514d 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
index e0e7ee7513..8600f5b3fa 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
index a0bf23c400..1f3666fb06 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
index b761cb4775..002f690555 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
index f6202875ad..26eedb5aa8 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
index 32d405e671..1eab2b9cff 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
index 5a714535ce..e405ac3f67 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
index ea7725d371..61390782fd 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
index a42a5118a2..c2912b4fa1 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json
index 48a7c16fb8..073adbccd0 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
index e6d1fca047..b412a87026 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
index b167bee2e2..33838a835f 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
index 10254f29f9..065d65d15b 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
index 04d683338a..4d76a5c40a 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
index 7603ac98e2..b5cf5048c7 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
index 23b9126db7..f396f4ad7d 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
index bbf16e1065..380709fbb0 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index d1551d9a81..3e97ee3d2a 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index cbc1ff31a0..52354c550e 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index 0c1f615239..4d4c6cc253 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index f49d6e7b1c..f9cf4ab274 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index 6b38e38e0e..ccf5c01c34 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index 247dcfd996..aa4e0b77c0 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index 46209cfe28..43a679c206 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index 389bb1fa8e..bf57c85832 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index 98f2405967..00fc9ba162 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index 2d766062b8..6847dee7c3 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index f9f5e0d171..96d85af646 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index d020c9462b..b6ae67fa1d 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index 08c2479b0a..da3191255e 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
index 210a37280f..66378dfb9f 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
index f5e02378e6..c2b95b5007 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
index 5072b6c8cc..3b5928e3d1 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
index e87357c417..4a63c39613 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
index 2cc9102d92..7a22f1d9fa 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
index 0e9731ce02..d28a7be15f 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
index aafecd5892..84ec8ed6fc 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
index 3a032aa1fc..4e2a2219d9 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
index c0a3198add..81c3f89855 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
index 132f74a339..127b5ae491 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
index 8340d08fed..af210d872b 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
index 777b2ac617..8e70030e7f 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
index bac7dd7dbf..c1c8a93da1 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
index 88c3f8ca52..79db9bc8dd 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
index 2c15437254..0781297d75 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
index b04a50a7ea..84c4661fc3 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
index 66f4bce437..4114c548e1 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
index e34991d022..9087848dab 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
index 85bfda691d..f1c91756e6 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
index b30c4e8b11..398bf9696b 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
index 05961d5b7f..e7ccf6da19 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
index e656462524..4e4af68f8c 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
index ad265eebe0..1d8cb5c87a 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
index c8ed8c5150..6fd3a35774 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
index 6e607bff9e..8242038df6 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
index 100a63c284..e77a6a23ec 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
index db2ea93ad1..3d299a4a1a 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
index 6f21c7c4c0..b50ebca072 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
index 5531912d39..7d5061266e 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
index c79ff3dea7..a6678e83cd 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
index 624e07a7ff..a244c2e819 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
index 222ad37b32..75fa4113d8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
index 764cc15c43..b897a7a75b 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
index 2268c6d77f..d749704de4 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
index 93a1bfa702..d4376f74cd 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
index 61da4546dd..2a91ed6388 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
index 2322406cd7..5d4f4f13ff 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
index 97f14ca26f..a18019811e 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
index d4b3c54e0b..cfc24292ec 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
index 2d72acf4d7..b85d673b73 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
index 230d0c03c3..3a04a51cb7 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
index a87f27478a..b7def770ab 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
index 3f5d53e27e..24971bd6b3 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
index 32e33fc5e7..dc1bdd9b4e 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
index d64704c4bd..6d3e370dd4 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
index 9f099ea160..95d8055b21 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
index c2aeacf902..bff96ca425 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
index 36bee2639f..716a12ddf9 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
index 54435af8d6..41f7e00605 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
index 350db6baf4..5b87ea7d0e 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
index aa8cd7c290..6fa7f9b66c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
index 68f11d67d3..b31cb85775 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
index a73d4529d5..a00fd365c8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
index c448f4b928..9e1280ebfc 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
index 2cd83b4f72..76f890ca07 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
index f20c17435d..43a132fb5a 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
index 4d2554990e..8cfc431797 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
index e1b82feed1..f2b894591c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
index 91dc576661..67c6ce54d9 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
index a6402f8825..e89a3094ed 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
index 020a074725..87e182aa0d 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
index 8c51d5f9d1..9644ad6414 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
index cca4000aa3..947870211f 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
index b4e7603ac8..6186a20805 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
index 95f46842ee..ea476a88d2 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
index 9a4abc7fda..6cfdf69337 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
index f58596b73c..08f2266004 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
index a23dededd5..6e5b987469 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
index ff7e197cf5..2154677050 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
index ea7415d645..2ced9bb17c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
index 1299bc1ef0..b1bd565dce 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
index 2a850b3bf8..037ab5238c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
index 3a7a5be238..07ab8d1252 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
index 796c35480b..974c7c4a71 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
index e7ae1d96e8..f9f9e32995 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
index afad2002a6..c46193e4cd 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
index 60d41b9aea..dcfd42bfd3 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
index 0414989459..fc30b979ab 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
index 788eb6a38b..f21da6211f 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
index a15daa9357..81ba128797 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
index d6f4658077..958d8b2b08 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
index 78ec2c0ed6..f911e161f7 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
index 76a26aa3d1..c30edc5035 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
index 9836613f97..f6374ffce9 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
index 45a138eb3c..432a76f21d 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
index 200e37b8c1..97cb89b0e9 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
index 3d5f98ad57..075ee18bdf 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
index a8b76f936c..c3644f5cf2 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 48,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
index f8fd6f5195..998f961ad8 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 12,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
index 326f8dae7f..25fba3577f 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 12,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
index f8a2ca998e..facb31f3e0 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 12,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
index 85bf54f493..1311721985 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 12,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
index b147fbad4b..e3054da317 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 12,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
index 122ddfbde8..a8ac609288 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 12,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
index 657822e053..d0483b1bb0 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
index 3fd16307c3..5d92c56c09 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
index 63c57a8ae1..52221a0503 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
index ecd5650c8e..83e8d6b589 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
index 79fbb5852a..e84f28090f 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
index af8d55a289..f5ed77831e 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
index b3e216fe59..16f71088e4 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
index b4a3a48c5e..d47ad1fb33 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
index 0129cdb86f..c9850d9876 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
index 08714e6133..be845c2160 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
index 9c1eba6646..b8f920d051 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
index 863003724a..894ed8be26 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
index 7baec11fbc..b84a17e06a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
index b77f4ef601..3fa33c92e5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
index 2ae18e6412..3d63eb7158 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
index f9153e9d80..0ce2e3ea78 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
index 70d021a33b..2761cbdc58 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
index 33705c157e..90280bcec3 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
index 891a6b8732..8b82b78a46 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
index 00d68f8825..712a82b4f6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
index beeac456ab..b21d15d652 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
index 705473d302..0a2785ea11 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
index 2184889e47..2094c9b80a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
index 03e728811a..a7dec1979c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
index efd7f3910b..cc340185f3 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
index 39eb18aaa0..7236681017 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
index 6740036b61..825caaf3b6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
index f5f535d75a..84fdb0c157 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
index 66ba1c73b9..c874c1baa1 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
index 77d7b36433..b13fc99fb6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
index 386e22665f..f550f41f30 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
index 9c4c2a3e9a..76bccbb663 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
index f5764d2f03..1d5ab669ae 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
index fc4fa4a201..1a9eca48d4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
index 2eafda2b35..3ec738ddac 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
index 3066fa03be..8a09a7aab5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
index 631bb54dcc..0f8a1134d2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
index 5f91bf05c0..a0bdc85957 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
index c0d98b5bc3..0595dcc237 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
index b43022a376..bd6d50d71a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
index 4a6c1a89a1..28c80648ca 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
index c5ea10fffd..83a030f7d8 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
index df4c9c3bfe..5f0b46f78c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
index 7d7e57d87d..a43cbfb1de 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
index 65d833ea7d..892736f754 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
index 7169e2d4ed..6fb64f1b0d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
index 3ac46a6352..788e8409eb 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
index 0b271f32af..add7776983 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
index 57efa94189..4bae76218b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
index c93c530cd3..9da3f728b9 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
index 9116a33fd4..ede42813eb 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
index 609b5d0cc2..3d26fe9e9c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
index 51cddd198e..5d8bd2d6a3 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
index 405b8c3e88..79212c608a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
index 64e54edaa3..742be059fa 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
index ae25de1055..facfd8a9f9 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
index 44e9dd843c..63cfd73ab4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
index 0954f7eff4..3af7e71e37 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
index 4da0f1fff7..6d6a64f03f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
index b4b1744192..6cc980a8ce 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
index e8c837269f..a9090918e8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
index efa5129f0f..fde89ebbda 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
index b954028ba8..c6813943ac 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
index 5a10586ec0..50aebdf8ea 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
index d935dc0da3..bf069f50a5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
index 2956d66d0e..16f694d190 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
index 7b5781cbef..a7c6db6551 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
index 15eebbabdd..b6b610ca81 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
index 32fb59634d..d904edf321 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
index 581b5b2d00..050edc7683 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
index b5052f8d5d..6728edc07c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
index 4b29af2c3f..7db090f47f 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
index a11c3fbdd1..d5519c1fa4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
index fe65270e61..6ddb8c7be4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
index 69cbe388e9..e234372c14 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
index f57ec75792..d30b7079b5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
index 3a6b638c53..2dc071cd05 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
index c3d22513c0..4539c13ed5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
index a9bc3cf1df..594749da79 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
index c9398082fa..320d87dde4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
index f16bb0ec41..4d508aac63 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
index 77fe78e8b1..ee58f35256 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
index 5f917c8ae7..4fa194e9e6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
index d7c2d54585..24ab5ace71 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
index 247e479183..68824bb1a4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
index 070c81d83e..8ad7f31935 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
index edf3a3a060..b2dc10de60 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
index 3c8abe8ce9..598aa8ec97 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
index 000bf8edec..dd6c47e4ea 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
index c976ad9d3f..ecd8421fef 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
index 1f02329a88..eb6503da24 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
index 082e0ab812..28844a764c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
index 9f3ea96dbc..d24c5c241b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
index a1bbc91bc3..9a315a28f2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
index 59e8d6dd9a..1f4b2fd6d9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
index 9528d420c7..a328ea848d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
index 1480e1dd4b..58d2a41de7 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
index fa5063f783..ba13807b56 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
index 4402eaf1d9..fff18fd2b3 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
index 337780b74d..4243122e19 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
index 9fe024a284..33be47e267 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
index fc58d0912c..c79eef3b15 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
index 1c451717e6..7cea33087d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
index 31871c8723..17c5925ee3 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
index d6f08c96c7..ae821ca37e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
index 84e5437017..328eafbb42 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
index 63c962c32e..170d4193af 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
index b7d548a180..93c10bd5b2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
index 8c6272e07e..8634a75256 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
index 588f1a9fe9..106d444a7b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
index e19c1a8fd9..ead34f27c8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
index 42f479a88d..46070650a4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
index d01a49e739..3356f3e0ed 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
index 2508723190..80680fca07 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
index b7aab7cf78..dd5b315612 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
index 9091954626..533824e1ad 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
index c449fd24dd..b53459e639 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
index 70430f18c7..e5dfe5a03f 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
index 066a1cebe5..b2ffffa3d0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
index 4ca0eb1817..298ec6becd 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
index 10f0851356..423e0c03f0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
index ffbabcef21..36ba5c2a44 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
index 62fe596478..c9f709bf6d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
index fb2a1b5cfd..c64d791770 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
index 815ea24361..f04faa3bb0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
index 142e513f07..26d3e23572 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
index 7587339b41..60c5de2cf5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
index 3572a71bca..1d6f2f627c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
index 4fc8e70dd2..d57f5db345 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
index 70ca933e60..f8bb093bd9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
index 857113b308..368c946855 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
index 2e6babc8f7..b5e0762ad8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
index c27f8ec628..b0c7516afa 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
index 5640f39d40..23c9c7ede4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
index 97502856d3..b3a7a16400 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
index e1cfbe7c38..c29cb0ced1 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
index 1f60e5d53c..820755a48a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
index 3209a8fa49..d69105e1ee 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
index 2b2a4aa926..5ac8722381 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
index cc5172ac63..25dc11b023 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
index dd8a2a8825..58e4e3e459 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
index ba85093ec2..33409a770c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
index b475c5cb7c..7b22917a80 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
index 23bbc698d2..1671cebf90 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
index 83a25b6ea2..180ead0bea 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
index 434bcc3b7c..2d8e5e80a2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
index 0a8fa3f441..657aba5145 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
index c1868d7640..dbb9feb6c4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
index 8765adcb84..91224b496e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
index 93c7d316fd..90c2267e40 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
index 2e5185c6ba..d2abe386a8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
index 1e944b92a4..45e91ac500 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
index ce60337fcc..4c86443f21 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
index d4b447e6e7..26474a7e66 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
index ab5c1020c8..d133f0d792 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
index 1ba3a448b1..f839af5d66 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
index 6941cfa42a..63856643c2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
index 3666002014..807563c551 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
index 1e6a948130..18a2dc7de2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
index 9166fca311..d055e30d19 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
index 6409d70720..173822fd54 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
index 741482ae25..75236a575d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
index 07a2beec5f..9a98b5d539 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
index b71d47bd20..7139c12435 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
index b066380ccd..c09a006fd3 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
index 6e5d50f758..439fcedefc 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
index 2b3ae7d4ca..2be3603655 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
index 794028b73b..e2b5e90e20 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
index d0eb665e2d..299ca939f6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
index f27b6a85c0..9c9cc178f9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
index c99d8d9474..5614d33ffb 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
index 36960edfd6..23abc572e4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
index c788b0bf48..e6eaef38f4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
index 4bf3edf769..10a533f9b9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
index 8803b3982c..ecdf3d399b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
index 7ce8732d22..dace90e6d0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
index c2af3c14ff..71b1bb8c7e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
index 06c44fb9f3..8a88da6165 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
index 12de3a1bb5..79cfde6711 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
index eed10b37b1..8f75ee535d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
index 6bf7615fd2..d2e3885e54 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
index e606c17663..60f6822235 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
index 03af1c57df..dbf1a275d4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 18,
     "nb_procs": 1,
     "nb_threads": 36,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json
index 0e6e8bf562..78ecf34fad 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json
index 240b12b518..3f7a17ad30 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json
index a8b1137f75..83c75d1f15 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json
index fc5fad1434..c53a9e850b 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json
index 7f2c1b7c5a..b6dd257be5 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json
index a3b6b75d6b..661653cb81 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json
index bce61517f9..146f09183d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json
index fa101061aa..12a7074eac 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json
index 5f892eb85b..4f1408492d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json
index 50ef41461a..0d7d0375ce 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json
index abb05e2b15..c9ad83becf 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json
index b9f3927091..ed26d130c8 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json
index b6f20354df..813dbc8366 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json
index e274494682..5f177643ee 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json
index a8eab5dc04..0fc1e3f330 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json
index a031ba4b89..879d2a5672 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json
index 81ca7a8f51..f6603c986f 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json
index 0e478bfbc2..77054629e9 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json
index 6a34982471..78a2c740f9 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json
index 8688109065..b4f35904c2 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json
index 620202c4dd..5cbd78e652 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json
index 7fdc52f2e6..6b4a8f6c77 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json
index 34ea1f4abb..ec227dbe02 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json
index de18e0e169..17b2d03abe 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json
index 1a71783f44..cb5668143a 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json
index 4264db31a8..67ef34ebff 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json
index 02e30f8a4d..24db9e8c60 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json
index dc61529d91..29fffbdf5d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json
index 1954638dd0..e7cf842f81 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json
index 535927848c..5bae156139 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json
index 5bebd92683..41168aa3d5 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json
index 827d765319..d467da9e01 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
index 76033a2f20..0921ad5a81 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json
index c197c76660..af6cd5359e 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
index d03f982ac9..45be87ee48 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
index e866c28efe..450a7612c7 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
index f48653d82c..13ec402909 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json
index 04a98be73e..e4967663af 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
index b02ead1f5b..b1c246c645 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
index 930d1e4a4b..46f82990bf 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
index a278e6d191..519e8c7d69 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json
index caf5a9f701..0a0a4adb95 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json
index a604589823..38e75d00e8 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json
index 4ed183a798..7b47028891 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json
index 40d1f86eea..e26c0754f6 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json
index e29f47db38..ccfb793b65 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json
index 1258127549..e87d41c2eb 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json
index 63d95c8e00..27289f46d4 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json
index 8e91630c42..f9bf0a5898 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json
index 6a4abfc2dc..c27ff1cdf2 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json
index ae77acb226..63f7800182 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json
index 7a1fd920d2..f473349943 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json
index 6dcc1cd143..4e38054fea 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json
index b0c2cb8ec6..8625af7dfe 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json
index 02a69683cb..5debba9f4e 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json
index f4b9b1cecc..1e5b0e4fcc 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json
index 27ea1fd737..b9bedcaf47 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json
index 8883e983b9..cabe12253d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json
index c1dcb850d8..b79d5b48b3 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json
index 437823df46..b7dce2ea5f 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json
index 1eb8e0791e..3b563a272c 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json
index 3dd12ad2a6..aa75808098 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json
index 6f518a43c9..2b7a2f2414 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json
index 2a92567a07..a9880add11 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
     "nb_threads": 64,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
index 4bbc8be733..7790576970 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
index baec108079..2ffb437507 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
index ade749ce40..0568e990e0 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
index a1a79a359b..9b2ca39994 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
index ecc411367c..c239ed6368 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
index ec3f514a35..66e3168218 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
index 9f89b8eca1..4e933142a5 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
index 3a385a0fa7..d40bd7b501 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
index 9d57e962a2..9f05f2c815 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
index b8d46029d0..de8342ba9a 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
index 0dfb890736..b02b0a3826 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
index 7cba643445..1b22f14f8f 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
index 39cd4f149d..f37120e1ef 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
index 8e75fc2b80..83312046ac 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
index 883be2b103..3ef27b8cd1 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
index 20347612f8..7219f9224a 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
index cdafd09302..6cbb00f212 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
index 4a93070449..71a81579fb 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
index 7e1e1ad33f..31238b5c4f 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
index 939fb4b810..9aa12d3fed 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
index dbe39d9bf2..e472f03081 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
index 02e6f6d03f..a5fca71ca7 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
index 67f891edf0..e6616e764e 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
index d8764a1713..13929b3926 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
index 3543f86976..0202896106 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
index 06f3e24e27..a805e67766 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
index 0666a181a1..2aae9e5586 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
index 8c6f60b6a5..4d3a85fbf0 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
index fd356cb140..9ab24a3ba6 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
index 0cf4f30408..50ffc1cc50 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
index 6877fbccd3..e1890ae5f0 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
index 7208274e09..083b7a5eca 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
index 4ec7086a19..96d7156655 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
index b654367c7f..be72799a7f 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
index 63496552ac..7a4b3bb5d6 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
index 3043ba3bfa..3d6a3b0bc1 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
index 2d926972db..1c37ef622e 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
index 3b93e638c1..570736e910 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
index f1a785f870..f69c0c5f7a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
index 62d67951e6..f003479706 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
index 5c7f7ea84b..b7442e7495 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
index 11ff94c746..e5cc9932ed 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
index 64d9ffff73..672d471b57 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
index 7cd10e31ee..64a405131e 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
index 9dbcb490a0..3de0ff8b80 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
index 95bed84707..b1953d8d3a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
index c84daaaed6..d76b3d516f 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
index 96f3370a42..404159828a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
index 86e554d99a..f776b0169a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
index 8384f63c5b..d2fa2281f9 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
index 5c5a6f7990..1c27211823 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
index 4b0271539e..38dec8135f 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
index 053599f91e..37526c01a4 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
index 8ab1bf759b..3177ccc6fa 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
index 689b89640d..91067008ce 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
index c5d1c5eb1b..c9f3e7b68b 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
index 82055fbcad..702e38250c 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
index 45012e2318..bef8769751 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
index 71626ee2a1..f9c90d7953 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
index 41b0118d97..48309d0ef0 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
index 604a3745cb..6ec5bbea3c 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
index cb7bf71f25..0ae6871578 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
index 761ccde974..df4e5109ad 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
index 0046927d07..d8a9afa1eb 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
index 359a709087..0ee33d6f2f 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
index 36b81a038a..b5b8e46c59 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
index 196a09dc3a..5937445438 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
index f29604a7d7..e40b733c63 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
index 1e39a03fca..388a5fcf21 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
index ccbdd82af1..d0fccf2cc4 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
index 6313aa60e9..9ecda3d8e2 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
index a614eaeebd..e3f5e0d2a8 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
index 8a92f2d2d1..55e59cfc85 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
index faf24f2246..bace48b859 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
index f495d18f90..aeeb5b842b 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
index 58bf78d06e..df234e0b36 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
index 48679b5187..f9c347b94d 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
index 5a8b8b97cb..17818d1b0c 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 40,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
index 0096910968..2308d82d53 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
index 7f01918b5b..39f1b607f6 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
index 35abb51e32..9259de046b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
index 39a9a9aa42..355bc22afa 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
index d0fa116deb..5773edf96a 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index 3979276bae..431199124f 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
index 2cfe7c2a22..fd58c0b9b9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
index 49f34e1cc1..ff0f6eef9d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
index 8e9d2517ef..7fe55d0367 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
index 75be8f3987..91ffbd0f5c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
index 4dee325aac..77c197f90d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
index 11bf064433..62bbdd89b2 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index ac3e9c7d2d..1672da1b86 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
index 714d8dcc2d..215de20f10 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
index c580a916ba..d2d85aafa3 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
index 65e184aa6e..d427208832 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
index a4e6842a5f..7a46e5dd2c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
index 5799fa50ee..b570b162b9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
index a3e6ea4f51..fe78ab38bd 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
index da5554725f..a4578671be 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index 9a87fd8084..b7c7063eba 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index f84cc0c970..ec9a875678 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index 01d70a1f8e..0a62d8a44e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
index d7a1bd312c..759bf13735 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index 328ae6b647..2afe31541a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index 9cd17b5626..c896c74883 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index 5b52bba2ce..91932ed729 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index 58df8d9037..62c2bf1780 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index a5406bac5d..fba8c7cfe7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index 140dc542c5..6dcd8eeeaa 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index 590fce02ef..489a4d0eac 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index fdf9725129..38d0aa5a04 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index 12305d607c..049946aa95 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index 43099989c0..5104aa6938 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index 8f323f215b..321fb2b79b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index c82dd4b75f..b604c21326 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
index fd8b6b8811..23218070a5 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index 504f571e5d..06629d170f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
index 93573005dc..ffd89f03e8 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
index c1e88ffe97..93dc35475e 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
index 8743e66961..f89532a529 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
index d16484e632..047a24eeac 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
index 6c34ce3b06..f7d3fbc6d7 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
index 79d962d4e3..cf202d5097 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
index ce66da25a5..c0795dd2b7 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
index 9af6561a89..87fb05d5fd 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
index fe7a63bba9..e6c409fc8a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index 1ab3c253c4..97accb9683 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
index a9970f7e09..72a2c0df5d 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
index b149be95bc..21f91136e3 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index b62abe417e..51c9bc8052 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
index 80e02c3eca..b04c61ef73 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
index ef088057c6..3b42646503 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
index 823bfcb494..304711eb4c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
index 7b710582fd..c46d34bc9b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
index 1633986048..76f11f4286 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
index ef6d5f82df..a7ea8f0938 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
index 597b4f71b4..29c0827245 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
index 6e17f9fe47..35229e063d 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
index 66a8674e81..98be2a799a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
index ba386f60f0..7d6ba0d8f5 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
index b878859cb7..674ccd0abc 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
index 00ea950a90..50d30df291 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
index da52e31699..8c3fff2d02 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index 52a2411e8a..5646c268d0 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index cf27f09f08..b06ceb6ba1 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
index 1d124b29f5..ef1d9c7155 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
index 944ebef73b..23135dde81 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
index 61c55f927e..1fa7d08553 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
index e533d57b87..19120edfaf 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
index ed40f674df..51281bcbae 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
index 32ed24604f..d0f14be80a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
index c3cc2df604..ef28ef9c5d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
index 522ad957c6..ef92f38296 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
index 6d2e831077..d2d307881a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
index b8d62d9def..cfef155b0c 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
index e3385a2503..0dba8bc3a5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
index c0aec29be5..1c113f3e06 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
index 5b63cefbdd..cd69595e6c 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
index 748211d782..8b31580878 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
index 6ffcd95acc..3846f95bc6 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
index d15bc0e754..3c51056212 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
index dd9ec9c406..7d54481122 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
index a36f928462..2c4a00016e 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
index e71d145c40..dff7a2de4d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
index 54d4dd377d..fdd4c2bc5e 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
index 6e183b1dcb..a074f932e0 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
index 011fc32b43..513d42962e 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
index 083c148241..173e82bb67 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
index 98d9e389a0..0b26c9422a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
index 1f9a8e24c7..9b2b74e5df 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
index 3146a16417..16106c73fd 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
index 9a146afacb..05f34b33af 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
index cbe729d838..780973d784 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
index 3326f6f3f8..0da4f23544 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
index 237cd70c6e..088ef0902b 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
index 9c4de01c68..778c6d81a9 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
index bc0436cd78..795a1338f8 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
index cd6b62c6d4..1f0ef60a89 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
index c19e98790c..fe84e91d2a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
index bcf6e60a97..24b80a8241 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
index 5942b2d7b2..903ae8aa56 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
index b1e0eae529..ce6516fba4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
index 0ba715dbc5..d26b00dd31 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
index b5802f146d..6166768d97 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
index ebc0678520..374ea2da40 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
index 02d5102c9a..99dfc77ae6 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
index 6e78530a50..84b06d9a31 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
index 7ed4e33301..8b58af95fd 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
index 80071658de..660f0c2456 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
index 02553aefce..0f192d5f86 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
index 6d6da432b9..639904f983 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
index 289da0ea2f..c5eb1c15e5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
index c3f8bde8ff..91c155f9e5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
index dcbdc796a3..88a5ce3979 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
index a33f0d6f3d..3d33683ed7 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
index 58566a7433..e362a99d52 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
index 719d5e96fc..7f198e9e68 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
index 0f237cc05e..eee2422a6b 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
index 9e718d5e19..2173ade0e3 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
index f0124fdb9b..1b2ac17d55 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
index c941489c18..a01be526ed 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
index 386109c3cc..6fcc3e72de 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
index d8e6f1719b..b48e7e8669 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
index d06224d234..a2fd75c217 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
index 4e9a1a6df6..c2fedbe98a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
index 05171de66f..4f70f1ad62 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
index 54689c5667..b68029a204 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
index c98baa7c49..10b7f9701e 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
index 2f29f102e3..5fd3389256 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
index 60a4589460..e633218807 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
index 41d185b830..b9541f2ce4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
index c536858c19..c06b157fc7 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
index dbdd26fe8d..30a60bf3c0 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
index 28997f0efa..47cd4516be 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
index 7dbe53edaa..bd9d7f2e7d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
index 5d5a2296b4..76f18314f2 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
index 2624908173..c658839f80 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 16,
     "nb_procs": 2,
     "nb_threads": 32,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index 11407c71b7..4b160d9080 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index 29e92e7741..05e0683e0e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index 779ac46b9f..f81ea77511 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index e62c50cf73..2b0902a9e5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index 1cf763ebc1..40c601ea07 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index e817decdae..cf8b7638e4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index f1b252ff1d..893ff14f8d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index 46b5da0a57..4addfca19e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index 871dfcce74..6e3be4f078 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index e129de1319..9d41c0fd35 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index 14baa0fb73..31fd52ac3d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index 71d5b70e1d..f458fabf31 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index 59d99c9c27..798782918b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index e3b5e7336c..608156acb4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index 8638a03281..44d1ad89f5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index b03a6ace76..a91e546fc8 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index c7c45f47e1..92fda19138 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index 161d69525c..4c1810d83d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index 203f4b1723..73f820a62c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index e88cc79aac..2b3302acd5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index d31433168b..79bc29e08e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index 43fff8e407..a537fc8109 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index 74816a7c92..3a732955e7 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index 122d4b98c6..00a0910cfe 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index 1cb183b9fb..6a833af27c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index 7679f119d9..ae0a89a7fe 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index 6e1b3138ff..bee7947c7a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index 657fbd1d32..87146dcb2e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index c5d8fcc8ac..e7dae5a665 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index ea9bab4303..bddbb3a7f0 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index e9f6baac00..57eefb1cf0 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index 4bbd879a03..ca117f5a9e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index 6aa235e895..dfc5b40787 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index 8a8cf40e3e..5b86780cfb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index d35b9cb6c3..1df7f548ab 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index 2de1581a77..2e28e0b78d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index a95962efe2..22e88b6835 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index 35759e812c..f52d379d3c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index 34b5d30c8a..e25f58ece5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index ae883c35b6..c94135d4bb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index f263b13ecc..920bc2411c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index 45de866bbf..acd925230e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index 73c19cd4ba..97c4867f6d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index b7c2e670d9..8bed2ed83b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index 2d0bab0449..25fb1ae241 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "round-robin",
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
index bb26f0bd30..16c1332c8b 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
index 9476c1c667..eb8e9e943a 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
index 93db552b62..36c1582f80 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
index 090881fbed..e177a5f061 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
index 2341045d58..c256ee51c3 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.json
index e0b301d0a7..30b7dfa212 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
index 7b7f01f99c..c8cfd33c5e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
index 940eeea473..9516c1a62a 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
index d274de99ba..5706ed64f7 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.json
index 9517a85531..da4012c149 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
index 96b1a5c9c8..e52f89ee15 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.json
index df4e5ccecc..50d34dcaaf 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.json
index e2c3c40498..051508cb1d 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.json
index ac4e6e7ec6..ff6e88e8b9 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.json
index 01d2b47c92..8fe83717ec 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.json
index cbce2fa428..d451e21250 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
index 6110a014c7..cfdb10eb4e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
index 0caf279da8..69ad8d081e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
index 77195a4154..ec677d93ab 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
index 0b7dabd09d..9d089f8cd5 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
index 9230722026..419a9a408b 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.json
index dcfa514f94..0dc9a99e6a 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.json
index ba67eb0de6..9269f98fc8 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
index 5db60af907..a22041a69e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.json
index ccf8e0bc98..fd3433679f 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
index a46dd0f288..07aab56685 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
index aaf47f382c..ee76dc2b48 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
index 99fe7d7722..1061a5e0f7 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
index bc594d87fb..61e6434342 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
index e58247a1cf..7a9849c3c5 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
index b5f23a18cb..c85cc5f4d5 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.json
index 5391321123..4ea47d6249 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
index 3126cca3ae..1fec6cb57f 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.json
index e47a45ff6c..d023b3e197 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
index 901dd48880..4bebbd7d22 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
index 542c01332f..52b012e022 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
index 7cd2c1310f..de9faa967d 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
index 7df8b02505..c7c5600951 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
index d7ca58cfba..2f5e9493b7 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
index a6e235b17c..d512ed5939 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
index f3bdff17c4..c394437306 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
index 445887cf3e..aa7cc7d2a2 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
index 5a5faacd8f..4772e2adea 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
@@ -1,5 +1,6 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 12,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
index 76e571e545..6696141a1f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
index 74e140c952..3d11dfb115 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
index bc8fdbd634..93d29aa608 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
index 31309ff3e8..e2495358cf 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
index 6af431e644..c12a21dddb 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
index ae790de0e2..f01598e89e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
index 84777c347d..916afbbb4e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
index 6a9d81052c..8814c6f6cb 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
index 4ac33bcd4b..bb6932c5a8 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
index 5ece65696c..a2916e0877 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
index 107d9e6cda..2f93a23d32 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
index 87113f9335..483133b882 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
index e072cdaa08..9e0463f660 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
index 8b06630bb3..68dba99e51 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
index b11a50a9e5..4b06856ce7 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
index 861d294735..304e15689c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
index afe5703f78..d1f59874f9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
index ce1bd98c19..675cf0dabe 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
index 00dc862998..ab47dcb97d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-26:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
index 95bdd7908b..2b5cf46889 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-27:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
index 81e3d73fb2..e157468719 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-28:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
index 04106777cb..70d9fc2d6c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-29:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
index 700fe9fddb..a13caa2e9b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
index b57e17f7fe..76c62a09c9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-30:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
index 26cb82a593..d9df37db02 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-31:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
index 3039cbe2e2..41a7ada180 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-32:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml
index dbbea38e51..34d0f4322c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-33:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml
index 68be602552..321d54a4a6 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-34:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml
index 853dc5f334..50ebb9865d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-35:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml
index 8308411800..297b2f6ee8 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-36:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml
index c5f538c4af..ebb75ae99b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-37:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml
index 483d369563..a5fa0bbd3a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-38:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml
index 62f5205b23..9e627e697e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-39:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
index 2e57cc1e7e..11bf164cf1 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml
index 848b7f17e2..825a8d7ee3 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-40:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml
index 830dd0728c..f7b8784304 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-41:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml
index bdc818c0d0..5e218626fe 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-42:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml
index 6f0f941c37..01a5bbf3c1 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-43:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml
index 1e793afd22..7a1f1991ec 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-44:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml
index 22d689dc06..09b8735241 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-45:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml
index 4662116147..ded96b30a5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-46:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml
index f62c5acbdd..0b433d035e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-47:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml
index 43844e2c54..b3f202d510 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-48:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml
index 8b502ce5e0..2fd705d3e5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-49:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
index e7b9ea71fd..46a6826fe7 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml
index 7db50ae6fc..a393bc17e7 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-50:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml
index fd56e856fe..67ff07e165 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-51:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml
index 8451c398b3..4dc5aab864 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-52:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml
index 624ac4ffd3..08bdda6e61 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-53:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml
index 137c78d30e..243286aefa 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-54:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml
index e56e9d0c3c..fda130091f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-55:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml
index 46bad22b80..ad0bbdfaff 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-56:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml
index 19ad45a278..71134e04ad 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-57:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml
index b9c057e552..603847f64c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-58:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml
index 87e6591a74..603a66a272 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-59:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
index ed5f6a3c41..9682d62da8 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml
index 9ae48e8aa2..d22c5a7756 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-60:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml
index 64c492257b..2e5ae0c02d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-61:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml
index 992db87fa2..1d0ae8778d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-62:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml
index d08f326490..89c473611a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-63:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml
index 3c65c1c06e..5d4834bc44 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-64:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml
index ca798f00ea..74f91ef7f4 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-65:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml
index add28f2a5f..49b922757a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-66:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml
index 3d2cb02238..bcda58e8ca 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-67:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml
index 2ae0cc3a08..605662d161 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-68:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml
index c3127c6ed4..9afce0e562 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-69:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
index 9a268cc0cf..e36dff1acd 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml
index 6f9d258491..2d670ab9ed 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-70:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml
index ed459190dd..87c93731c6 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-71:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml
index fd476b23a1..c26a1ccb31 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-72:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
index c30b0802a1..342f715147 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
index 26371ee835..e12b21f23b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
@@ -2,6 +2,7 @@
 ---
 dahu-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index 8fe13b6673..7137c09c70 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -2,6 +2,7 @@
 ---
 yeti-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 64
     nb_procs: 4
     nb_threads: 128
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index db16234d01..e78c8a8880 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -2,6 +2,7 @@
 ---
 yeti-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 64
     nb_procs: 4
     nb_threads: 128
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index 34cbe967fb..cbdfc72460 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -2,6 +2,7 @@
 ---
 yeti-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 64
     nb_procs: 4
     nb_threads: 128
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index c9e2639a25..2afe6e7005 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -2,6 +2,7 @@
 ---
 yeti-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 64
     nb_procs: 4
     nb_threads: 128
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
index 3b87d2116e..4e03ff93cd 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
index bc8b65631b..836fe100bc 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
index 2a6214a4c4..8486582cb9 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
index 24c4f4281d..917e7cbd7c 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
index 6cd5b4d8c4..c0a5d76993 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
index c89e0f0faa..b52ef36f19 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
index 5facc30dc4..fd1083c3d3 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
index d1aef38b27..adc02bdb1f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
index 333e87fb18..4580f3ea5b 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
index 9a7a2c31b1..f0cc26e78f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
index 430c08402f..fa45b6aa33 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
index 13d3457a5e..2d699c7ac5 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
index ab53925861..1a4daf68d1 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
index 3bff3527d3..361410754f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
index e1fd534e46..c5abb724cd 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -2,6 +2,7 @@
 ---
 chetemi-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
index 299379341b..ec68ebf08a 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
@@ -2,6 +2,7 @@
 ---
 chiclet-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
index 8688f4245f..7aa9ddca66 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
@@ -2,6 +2,7 @@
 ---
 chiclet-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
index d0fb2a3b10..361979036a 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
@@ -2,6 +2,7 @@
 ---
 chiclet-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
index 5931228d82..40158af3cf 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
@@ -2,6 +2,7 @@
 ---
 chiclet-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
index 0673461642..5190f9f51d 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
@@ -2,6 +2,7 @@
 ---
 chiclet-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
index e47f1b7645..289521482d 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
@@ -2,6 +2,7 @@
 ---
 chiclet-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
index 141a8d8bb3..b0e2185091 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
@@ -2,6 +2,7 @@
 ---
 chiclet-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
index b71a822ba5..e2656fb6f5 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
@@ -2,6 +2,7 @@
 ---
 chiclet-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
index c74f8e698d..175fb0a58d 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -2,6 +2,7 @@
 ---
 chifflet-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 28
     nb_procs: 2
     nb_threads: 56
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
index bbf4c07341..90aeaa8f7b 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -2,6 +2,7 @@
 ---
 chifflet-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 28
     nb_procs: 2
     nb_threads: 56
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
index a99a3cf0f1..8121bd3cda 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -2,6 +2,7 @@
 ---
 chifflet-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 28
     nb_procs: 2
     nb_threads: 56
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
index 7b9236645d..a81be96d51 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -2,6 +2,7 @@
 ---
 chifflet-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 28
     nb_procs: 2
     nb_threads: 56
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
index 5d6c8b7c05..dbd8a22118 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -2,6 +2,7 @@
 ---
 chifflet-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 28
     nb_procs: 2
     nb_threads: 56
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
index 533101ff75..c09924564b 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -2,6 +2,7 @@
 ---
 chifflet-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 28
     nb_procs: 2
     nb_threads: 56
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
index 966cbd135c..fc84fd526f 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -2,6 +2,7 @@
 ---
 chifflet-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 28
     nb_procs: 2
     nb_threads: 56
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
index c97d9cc835..dbab9f0f6d 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -2,6 +2,7 @@
 ---
 chifflet-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 28
     nb_procs: 2
     nb_threads: 56
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
index 845fcd0a4c..8ae2dd49eb 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
@@ -2,6 +2,7 @@
 ---
 chifflot-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
index 94d8a79f0c..7ee3986ceb 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
@@ -2,6 +2,7 @@
 ---
 chifflot-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
index 0c272028be..0379aad3c2 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
@@ -2,6 +2,7 @@
 ---
 chifflot-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
index ef50ae2764..1ec3b4d6d9 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
@@ -2,6 +2,7 @@
 ---
 chifflot-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
index f22b2c8bd9..0daaf5ae83 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
@@ -2,6 +2,7 @@
 ---
 chifflot-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
index 58ba3af46b..08c64b227c 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
@@ -2,6 +2,7 @@
 ---
 chifflot-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
index 4353422289..56401c2af9 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
@@ -2,6 +2,7 @@
 ---
 chifflot-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
index 45109caa59..ee6f58c1d6 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
@@ -2,6 +2,7 @@
 ---
 chifflot-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
index f024e0af8f..2ab533a9a3 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
index c84f6ae5f7..c19c5364e4 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
index a81e793f0a..697aa24a87 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
index b9d737c5a4..649dc00806 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
index 07f6d39aba..affb9e6758 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
index f2dc6d16c0..70fd1c0240 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
index 4785c383d7..a1f0d92ae7 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
index 089efe6a17..cf4ea45867 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
index 56806087c5..35352032a1 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
index dfff18bae6..f2afaad317 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
index 988e531b8f..2134ddeb97 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
index ea9d6e466e..0d97fab280 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
index 19d705450f..f22d02bbc6 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
index 2abdf29ed2..0cf70b458e 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
index de2e09892a..d164929471 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
index 5ec28d5a0c..dd6ff4abe9 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
index cdfc080723..a670a646b6 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
index cbf6052d31..d04baec703 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
index 34e15cb0ce..3946ef3b85 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
index bce4beddb1..783c0b836c 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
index 082320ac5b..2f720c8a0a 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
index 32d4fe6bfb..d50dc8e338 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
@@ -2,6 +2,7 @@
 ---
 granduc-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
index 8cb09764e7..0947a834d2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
index b2fd489c96..343fa708e3 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
index e00d81e075..6c577e920d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
index edd9e334d7..26964c7533 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
index 68284ac955..90e0472107 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
index bb265d36c4..74a86bc5d6 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
index 9ba60d3d19..cf42cb6557 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
index ca42ffacad..8cb408f381 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
index 52729420e6..e9f8066739 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
index 1851869a11..d86cd022af 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
index 98d6d7255c..b2c9eee701 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
index a761bbb6c0..6d0f379c15 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
index 882a1d93cb..2c7d252dac 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
index 53f7cb1af7..462ecbaed6 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
index e42a55ff4c..0176beb384 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
index de5d320ff2..2008ce56c4 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -2,6 +2,7 @@
 ---
 petitprince-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
index c6249193f1..87d6c16f58 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -2,6 +2,7 @@
 ---
 gemini-1:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 40
     nb_procs: 2
     nb_threads: 80
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
index 9ace1c3576..603dcffa61 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -2,6 +2,7 @@
 ---
 gemini-2:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 40
     nb_procs: 2
     nb_threads: 80
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
index cad84908f5..6e57698c19 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -2,6 +2,7 @@
 ---
 hercule-1:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
index 9e06f17620..c9ff71afcf 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -2,6 +2,7 @@
 ---
 hercule-2:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
index 03ac228ba7..79bde32aa3 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -2,6 +2,7 @@
 ---
 hercule-3:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
index 9d1ad4804f..d7f1db4e0d 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -2,6 +2,7 @@
 ---
 hercule-4:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
index 0718703d55..7091bf5e32 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
@@ -2,6 +2,7 @@
 ---
 nova-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
index 12fe601893..650e01333c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
@@ -2,6 +2,7 @@
 ---
 nova-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
index 6b91910911..adc728db9f 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
@@ -2,6 +2,7 @@
 ---
 nova-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
index 5b14efcfcb..8bf1ded028 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
@@ -2,6 +2,7 @@
 ---
 nova-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
index 3274e908e3..ac83b8a79b 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
@@ -2,6 +2,7 @@
 ---
 nova-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
index e23fd670c0..9082b72401 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
@@ -2,6 +2,7 @@
 ---
 nova-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
index 660b6f13ba..886552d67b 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
@@ -2,6 +2,7 @@
 ---
 nova-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
index 1dbe119b3d..5c4111f4b8 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
@@ -2,6 +2,7 @@
 ---
 nova-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
index 9d69cd2ec2..7975e27362 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
@@ -2,6 +2,7 @@
 ---
 nova-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
index f6ac9dc774..efd99bcc5a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
@@ -2,6 +2,7 @@
 ---
 nova-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
index f2b0054b36..d72bbb4fd0 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
@@ -2,6 +2,7 @@
 ---
 nova-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
index 4d6f61041a..14b9b9db9c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
@@ -2,6 +2,7 @@
 ---
 nova-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
index cea1ab03d8..39a8cb940a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
@@ -2,6 +2,7 @@
 ---
 nova-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
index d7fee6a5c8..8a31ae6537 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
@@ -2,6 +2,7 @@
 ---
 nova-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
index 1ecb8d56fa..1e9c60a918 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
@@ -2,6 +2,7 @@
 ---
 nova-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
index d5795037dc..ea7bdd28b2 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
@@ -2,6 +2,7 @@
 ---
 nova-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
index cd3da9e601..f5e6f3a6e6 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
@@ -2,6 +2,7 @@
 ---
 nova-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
index ecc5e6ab56..d123c3a5a6 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
@@ -2,6 +2,7 @@
 ---
 nova-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
index 42f0ca1569..264440183f 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
@@ -2,6 +2,7 @@
 ---
 nova-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
index f0c1aa510c..32a8e893ef 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
@@ -2,6 +2,7 @@
 ---
 nova-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
index 5ece9cdc53..ee27f004d1 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
@@ -2,6 +2,7 @@
 ---
 nova-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
index 90aa61c5fe..c6d9c0ad19 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
@@ -2,6 +2,7 @@
 ---
 nova-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
index 4504f0df52..cc81c952d5 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
@@ -2,6 +2,7 @@
 ---
 nova-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
index c275fc88c3..e28f244acd 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -2,6 +2,7 @@
 ---
 orion-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
index 4ed5870fc8..d5488b8cb9 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -2,6 +2,7 @@
 ---
 orion-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
index a9f1171a4b..7a7493c374 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -2,6 +2,7 @@
 ---
 orion-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
index a1be7116de..cf12ef7347 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -2,6 +2,7 @@
 ---
 orion-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
index e632f7e92c..551b8c2b99 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
index 870484732e..ed36edc1f1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
index b6cfc22ff5..8cc1cf29f0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
index f8aaad83d7..a778ef08fc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
index 35cffdec41..133fbe6a79 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
index f403c16747..51eb94d00d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
index b61fe63f84..35c016760c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
index 2663cf65f0..4066a2db06 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
index 10f63ef9ab..5d58dc96af 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
index 8973f9fd04..dfd69317ba 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
index aeed3f7a9f..1922a242ab 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
index 30afc02eb5..2c6654614a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
index 7df5f9e353..54e5cbe2c4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
index d6f984549a..7539000290 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
index e2e16e913b..00841751ae 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
index 6ca7b3ec38..cdd2823dd0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
index 1526afbed8..e507eae664 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
index dc0cb2c2fd..1f45f1a363 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
index 1584fae66a..16d01c371e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-26:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
index 60397e33b5..6921d5c78f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-27:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
index 01c1b2470c..48f8457e59 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-28:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
index f9217d2469..c2385af1d6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-29:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
index a2bba5aa95..a4d0ba29c0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
index 2b21055205..e31294cab6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-30:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
index 84cd25a0eb..f96fdc6551 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-31:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
index 338864ed0b..4cbffa89d3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-32:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
index 5d670f7e88..e292b3deb2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-33:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
index c097a680ef..9916dc6139 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-34:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
index 23c38c3900..1ebf6c65a8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-35:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
index 370db3cfaa..103e39c87a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-36:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
index fb3365855e..efa59bf124 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-37:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
index a6046c72ed..4ff6e2eb9f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-38:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
index 265cb9bf12..93eeda59b6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-39:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
index 9413f72bc8..47cb9e322e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
index 3ebfaa2f1f..daf29edf01 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-40:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
index 176bcdf38e..432c89731b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-41:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
index 426089e044..516d8ef361 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-42:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
index 6226857ee2..0492393097 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-43:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
index 10f1bb285d..1f37b83ff1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-44:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
index f5c13273b6..bdcbb04240 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-45:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
index be817581fb..a97be2a172 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-47:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
index 9017b07154..b939e207ab 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-48:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
index 0880e0116d..b67b131e2d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-49:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
index afb1dbd754..c3f165e237 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
index 11fb2b32b8..f8b0d610aa 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-50:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
index bdd2fe882b..d197740666 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-51:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
index 292e52df91..f1c5cd8dcd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-52:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
index 47b78a577a..853869813e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-53:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
index 30f6f5f400..1c84f57ad5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-54:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
index 0b837fad5d..2c7f4a4f6a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-55:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
index 50239fe9c5..3d7224ab71 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-56:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
index 469ab21cac..bca586ec03 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-57:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
index 02b32e57bb..ae0c7365e4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-58:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
index 7e46ba5579..384b3db441 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-59:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
index 19354d9ade..8bb69e81d0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
index a19a4d04eb..ba7c0e4204 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-60:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
index 6670b21454..6608b127d1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-61:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
index 7c4d114b49..79abc62c2a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-62:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
index 6ce5f340f5..fab9288be4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-63:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
index df28a8aaf3..ad8c0bedaf 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-64:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
index 3e794f82b9..bfff37ebb7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-65:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
index d0ecb55daa..ad04b9725b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-66:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
index 39ac65fec3..7b4f2c8c45 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-67:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
index 0cd2687e05..1a3354e30f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-68:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
index 12b764079c..d63a5cb671 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-69:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
index 373580c602..c75c1ce45c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
index 4ce11bc655..7ba01f5cec 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-70:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
index 4b09b51c01..37252ae6ba 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-71:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
index ab0f7a9ccc..65fc68e45a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-72:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index 56990deb40..37e8e12116 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-73:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
index 5afeb5e36e..77c22e180c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-74:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
index 60f44b0930..ac2361d480 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-75:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
index ded77fc94f..3fbddb001b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-76:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
index de915cca4a..2b73276df5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-77:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
index 7f37c64e6d..8915d5409a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-78:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
index ac4b1e9ae9..69c89c21db 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-79:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
index 03c32d0744..30a17a644e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
index 2f44b16b3a..4974710df5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
@@ -2,6 +2,7 @@
 ---
 sagittaire-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 2
     nb_procs: 2
     nb_threads: 2
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
index 0c0ba317a7..cd484782e8 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index 89155f9127..fed33ba4f0 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
index dc161389ba..ecc5d55a63 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index 302f798ea1..b7b89bc9dd 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
index 8813304b0e..b922a5096e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
index 970ea00ea2..561d41771d 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
index 336ed5e682..d904072ea5 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
index 78e0721c7c..13e72ff05e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
index 960c6b7de0..f0cb047f2f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
index b959ebf1a8..1abf640378 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
index 096de67ddd..8849ee241f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
index 8b9d0e83b7..a28b413c54 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
index bb4ed1cf71..bd58d616b1 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
index 55169bc599..d0ddfecec3 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index b627a56c6b..eb6945211d 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
index 8f3175c95d..5fe5cd0497 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -2,6 +2,7 @@
 ---
 taurus-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
index 9901f1ddda..5706189041 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
index 943016ad56..0e56f48cb4 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
index 96e94bbf1a..72716b1ab4 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
index 867af92055..fbf8589752 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
index 7d9c433f6a..ac127cd154 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
index 017a34bee1..c96da124d9 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
index c868c0001e..a62a0e8a6c 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
index d60052d2b5..e4c9911c98 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
index 808f080021..5c72997f1a 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
index ade9f0664b..b7b9cb014b 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
index 9cbd68ef51..0d8743428c 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
index f2a79be45b..067f0cb300 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
index 61cbe0d099..26558f2979 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
@@ -2,6 +2,7 @@
 ---
 graffiti-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
index b3350967ba..16f634f7be 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
index b9921c3fef..93d23c88bf 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
index 87df7c7399..2cc1668aed 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
index 0017863be4..620ac8999f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
index 302a72b208..02768a6475 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
index d1af1ccee5..eb005ac61b 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
index babffd42f0..a4f608bbb0 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
index a954e74ef8..02c8d4012e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
index 54d0353432..85fdba12c9 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
index 7b0c282caa..8d5d2cb5c1 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
index b0110a2d6e..920586f7f8 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index 2fbd0a33ac..150c82d82d 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index da6179fcdf..f2ce575bd9 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
index 64a35ea0b9..ceb74bb375 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
index 316723b5e3..aea1360319 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
index c77c6277fb..772d8ad1c4 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -2,6 +2,7 @@
 ---
 graoully-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
index 29cc00090e..5751121099 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -2,6 +2,7 @@
 ---
 graphique-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
index e26eca8995..32d3801687 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -2,6 +2,7 @@
 ---
 graphique-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
index d0a61e2165..7a951a5ad6 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -2,6 +2,7 @@
 ---
 graphique-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
index 1aa5615a42..2f91eebaa2 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -2,6 +2,7 @@
 ---
 graphique-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
index f58f636584..bd18c03ba7 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -2,6 +2,7 @@
 ---
 graphique-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
index 531331b7aa..bf7d373a47 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -2,6 +2,7 @@
 ---
 graphique-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
index 7534afa6cb..e0cd2c622a 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -2,6 +2,7 @@
 ---
 graphite-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
index 7250ee7eb0..2652102698 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -2,6 +2,7 @@
 ---
 graphite-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
index 2323fe619e..db1639fdba 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -2,6 +2,7 @@
 ---
 graphite-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
index 741026c502..d73115abab 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -2,6 +2,7 @@
 ---
 graphite-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
index f87cc2a14f..176be762d6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-1:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
index 7a22f27d6d..2c7e355080 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-10:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
index 7c96d0a9ce..472d0796dc 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-11:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
index fb94aa1377..7634779c0c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-12:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
index cef888e991..0e6ccda86a 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-13:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
index c711da2add..ddbaa42e8c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-14:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
index e3f0c5cb65..9fbbc7d092 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-15:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
index 4c0a8c1429..08365aab8e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-16:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
index 662a2d755a..0e6b3519e3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-17:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
index a19a45c688..915afd52f9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-18:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
index 5e652db360..f3918cbb56 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-19:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
index 61e641bb98..4ff124d3f5 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-2:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
index 1a85a99fb6..66eff38976 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-20:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
index 1cd4502041..508fd3454e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-21:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
index 1458b6c0fc..92fcc229f8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-22:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
index cafd14623d..8c844cdd58 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-23:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
index 704a5de24d..61db6b1f0a 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-24:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
index 2cb23f65e1..fb8a66aca8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-25:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
index d87608c3f3..6a4dd18c3f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-26:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
index 20879fbbc1..780d5c8018 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-27:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
index f59dc35e02..f5255cd8d6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-28:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
index 53ad10517c..c4e795857b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-29:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
index 1ccf98e115..4452dc8294 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-3:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
index e4ec068a74..b41524a30e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-30:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
index 527cc33fbb..7a00221dc2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-31:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
index 08e7937625..778d627e31 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-32:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
index cb887acb50..ce3c69ff5e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-33:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
index 0dc33d507a..f6c9a515d8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-34:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
index 257b399664..709af19d3c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-35:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
index 230b8f6017..0503c16b39 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-36:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
index 1ddfe38828..0c425e044e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-37:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
index 1390db3f77..c2f77f4d7c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-38:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
index f7efde90e9..336774881e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-39:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
index 6f406835a7..37769d0362 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-4:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
index 0b2e70bdf0..4e47dd3e37 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-40:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
index e7bcf452a1..56ce523a0c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-41:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
index 0c9cc86bb7..d21ad79cbb 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-42:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
index 129c975497..282c42a5be 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-43:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
index dfad654cc9..aa36b9a08a 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-44:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
index cd197c47e6..27aef9500e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-45:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
index 41c26d0689..2128f9addd 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-46:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
index 048299e248..a7bd3b32fb 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-47:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml
index db4b2f386e..8c404b098e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-48:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
index 42f925a386..491786d6c7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-5:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
index 40b511530a..61389efe03 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-6:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
index dee6a673c2..3ad47219b1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-7:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
index c4470b591a..a00e354740 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-8:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
index 17c274043e..0c9016197b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
@@ -2,6 +2,7 @@
 ---
 grcinq-9:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
index 58cfe4b89f..1058814200 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
@@ -2,6 +2,7 @@
 ---
 grele-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
index 17cd23c7f7..8ebcbf7705 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
@@ -2,6 +2,7 @@
 ---
 grele-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
index ae27432f03..49c6a5905d 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
@@ -2,6 +2,7 @@
 ---
 grele-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
index f9d78cf57d..714a724d30 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
@@ -2,6 +2,7 @@
 ---
 grele-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
index c8b83c7c16..6348215fe9 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
@@ -2,6 +2,7 @@
 ---
 grele-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
index 9726a51e24..23fc5087a4 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
@@ -2,6 +2,7 @@
 ---
 grele-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
index 20913ac38a..f3574afa86 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
@@ -2,6 +2,7 @@
 ---
 grele-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
index 04174d48e4..cb2eee6020 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
@@ -2,6 +2,7 @@
 ---
 grele-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
index 81a3286ce7..59677798f7 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
@@ -2,6 +2,7 @@
 ---
 grele-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
index 6197223204..95cfcc9adc 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
@@ -2,6 +2,7 @@
 ---
 grele-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
index c51f935356..8a765c8c14 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
@@ -2,6 +2,7 @@
 ---
 grele-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
index 31e9896602..4511bdec49 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
@@ -2,6 +2,7 @@
 ---
 grele-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
index 3ab1982243..dbf05fcf4f 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
@@ -2,6 +2,7 @@
 ---
 grele-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
index 90d55420a1..11cef596d7 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
@@ -2,6 +2,7 @@
 ---
 grele-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 24
     nb_procs: 2
     nb_threads: 48
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
index 56b8764862..616635ba0b 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
@@ -2,6 +2,7 @@
 ---
 grimani-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 12
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
index 6ddf95e1cb..e721f60f6b 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
@@ -2,6 +2,7 @@
 ---
 grimani-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 12
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
index 5f53214639..32e8c73e7e 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
@@ -2,6 +2,7 @@
 ---
 grimani-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 12
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
index 1760ee8134..62161fe99d 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
@@ -2,6 +2,7 @@
 ---
 grimani-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 12
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
index b46e326c73..9140c7a43e 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
@@ -2,6 +2,7 @@
 ---
 grimani-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 12
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
index 3d4d74b394..9d6dd9596e 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
@@ -2,6 +2,7 @@
 ---
 grimani-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 12
     nb_procs: 2
     nb_threads: 12
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
index 6227b9a944..d52e0f7547 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -2,6 +2,7 @@
 ---
 grimoire-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index d8ce4c9789..981b795ea5 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -2,6 +2,7 @@
 ---
 grimoire-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index f03c3cc585..ba61600640 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -2,6 +2,7 @@
 ---
 grimoire-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
index fe9c366585..4b876872d7 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -2,6 +2,7 @@
 ---
 grimoire-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index de88102933..0670fa12de 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -2,6 +2,7 @@
 ---
 grimoire-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index 6d8ba37dc0..9225543522 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -2,6 +2,7 @@
 ---
 grimoire-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index 0df791c3ed..0d19ef8ecb 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -2,6 +2,7 @@
 ---
 grimoire-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index 62afaad3ed..954507ad56 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -2,6 +2,7 @@
 ---
 grimoire-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
index d9f36d08ef..ef60338754 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
index b0b143e25c..bd775634bf 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
index 240a54a4a7..f1e9e5faef 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
index 40399b89e5..7a043b1e35 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
index ba9a52e442..d81eba2e49 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
index 00538f571b..e23555e321 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
index ad1d27ec77..73e675044a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
index 990619ad8f..79bb35d433 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
index d4470ca701..7729b948f9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
index baffe2eb46..7ae10e419b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
index b927cef173..efdf3b271b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
index af1936bc01..ac1b95bd38 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
index 225aaaa61e..e52daa3e54 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
index ece533e60a..65b58bc15c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
index beb0cb5a74..ecb7ee776f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
index ab21c45413..15b4b6dd93 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
index fe0a2a4926..e035f386eb 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
index 4204fc6651..5339e22d81 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
index 5f42a90477..1cbaa280df 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-26:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
index e867e7ef82..d9b03ead35 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-27:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
index 974e7f36fc..77470aabb6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-28:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
index 4e725d33a7..226c04604e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-29:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
index dcc44fd66c..2dae1ee94d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
index d6fa835669..4395f5d82f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-30:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
index 45e7a9017b..d8816b6424 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-31:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
index 858ef080c4..a547bb5062 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-32:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
index d6a88fde91..cec1406a1d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-33:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
index 8389c6b2ce..64a34e610c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-34:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
index 843821d2bb..67ec5c38d3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-35:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
index eda571ea91..bdbcedaf77 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-36:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
index da1ec69a04..cc5a1e44d7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-37:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
index de9050eeff..6fb050d15a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-38:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
index 57b1bda92c..89ed1359cb 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-39:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
index ba611c26c3..7ef98a7dc0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
index 0fb7e98e26..47517707aa 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-40:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
index 7dcfebaed9..12f830cf70 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-41:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
index 203ed0c603..cfed19abb0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-42:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
index 45c026aa1b..05539fb95a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-43:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
index 8640cee1a8..db4ee44b19 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-44:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
index d94ac0632f..b2f9a0209a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-45:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
index e2d651899a..65fc211c95 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-46:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
index 7c3929f236..bb812a76ec 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-47:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
index af4bb4ac78..bc34ba36cf 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-48:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
index ffee9c6b31..cd6f64237a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-49:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
index 5e4e3f7fa6..4fe87323fa 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
index 256c542dc3..5f2bdcead4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-50:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
index d34d1a5445..22a85ccf03 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-51:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
index 593c7d5fee..46a3f694a6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
index 09f646da1d..f0a0d76e62 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
index a9c95033e2..9168f90408 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
index 08bea55a7c..123f48439d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -2,6 +2,7 @@
 ---
 grisou-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
index 24ec907eef..746a3349ad 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
@@ -2,6 +2,7 @@
 ---
 gros-1:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
index 511f2503a4..71c2c929ca 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
@@ -2,6 +2,7 @@
 ---
 gros-10:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
index e14de45e47..8db3d659f2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
@@ -2,6 +2,7 @@
 ---
 gros-100:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
index 3aba55feb8..046854674f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
@@ -2,6 +2,7 @@
 ---
 gros-101:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
index 8c7254b826..375a39c151 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
@@ -2,6 +2,7 @@
 ---
 gros-102:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
index e0b9955ddf..0ae21b07bd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
@@ -2,6 +2,7 @@
 ---
 gros-103:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
index e83a3dc81a..8b2e8e28b0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
@@ -2,6 +2,7 @@
 ---
 gros-104:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
index a825a107f1..fab2fd9487 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
@@ -2,6 +2,7 @@
 ---
 gros-105:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
index d3da234977..6db20d46d7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
@@ -2,6 +2,7 @@
 ---
 gros-106:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
index 34b9fb430a..7b82f54e4a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
@@ -2,6 +2,7 @@
 ---
 gros-107:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
index 2ace0fc5c6..28610f1756 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
@@ -2,6 +2,7 @@
 ---
 gros-108:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
index fb229d4b88..1e7522cc19 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
@@ -2,6 +2,7 @@
 ---
 gros-109:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
index 8d329e04aa..93e7d748d3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
@@ -2,6 +2,7 @@
 ---
 gros-11:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
index 645e3774fb..33ec200692 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
@@ -2,6 +2,7 @@
 ---
 gros-110:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
index 1623b9a7ba..961310ee54 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
@@ -2,6 +2,7 @@
 ---
 gros-111:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
index f8d97c0083..bef4972100 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
@@ -2,6 +2,7 @@
 ---
 gros-112:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
index b2ed486d8e..80e2ade530 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
@@ -2,6 +2,7 @@
 ---
 gros-113:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
index ffea4d13fc..2ba66b355b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
@@ -2,6 +2,7 @@
 ---
 gros-114:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
index 1b976883c1..450913a97c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
@@ -2,6 +2,7 @@
 ---
 gros-115:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
index 81fad5b386..d63fda2d58 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
@@ -2,6 +2,7 @@
 ---
 gros-116:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
index 67402a2d0f..5bede6358d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
@@ -2,6 +2,7 @@
 ---
 gros-117:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
index c3a8eb9900..044e84ee11 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
@@ -2,6 +2,7 @@
 ---
 gros-118:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
index 1fc359e0d6..6ce6d2dba3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
@@ -2,6 +2,7 @@
 ---
 gros-119:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
index 02933e9458..a1837e5efc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
@@ -2,6 +2,7 @@
 ---
 gros-12:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
index a243a52cd3..62e05771a8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
@@ -2,6 +2,7 @@
 ---
 gros-120:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
index d97db00ff3..9cd7bc277b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
@@ -2,6 +2,7 @@
 ---
 gros-121:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
index b1b2714421..08e561355a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
@@ -2,6 +2,7 @@
 ---
 gros-122:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
index 717bde56f8..8b6814c1ba 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
@@ -2,6 +2,7 @@
 ---
 gros-123:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
index 0748b785c0..4bf5d08d43 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
@@ -2,6 +2,7 @@
 ---
 gros-124:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
index d175f6ac68..2e7e8deda4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
@@ -2,6 +2,7 @@
 ---
 gros-13:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
index bffeea984e..815c7f83a6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
@@ -2,6 +2,7 @@
 ---
 gros-14:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
index 8b61b3ea23..3da62544c8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
@@ -2,6 +2,7 @@
 ---
 gros-15:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
index 56284abcd7..c672e4898e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
@@ -2,6 +2,7 @@
 ---
 gros-16:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
index f5a03586a5..d854eceb06 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
@@ -2,6 +2,7 @@
 ---
 gros-17:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
index e101c9ab34..0c1704b053 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
@@ -2,6 +2,7 @@
 ---
 gros-18:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
index 564bef82ea..bfae947a63 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
@@ -2,6 +2,7 @@
 ---
 gros-19:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
index 58c929665a..74c1361fad 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
@@ -2,6 +2,7 @@
 ---
 gros-2:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
index f08417eabc..44e472c315 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
@@ -2,6 +2,7 @@
 ---
 gros-20:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
index 5e41f03c02..9e557b39d1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
@@ -2,6 +2,7 @@
 ---
 gros-21:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
index 9650d18795..f64c907b63 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
@@ -2,6 +2,7 @@
 ---
 gros-22:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
index 12384dd184..a1e1a0d3b2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
@@ -2,6 +2,7 @@
 ---
 gros-23:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
index a1314d1f53..b92548d0b4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
@@ -2,6 +2,7 @@
 ---
 gros-24:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
index 2e2621fea0..046263e82f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
@@ -2,6 +2,7 @@
 ---
 gros-25:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
index 840d3825f0..1d42cb34c6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
@@ -2,6 +2,7 @@
 ---
 gros-26:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
index 976ad6a1d3..41f1b3f53c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
@@ -2,6 +2,7 @@
 ---
 gros-27:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
index 87c6bfa3dc..674e2b68b4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
@@ -2,6 +2,7 @@
 ---
 gros-28:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
index 50d2b60f87..18c590a458 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
@@ -2,6 +2,7 @@
 ---
 gros-29:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
index fbc11ae08a..8eeba46058 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
@@ -2,6 +2,7 @@
 ---
 gros-3:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
index 0ece5011df..7769570a9f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
@@ -2,6 +2,7 @@
 ---
 gros-30:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
index be536c17df..11841c468d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
@@ -2,6 +2,7 @@
 ---
 gros-31:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
index 0cb8d3ac37..b823c6be9b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
@@ -2,6 +2,7 @@
 ---
 gros-32:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
index c03dc4c649..8ae6d27a33 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
@@ -2,6 +2,7 @@
 ---
 gros-33:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
index c6808c6d57..d148764b06 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
@@ -2,6 +2,7 @@
 ---
 gros-34:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
index 89f9985dd7..b3a0f1ae89 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
@@ -2,6 +2,7 @@
 ---
 gros-35:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
index 438a0abfda..924536ce28 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
@@ -2,6 +2,7 @@
 ---
 gros-36:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
index 6c26befe91..44c2e1c53f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
@@ -2,6 +2,7 @@
 ---
 gros-37:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
index ea7df21b4b..db3e0d46b2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
@@ -2,6 +2,7 @@
 ---
 gros-38:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
index 438f203c78..b23b5c3076 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
@@ -2,6 +2,7 @@
 ---
 gros-39:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
index 1981533956..6ea27e51a6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
@@ -2,6 +2,7 @@
 ---
 gros-4:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
index 9cb78ad15a..a7247838ba 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
@@ -2,6 +2,7 @@
 ---
 gros-40:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
index bf82bf5294..ca78ccaf9f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
@@ -2,6 +2,7 @@
 ---
 gros-41:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
index b3cd044b06..3cc597ca18 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
@@ -2,6 +2,7 @@
 ---
 gros-42:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
index 71b3d27e06..76539ead6c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
@@ -2,6 +2,7 @@
 ---
 gros-43:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
index fb81074ca6..61bc3b8dde 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
@@ -2,6 +2,7 @@
 ---
 gros-44:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
index 7b49fc8182..668d0ceff7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
@@ -2,6 +2,7 @@
 ---
 gros-45:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
index 0d9a789ca9..feac51b0ba 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
@@ -2,6 +2,7 @@
 ---
 gros-46:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
index b4a4d64d32..5d933be25f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
@@ -2,6 +2,7 @@
 ---
 gros-47:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
index 2db833e3e5..4f85e95c2f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
@@ -2,6 +2,7 @@
 ---
 gros-48:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
index 2bf0ab0be7..8789607a21 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
@@ -2,6 +2,7 @@
 ---
 gros-49:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
index 0c43fc97f5..1e6683a6dd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
@@ -2,6 +2,7 @@
 ---
 gros-5:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
index bf30002ea2..586ce8464c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
@@ -2,6 +2,7 @@
 ---
 gros-50:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
index 8b8d1ad33d..670e4c7ec8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
@@ -2,6 +2,7 @@
 ---
 gros-51:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
index d79cf1ba96..4ae2775d52 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
@@ -2,6 +2,7 @@
 ---
 gros-52:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
index 200d403e05..bab6bf0db6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
@@ -2,6 +2,7 @@
 ---
 gros-53:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
index e86027e55b..57aeae3a8d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
@@ -2,6 +2,7 @@
 ---
 gros-54:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
index 05d1008a6f..a420f5e20e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
@@ -2,6 +2,7 @@
 ---
 gros-55:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
index 07bd4a984f..d292f36150 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
@@ -2,6 +2,7 @@
 ---
 gros-56:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
index e6d90dfd25..63e6d1ad79 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
@@ -2,6 +2,7 @@
 ---
 gros-57:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
index 4bdba9652a..d64fce615f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
@@ -2,6 +2,7 @@
 ---
 gros-58:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
index 506c45e4e4..24e6d19870 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
@@ -2,6 +2,7 @@
 ---
 gros-59:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
index 73c8520dde..5849b9517d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
@@ -2,6 +2,7 @@
 ---
 gros-6:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
index 95cf56d4e6..98255923bc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
@@ -2,6 +2,7 @@
 ---
 gros-60:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
index 2f86f79605..591420603d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
@@ -2,6 +2,7 @@
 ---
 gros-61:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
index 860e7d0802..997956c36e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
@@ -2,6 +2,7 @@
 ---
 gros-62:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
index b1ef72bba0..e204aa78eb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
@@ -2,6 +2,7 @@
 ---
 gros-63:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
index 3de7f3be7c..291c94a59f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
@@ -2,6 +2,7 @@
 ---
 gros-64:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
index e6e1a23058..f955f808d6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
@@ -2,6 +2,7 @@
 ---
 gros-65:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
index a7707b1fd7..8e178d7e59 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
@@ -2,6 +2,7 @@
 ---
 gros-66:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
index 3dd34af388..64817c5348 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
@@ -2,6 +2,7 @@
 ---
 gros-67:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
index 54152417fa..8cbbb09e7b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
@@ -2,6 +2,7 @@
 ---
 gros-68:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
index 969c6ae158..1cc8fba0f8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
@@ -2,6 +2,7 @@
 ---
 gros-69:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
index 96651b33c7..6fa69655d6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
@@ -2,6 +2,7 @@
 ---
 gros-7:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
index 2f2dd56355..c1ca849bc1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
@@ -2,6 +2,7 @@
 ---
 gros-70:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
index 486aa3d023..bd23bb4047 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
@@ -2,6 +2,7 @@
 ---
 gros-71:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
index 848d4cb166..b44d9ae4fe 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
@@ -2,6 +2,7 @@
 ---
 gros-72:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
index 684e868e77..e563586538 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
@@ -2,6 +2,7 @@
 ---
 gros-73:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
index 44982c6ee8..e00c58a9a4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
@@ -2,6 +2,7 @@
 ---
 gros-74:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
index 72cc036010..bcfce76486 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
@@ -2,6 +2,7 @@
 ---
 gros-75:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
index e932059c41..3fa25ad38b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
@@ -2,6 +2,7 @@
 ---
 gros-76:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
index 983b2e718e..8674dd7a1f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
@@ -2,6 +2,7 @@
 ---
 gros-77:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
index 1a10fd1316..8159d0be31 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
@@ -2,6 +2,7 @@
 ---
 gros-78:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
index ae92e84d98..a9aecfab42 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
@@ -2,6 +2,7 @@
 ---
 gros-79:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
index d4b3416d65..53a927a5fa 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
@@ -2,6 +2,7 @@
 ---
 gros-8:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
index a28cd18e36..75e89666de 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
@@ -2,6 +2,7 @@
 ---
 gros-80:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
index c693db3202..854c75e6ad 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
@@ -2,6 +2,7 @@
 ---
 gros-81:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
index cefce51b04..16cc53a90c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
@@ -2,6 +2,7 @@
 ---
 gros-82:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
index 66867611a6..1a307da4e8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
@@ -2,6 +2,7 @@
 ---
 gros-83:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
index bb0868859f..10ec0e44ae 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
@@ -2,6 +2,7 @@
 ---
 gros-84:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
index 53828aa10c..d710bf4d8d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
@@ -2,6 +2,7 @@
 ---
 gros-85:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
index e7f59f3dfe..b7fd12884b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
@@ -2,6 +2,7 @@
 ---
 gros-86:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
index fa4b2a9b2f..d154642418 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
@@ -2,6 +2,7 @@
 ---
 gros-87:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
index a7378aef70..2a091d7475 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
@@ -2,6 +2,7 @@
 ---
 gros-88:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
index 8a9830c2b4..4522c0d1bc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
@@ -2,6 +2,7 @@
 ---
 gros-89:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
index 328003d42c..6afd06f964 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
@@ -2,6 +2,7 @@
 ---
 gros-9:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
index 93bebc703d..9c39fbac30 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
@@ -2,6 +2,7 @@
 ---
 gros-90:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
index 22df39471c..abd81eebc3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
@@ -2,6 +2,7 @@
 ---
 gros-91:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
index d45142454b..e3670bb859 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
@@ -2,6 +2,7 @@
 ---
 gros-92:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
index 31190b19dd..b7595cac50 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
@@ -2,6 +2,7 @@
 ---
 gros-93:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
index 9ad7711355..9b9cb3ffa4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
@@ -2,6 +2,7 @@
 ---
 gros-94:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
index 0b2bf840cf..50896c46c3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
@@ -2,6 +2,7 @@
 ---
 gros-95:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
index d00c503eab..2eb8da5532 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
@@ -2,6 +2,7 @@
 ---
 gros-96:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
index 43fbf0f648..cd461ce8fa 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
@@ -2,6 +2,7 @@
 ---
 gros-97:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
index 54254f6094..44d2afb5a4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
@@ -2,6 +2,7 @@
 ---
 gros-98:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
index 5ed5ed2321..17f0e6f642 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
@@ -2,6 +2,7 @@
 ---
 gros-99:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 18
     nb_procs: 1
     nb_threads: 36
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
index df80fbc261..f1f3888e33 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
index 3382d104d3..8544ff9403 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
index 298e5198b2..a3ded75471 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
index 5e4e494113..1c63a0752b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
index d50c6e23f1..744c7ee7fb 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
index a1ee8877b8..fece78b7be 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
index 6beb55fb28..48fcae3d96 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
index fe2804d0fe..d013fc97fd 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
index 09361ad35a..ab1b1a9faa 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
index 60651aced4..a16a8ea4bd 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
index 6d58703e1e..e65bc48ca6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
index 75919392d2..7bc1015fbf 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
index 195cbc59de..fba6a29a25 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
index 9e70efa75c..1840350a20 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
index db0a02f1b5..b122988726 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
index 4e855acf84..14d733937f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
index b174a07173..088b675b0a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
index a026c7c32a..837ba9e136 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
index 8f81637109..01432e5821 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-26:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
index 955aaf7b10..dc1c6ee422 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-27:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
index 6c43a1d8ea..34b81828db 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-28:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
index f5c5e0fc85..bee649c74d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-29:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
index 9994fae860..134c2044be 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
index ba4ef63241..2ae0ec3ead 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-30:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
index 7823d5b97e..cc7dbe2277 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-31:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
index b8b8e8a089..42f2dd5985 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-32:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
index a5a2eb4fd3..acc8de01b1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-33:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
index c24710aad4..9c64f3a167 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-34:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
index a1b19e8463..48fe5afc6b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-35:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
index a99ba9d79f..7a20f64396 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-36:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
index e561c3f7af..eb27b85c6a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-37:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
index e391637113..5efe9c994a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-38:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
index 1cdd06766a..80c9ae355c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-39:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
index 33a5cea917..3cd891cd75 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
index dfb5fad1f9..265fcd356e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-40:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
index ed23ece0fb..67e0af346c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-41:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
index e13343aa07..e9cb267727 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-42:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
index 3363413f57..c39c34154a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-43:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
index 21c1cbfbe5..65b25fb159 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-44:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
index 3656cb9848..9c91ad2604 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-45:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
index 2423ef3f07..b99c3b3ecb 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-46:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
index 14f1d55d0d..ae6e923c15 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-47:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
index b515118d1c..3e8c435743 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-48:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
index 955a905ac9..61ffd550b3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-49:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
index 4eb5b36bf2..ff54476640 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
index 847dcb13d8..f398b3c655 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-50:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
index 25c946b673..76328f588d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-51:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
index 72e36fdd41..c042e77960 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-52:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
index 08e83181e6..52cccbb2ae 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-53:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
index a5e708425e..20faf1bea7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-54:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
index ac6acd2abe..95fcbdd37c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-55:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
index 74bb1b0ffd..c3f0159670 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-56:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
index 732d9eae75..053cfe953b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-57:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
index 2f52175cdd..71a6b20017 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-58:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
index 397066ccb9..6be1ba4a31 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-59:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
index 426f41d8f0..cfe259f51c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
index 5dadb49e73..3a899ff86d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-60:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
index 12da1124d8..7f6482a74a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-61:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
index 4356e6e32b..8958749f86 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-62:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
index a54f7934ee..55b3bff366 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-63:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
index bd689f5dec..5b8cda973e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-64:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
index 7760d6e5f5..d3d7629e8b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
index 133badf633..7157713b1c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
index f097f5cc63..a3356ed111 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
@@ -2,6 +2,7 @@
 ---
 grvingt-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
     nb_threads: 64
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index b11be04703..134a87cb7b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -2,6 +2,7 @@
 ---
 econome-1:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index 591c490ed2..bc22af552a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -2,6 +2,7 @@
 ---
 econome-10:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index 7f93ee74c0..440d877f7e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -2,6 +2,7 @@
 ---
 econome-11:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index 8324db20c1..7b438cff2b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -2,6 +2,7 @@
 ---
 econome-12:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index 396b38876a..7995540405 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -2,6 +2,7 @@
 ---
 econome-13:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index e49c4bee2a..234d96a16f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -2,6 +2,7 @@
 ---
 econome-14:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index bea79a5df1..13e9ddb8db 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -2,6 +2,7 @@
 ---
 econome-15:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index 0a236ae6ca..937898e0e2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -2,6 +2,7 @@
 ---
 econome-16:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index d3663b8b74..dd5db2a409 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -2,6 +2,7 @@
 ---
 econome-17:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index 82cfa43ba8..68cb92eb73 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -2,6 +2,7 @@
 ---
 econome-18:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index 5e4111e9e0..744e4574ba 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -2,6 +2,7 @@
 ---
 econome-19:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index bd8f4c8551..249bd86f30 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -2,6 +2,7 @@
 ---
 econome-2:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index 4fe95303ee..377aafea17 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -2,6 +2,7 @@
 ---
 econome-20:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index 1b14699383..0581dcf3a0 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -2,6 +2,7 @@
 ---
 econome-21:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index e52d1d2dca..c78f9ee31f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -2,6 +2,7 @@
 ---
 econome-22:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index 7712a74377..8ae68fbebe 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -2,6 +2,7 @@
 ---
 econome-3:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 6c0a8e6986..7741f8c9df 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -2,6 +2,7 @@
 ---
 econome-4:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index 1307d87f58..b129b13355 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -2,6 +2,7 @@
 ---
 econome-5:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index 1111baa24c..05564771da 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -2,6 +2,7 @@
 ---
 econome-6:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index 77dbf36ea5..08abd9932e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -2,6 +2,7 @@
 ---
 econome-7:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index 977db9b85f..897aecae18 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -2,6 +2,7 @@
 ---
 econome-8:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index ef55b06f0d..de907b06d1 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -2,6 +2,7 @@
 ---
 econome-9:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
index 288c4ef08f..66a9890bec 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
index e7a9f5212b..f07ce09779 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
index 6aba96c747..e594906ea9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
index 53177a9254..605ccb27c5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
index 3fb54437a4..9e479f854c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
index fd09599450..1cda3418dc 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
index a6bae61c4b..df29d0fc46 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
index e8c64195bf..8e7047ad40 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
index 38e2507fa2..c3228807e0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
index 1851f39172..965463b90c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
index 4f437f7af0..e8538cb400 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
index ab24142b29..e4740e7752 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
index 44c327b1e6..ca7baf70fd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
index f7377a1564..5eed4273b1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
index b8f182f66e..23cce33051 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
index d1a5502ab3..3826e3d780 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
index b345783f3c..91f257e42a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
index 41315676df..de4ec81f0b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
index 01b4924cf8..5f236bd668 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-26:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
index 5f1b1bd6d9..010f5ddb05 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-27:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
index 40864d3ebe..0bbe06ab76 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-28:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
index 0c10fde152..a34d5fbbf0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-29:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
index 8756afcaab..08d5ffd978 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
index 9a860d2860..644dedd5d8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-30:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
index e1fc25b895..fc0fad3535 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-31:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
index 5283bae71e..de2d9a5dcf 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-32:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
index cbe2344763..e5fbeaeab1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-33:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
index 3637d5acb6..63f1346054 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-34:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
index 7738ec3b0d..b1b832b91c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-35:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
index 8ac2b8bec8..9a13d6c62f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-36:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
index c9f96ee3d2..d8b86aa8cf 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-37:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
index 47984b92ec..f164641624 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-38:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
index 136b0920ae..04ce802eef 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-39:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
index 187ae69839..4d827bb7f0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
index f2d2925cc7..2f44b8df1d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-40:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
index 73221b8394..c55f982bd7 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-41:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
index 3d77a72c03..bac7f1f2a0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-42:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
index 28edec3997..42393aeb94 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-43:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
index 35b0475968..69296e70f5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-44:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
index eb7244f4bc..89bd942272 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-45:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
index 3f4856c961..456879ec19 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-46:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
index 720b22c341..fe51fc1739 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-47:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
index 5d8a6955d1..0560f6a35f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-48:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
index e7aa6d4b1f..7db03e2506 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
index 3c8dd03e0c..0dc15f5053 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
index 94077a4c38..be9fac5375 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
index 41dc6f2615..40c5fa6f56 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
index 34c7ae600f..5c5abeac90 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -2,6 +2,7 @@
 ---
 ecotype-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index 3ffaf367ab..f458e11735 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -2,6 +2,7 @@
 ---
 paranoia-1:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
index b604cabfe2..467d6fc6fc 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -2,6 +2,7 @@
 ---
 paranoia-2:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
index 5356744640..7f12baa4bd 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -2,6 +2,7 @@
 ---
 paranoia-3:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
index a631bb666f..9b09de5178 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -2,6 +2,7 @@
 ---
 paranoia-4:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
index e55be66436..79c2f908af 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -2,6 +2,7 @@
 ---
 paranoia-5:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
index 63a3fd6ef8..45d2a2d047 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -2,6 +2,7 @@
 ---
 paranoia-6:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
index fe0508443f..086ce7484b 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -2,6 +2,7 @@
 ---
 paranoia-7:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
index 5c1464ae8f..51af15d096 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -2,6 +2,7 @@
 ---
 paranoia-8:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 20
     nb_procs: 2
     nb_threads: 40
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
index ad1e815d80..9b80522740 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
index 33f280ca3e..bb3303b413 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
index 5c7833923d..23429e6100 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
index 7fb94ff65f..cd79a976b6 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
index 4d1881ccc6..a385d39b46 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
index 02b5cf7f4f..78d75443f3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
index 32eb3b4c80..ecf75794f1 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
index f28d5ed6e9..ac244ff160 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
index 3636547c7b..0da13c1778 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
index e44313692b..799fc3f671 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
index e47ba0ceff..2bb24ef994 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
index 29fa1c84a4..9e33d08174 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
index d29c41c233..88b6c58686 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
index c86bdb5f27..bef245e6f8 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
index b419c351bf..a9acf3d0c6 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
index 26d3812318..841fb5f3e5 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
index 714f65336c..92e4b287dd 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
index d8d09b74e9..8a3f85c153 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
index 9975281a53..72485f408f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
index e18f0b9a2c..6dc6ca826c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
index 81877977b1..eb3ad9d3ec 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
index c823f156f2..2010c60c29 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
index 5150ac4865..c0dfa359ea 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
index 8f5309b99a..f44e86bccb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
index f808025d3c..d4b90f83f6 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -2,6 +2,7 @@
 ---
 parapide-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
index 1a9a8833d7..ab6cbb205e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-1:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
index 34fc3375ac..6ba633a517 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-10:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
index 2613e8bee8..b32cc86507 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-11:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
index b51dcb7e5b..941dc64c0d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-12:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
index 56d26d8d0e..c7dc21d768 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-13:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
index 9189b27c25..0e86c252c6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-14:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
index 5dc68cf22f..cd2c6b36c9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-15:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
index 74d96289ff..0707676627 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-16:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
index d48b2a8ad8..0fbb40c7d0 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-17:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
index e2d891ee12..ceab6c22f8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-18:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
index bdb08d9d35..0dff3ba02b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-19:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
index 4592cec3c3..c2cf5d821a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-2:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
index 15b7d72c63..551ec1b0a0 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-20:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
index 5d3b0d5f9a..0214eeee20 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-21:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
index c314394a93..582941c4e2 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-22:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
index 59ec701e2e..c3671692ce 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-23:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
index af7ec706fd..73d4740dc6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-24:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
index a33e3b4db0..0b509bb8be 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-25:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
index ae90fb0f1c..73e441670a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-26:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
index dd845f4fcb..e601fbdf0d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-27:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
index 2657fc7d94..cb8ce217cc 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-28:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
index e9caf3a7e8..e531012451 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-29:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
index da701a96f0..1b59baa5d0 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-3:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
index 6f94355e49..0db0aec947 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-30:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
index 0250fea4d3..37f481af66 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-31:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
index 8329c62759..a0b5af3716 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-32:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
index 67a36475d1..f63d19f865 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-33:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
index f206ff4004..6de1369d3f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-34:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
index ce16870316..a624ba5cf7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-35:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
index 7309baa6c0..0fcb487030 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-36:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
index 16ca782087..ef9037dca8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-37:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
index 6512cdc446..47bb5c3ee8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-38:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
index a882289c7a..4816b09aae 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-39:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
index bcecf0fba2..6fc92617ca 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-4:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
index 69dce43723..af8356da87 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-40:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
index 8324ba7f8c..f6fd1b12f4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-5:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
index c627a0538f..8c1157cf1e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-6:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
index 4943927a7f..a05387c80f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-7:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
index 0ba13a6279..e1d3b6c6b3 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-8:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
index 4f5543ef29..c612c8cf19 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -2,6 +2,7 @@
 ---
 parapluie-9:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
index 8910d7e375..7d47dae826 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
index a7968fbcef..cf86ff3a75 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
index 804dd6f135..38ce0f621c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
index addc39d03c..01320b94a5 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
index 40c6480372..f2ce3c8e17 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
index b2b0d0a475..73f3c8775f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
index 9a5fa9d88b..81e6c042e2 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
index 5b8d225e97..d40d93684e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
index a4265bd48c..a4819867b2 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
index 594bec5022..f6287c7314 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
index 6706cce3d5..1f9e80bc64 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
index e98b1f6de6..1210b2a65e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
index 482f2e066a..6b6985d563 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
index 6affc681a2..7c5d6dfeb9 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
index 71d5ffc534..72f4bf2ce2 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
index 633089a8e6..5b28720b60 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
index 9f792e8077..4256d48bec 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
index dcb214c9ce..47fb3ae9d6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
index 674c4ed3ca..f7a4fbe96b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-26:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
index cf09883284..85dc1c344b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-27:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
index d520a7a6be..7c31b16c77 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-28:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
index ebf7cc2adb..a1bfe6e3d8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
index 847bae45fe..bf345eb58c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
index 2c05268b30..bfed1539e4 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
index 0aa2c1e9d0..4e8a75f895 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
index 4d1d59d8c8..338d471fa4 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
index c66eaf2fb1..976a812b4b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
index 7db0e1b6c2..45f4061780 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -2,6 +2,7 @@
 ---
 parasilo-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
index 601f1b6ab3..7b0a66722f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
index 17035a61e5..087d8b55ae 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
index 187ef274cf..2f6735b5b7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
index 10b0c97d44..19545eaebd 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
index 0fc0c7164d..a0f5098c6f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
index 57326fd439..a9e383eaad 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
index 6987b8d729..dbbc4c2c46 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
index 4cacded7ab..37d9377b6b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
index c50d4fa7b6..538c8d0fe3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
index 06af5b7c6e..291a004578 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
index 52ce33214d..f1d4baf0f5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
@@ -35,7 +36,7 @@ paravance-19:
       vendor: Intel
     eth1:
       driver: ixgbe
-      firmware_version: '0x800007f4, 16.5.20'
+      firmware_version: 0x800007f4, 16.5.20
       interface: Ethernet
       mac: ec:f4:bb:d1:02:9a
       management: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
index 3ddb7d2ef6..59b21f6d0e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
index 5f7afe06b2..f985e3c32a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
index dcd7135567..3dba88d428 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
index 34d1a39e7e..f6ef0f6b57 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
index 430a495dd5..5b43ce8238 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
index 74fcd15653..07d98c728b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
index 522c4ef40b..1c0a3ef2a2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
index 537c22fe7b..27c5f32b1b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-26:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
index d0b5f87321..e3059102ac 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-27:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
index 90ac34987c..3b48c5554b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-28:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
index eaa9357b53..1326ee09b1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-29:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
index a1ba50e69a..05081fba8f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
index 4a8325ff4b..5e1c5adc49 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-30:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
index 82adb1b5a3..7794c761cc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-31:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
index 695234a862..3a1f59c589 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-32:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
index b8203cca7e..b57398bc67 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-33:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
index 701d5dee3b..2409fc54b7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-34:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
index a5e823ce8d..edae375b92 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-35:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
index 3e2bdcaa29..d07ac1265b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-36:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
index e11e3bf6b6..421702f92d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-37:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
index fb5932dcbd..fec2d4dee4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-38:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
index 30475d74fe..9c9f64b184 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-39:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
index 07f18f25ab..9d08fe8f2a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
index b6b99619b7..094b062e28 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-40:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
index fd5f6009f6..8d82381039 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-41:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
index 83b7c6e768..a236a9d271 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-42:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
index 4273cbce59..cf47861376 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-43:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
index bbe7b1a7f9..0cf4996057 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-44:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
index 7c513c71a0..d2fd423306 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-45:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
index 39786e0d81..2baf2320d9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-46:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
index e3758eb1a8..c8ea6c22e5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-47:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
@@ -24,7 +25,7 @@ paravance-47:
       management: true
     eth0:
       driver: ixgbe
-      firmware_version: '0x800007f4, 17.5.10'
+      firmware_version: 0x800007f4, 17.5.10
       interface: Ethernet
       ip: 172.16.96.47
       mac: ec:f4:bb:d1:01:98
@@ -35,7 +36,7 @@ paravance-47:
       vendor: Intel
     eth1:
       driver: ixgbe
-      firmware_version: '0x800007f4, 17.5.10'
+      firmware_version: 0x800007f4, 17.5.10
       interface: Ethernet
       mac: ec:f4:bb:d1:01:9a
       management: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
index 5dbe404a49..c7f9af59f1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-48:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
index 0aac58f1c2..f23ef1751a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-49:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
index d36026d59e..fbc98efc3e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
index e5892aebf4..4a6a19967b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-50:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
index d6987eccbe..b2a3ad34b7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-51:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
@@ -24,7 +25,7 @@ paravance-51:
       management: true
     eth0:
       driver: ixgbe
-      firmware_version: '0x800008c5, 17.5.10'
+      firmware_version: 0x800008c5, 17.5.10
       interface: Ethernet
       ip: 172.16.96.51
       mac: 24:6e:96:31:da:e0
@@ -35,7 +36,7 @@ paravance-51:
       vendor: Intel
     eth1:
       driver: ixgbe
-      firmware_version: '0x800008c5, 17.5.10'
+      firmware_version: 0x800008c5, 17.5.10
       interface: Ethernet
       mac: 24:6e:96:31:da:e2
       management: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
index 9576ce8ed6..cdd2ad98ef 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-52:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
index ff2bffb8eb..6752b1f5e5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-53:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
index 5f5a52f042..643da1e8ed 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-54:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
index b355241fe1..91c6bbcad5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-55:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
index 9c73fdfa89..2e23c1a736 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-56:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
index b92480d7c6..476b96d7d1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-57:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
index ed6c72e6f2..3ceb9f8884 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-58:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
index 574431ec0a..df55e79251 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-59:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
index 3f6d0b3275..df6bb011a9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
index 80141fddf8..8de6c49dd2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-60:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
index 4162f70422..0b8e8a115a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-61:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
index 3b56716a05..3fd98d7ff1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-62:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
index a2622ceca2..4d67b0b58b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-63:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
index 8d02cd4278..bd9fc026df 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-64:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
index 526ea967c5..2b83399ad4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-65:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
index 1d6b75e14d..80226e4e21 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-66:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
index 7bedd4d443..96d6209abf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-67:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
index be04e7db92..6905e300c0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-68:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
index b96d4809b7..a8bee544dc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-69:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
index 4b5ccd4ca4..3366fca087 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
index f649994eb4..488540d9ec 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-70:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
index d1b7d40a7e..f05220a592 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-71:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
index 78a5cdaeb9..5aae97949a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-72:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
index c17941995f..cae68b1c8b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
index 23dd6e4218..dc731fdd19 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -2,6 +2,7 @@
 ---
 paravance-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 16
     nb_procs: 2
     nb_threads: 32
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
index 5b53a1d47c..fb98b1ff62 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
@@ -2,6 +2,7 @@
 ---
 suno-1:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
index ad7787542d..50417c58c2 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
@@ -2,6 +2,7 @@
 ---
 suno-10:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
index 2e40842865..c84a3c7ef9 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
@@ -2,6 +2,7 @@
 ---
 suno-11:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
index b21b1abd1a..6dbfd8145c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
@@ -2,6 +2,7 @@
 ---
 suno-12:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
index d181e8b89e..1ed8335102 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
@@ -2,6 +2,7 @@
 ---
 suno-13:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
index 24eb3f8fd0..2ecd24d3a3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
@@ -2,6 +2,7 @@
 ---
 suno-14:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
index b55a5310fe..a76d767888 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
@@ -2,6 +2,7 @@
 ---
 suno-15:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
index 47efe09244..4969344e72 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
@@ -2,6 +2,7 @@
 ---
 suno-16:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
index fecbab8606..f631116d1f 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
@@ -2,6 +2,7 @@
 ---
 suno-17:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
index d25e48ab12..bac014e806 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
@@ -2,6 +2,7 @@
 ---
 suno-18:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
index b27d1d8b95..43e3b64148 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
@@ -2,6 +2,7 @@
 ---
 suno-19:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
index 54b4db4117..4eaa685213 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
@@ -2,6 +2,7 @@
 ---
 suno-2:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
index eafd0a0e6f..60089835b0 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
@@ -2,6 +2,7 @@
 ---
 suno-20:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
index 1a1147c0bd..df5b8338a5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
@@ -2,6 +2,7 @@
 ---
 suno-21:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
index 36cb03c563..1af2ed863e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
@@ -2,6 +2,7 @@
 ---
 suno-22:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
index 4359330d32..e7f36e4f87 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
@@ -2,6 +2,7 @@
 ---
 suno-23:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
index 088daec6c8..dab8184347 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
@@ -2,6 +2,7 @@
 ---
 suno-24:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
index c6a942870f..8e359756ca 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
@@ -2,6 +2,7 @@
 ---
 suno-25:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
index bda6f94eb3..97bde001c0 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
@@ -2,6 +2,7 @@
 ---
 suno-26:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
index e851907b0f..f1cc6979ac 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
@@ -2,6 +2,7 @@
 ---
 suno-27:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
index 0822fe2148..bab4a10189 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
@@ -2,6 +2,7 @@
 ---
 suno-28:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
index c2f506f47f..0d8f602c68 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
@@ -2,6 +2,7 @@
 ---
 suno-29:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
index e664546005..407e57f04e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
@@ -2,6 +2,7 @@
 ---
 suno-3:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
index 0e7584b963..f266034c3e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
@@ -2,6 +2,7 @@
 ---
 suno-30:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
index 7459390d8b..25e160bfc9 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
@@ -2,6 +2,7 @@
 ---
 suno-31:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
index c49c0bff7d..4ca3882d28 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
@@ -2,6 +2,7 @@
 ---
 suno-32:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
index dcc54cd9f6..f41ddf299e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
@@ -2,6 +2,7 @@
 ---
 suno-33:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
index abdf3afd44..fa5ec45a4c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
@@ -2,6 +2,7 @@
 ---
 suno-34:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
index e2d61f5182..4de11e596b 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
@@ -2,6 +2,7 @@
 ---
 suno-35:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
index cb7e1d3361..e8bfd3fd45 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
@@ -2,6 +2,7 @@
 ---
 suno-36:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
index 2d91041936..9653ceee22 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
@@ -2,6 +2,7 @@
 ---
 suno-37:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
index 68ca1b7f74..039a07f2fb 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
@@ -2,6 +2,7 @@
 ---
 suno-38:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
index 8caa9c6876..ab7e328435 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
@@ -2,6 +2,7 @@
 ---
 suno-39:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
index 0f6fbd5eed..0b03ed50da 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
@@ -2,6 +2,7 @@
 ---
 suno-4:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
index 7e8862cb6c..8918383e27 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
@@ -2,6 +2,7 @@
 ---
 suno-40:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
index f5ca65c494..3e392b2a89 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
@@ -2,6 +2,7 @@
 ---
 suno-41:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
index cea3a96f0c..99f8f16cc2 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
@@ -2,6 +2,7 @@
 ---
 suno-42:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
index e0d322af35..b39bbc398b 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
@@ -2,6 +2,7 @@
 ---
 suno-43:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
index 1cb8f75966..7ec7ef5de5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
@@ -2,6 +2,7 @@
 ---
 suno-44:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
index 713a0d7cef..dc5116ea87 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
@@ -2,6 +2,7 @@
 ---
 suno-45:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
index d617847c89..96a76317b3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
@@ -2,6 +2,7 @@
 ---
 suno-5:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
index dda5470b60..158df45d3e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
@@ -2,6 +2,7 @@
 ---
 suno-6:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
index de4564eff2..e2cf404be0 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
@@ -2,6 +2,7 @@
 ---
 suno-7:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
index 9c29f1e9c5..96df1468cb 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
@@ -2,6 +2,7 @@
 ---
 suno-8:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
index b1c05034ee..369b7f60a8 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
@@ -2,6 +2,7 @@
 ---
 suno-9:
   architecture:
+    cpu_core_numbering: round-robin
     nb_cores: 8
     nb_procs: 2
     nb_threads: 8
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
index 140bb28d9a..54db3083a8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-1:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
index 7b460c066d..e28f0a7927 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-10:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
index 62e411afe1..27dd57e6da 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-11:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
index 11190c2680..b0fddef0e5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-12:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
index 4dd89bbf82..be5ea5298c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-13:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
index c5c12fa5ce..3dd3932b8a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-14:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
index 0c251f57e8..9096f0b971 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-15:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
index 5cc9843199..2d26c311fb 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-16:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
index c91a97504c..9c3d4d28f6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-17:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
index 10ca0713a0..4771c3f942 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-18:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
index 68557e259d..cdcddf761e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-19:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
index fcf20855b7..fa15beda66 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-2:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
index acfa9bf8fa..0c9abdb0ad 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-20:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
index 39e9e055ff..d3c0032d17 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-21:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
index ed2d74aa47..c21963d291 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-22:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
index 7bc489e077..cf3063734e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-23:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
index 910947f6cf..58a4d5d323 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-24:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
index 1a1fa77ea8..cb4255bb1e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-25:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
index b602a37582..f0e2202b5f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-26:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
index 64c185c283..4ec1ce2ea0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-27:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
index 408e5cc209..c0df10a48f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-28:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
index 27812b9405..5f46c062f6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-29:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
index bc69edc2b8..fc07fc1800 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-3:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
index af97558d26..9d8e33ce71 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-30:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
index e4c46dff96..ff62829052 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-31:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
index 023a3cd383..876e649f97 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-32:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
index dd8d928519..0cc6966f41 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-33:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
index 375ec5d54b..56756f54e1 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-34:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
index cd7d1eab33..86549bba60 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-35:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
index bb41d84340..4715c2f16e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-36:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
index 09b79056de..fdb3f6a299 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-37:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
index ee5ed3e103..c4a09703a9 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-38:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
index 27bddf221e..acd2d63c29 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-39:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
index bd4901ca05..ab4f9ec625 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-4:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
index 902eef252e..1a28727cc5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-40:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
index a6a23fe43c..b0b9b4421e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-41:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
index 3c60f97fb1..b12d3a709d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-42:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
index 7f070670b0..f7d615b83f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-43:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
index 3e42bab340..9479cc7ec5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-44:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
index 692bc2f215..dce5b7c026 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-5:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
index 3216338973..e2f7386855 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-6:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
index 57a90031ad..08f0c686f8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-7:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
index 68ea4ab8e8..98c020fd80 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-8:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
index 022ed0b7e8..6994e57c6c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -2,6 +2,7 @@
 ---
 uvb-9:
   architecture:
+    cpu_core_numbering: contiguous
     nb_cores: 12
     nb_procs: 2
     nb_threads: 24
diff --git a/lib/refrepo/valid/input/schemas/schema-node.yaml b/lib/refrepo/valid/input/schemas/schema-node.yaml
index 3ae94b1354..66fe87c0ae 100644
--- a/lib/refrepo/valid/input/schemas/schema-node.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-node.yaml
@@ -4,6 +4,7 @@ architecture:
   nb_cores: integer
   nb_procs: integer
   nb_threads: integer
+  cpu_core_numbering: string
 bios:
   release_date: string
   vendor: optional ## optional_string or null
diff --git a/scripts/edit-input-files-add-core-numbering.rb b/scripts/edit-input-files-add-core-numbering.rb
new file mode 100755
index 0000000000..477519b6e7
--- /dev/null
+++ b/scripts/edit-input-files-add-core-numbering.rb
@@ -0,0 +1,49 @@
+#!/usr/bin/ruby
+
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../lib')))
+require 'refrepo'
+
+# This script is used to script manual changes over nodes yaml files
+
+require 'optparse'
+
+options = {
+  :site => nil,
+  :clusters => nil
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: [options]"
+
+  opts.separator ""
+
+  opts.separator "Filters:"
+
+  opts.on('-s', '--site a', String, 'Select site') do |s|
+    options[:site] = s
+  end
+
+  opts.on('-c', '--cluster c', String, 'Select cluster') do |s|
+    options[:cluster] = s
+  end
+
+end.parse!
+
+Dir["input/grid5000/sites/*/clusters/*/nodes/*.yaml"].each do |f|
+  m = f.match(/input\/grid5000\/sites\/(?<site>[^\/]*)\/clusters\/(?<cluster>[^\/]*)\/nodes\//)
+  next if options[:site] and m[:site] != options[:site]
+  next if options[:cluster] and m[:cluster] != options[:cluster]
+  node = YAML::load_file(f)
+  puts f
+
+  ### TODO your changes go here
+  ccn = %w{ gros grcinq uvb econome parapluie paranoia gemini hercule}.include?(m[:cluster]) ? 'contiguous' : 'round-robin'
+  node.values.first['architecture']['cpu_core_numbering'] = ccn
+  node.values.first['architecture'] = node.values.first['architecture'].sort.to_h
+
+  File::open(f, 'w') do |fd|
+    fd.puts "# Generated by g5k-checks (g5k-checks -m api)"
+    fd.print YAML::dump(node)
+  end
+end
+
-- 
GitLab