Merge pull request #1196 from arcaneframework/dev/gg-rename-componentiteminternallocalid

grospelliergilles · web-flow · commit e1b4d23e7eaf · 2024-02-19T10:11:55.000+01:00
Rename class 'ComponentItemInternalLocalId' to 'ConstituentItemIndex'
diff --git a/arcane/src/arcane/core/materials/ComponentItem.cc b/arcane/src/arcane/core/materials/ComponentItem.cc
@@ -29,7 +29,7 @@ void ComponentCell::
 _badConversion(ComponentItemInternal* item_internal, Int32 level,Int32 expected_level)
 {
   ARCANE_FATAL("bad level for internal component cell level={0} expected={1} cid={2} component_id={3}",
-               level,expected_level,item_internal->_internalLocalId(),item_internal->componentId());
+               level,expected_level, item_internal->constituentItemIndex(),item_internal->componentId());
 }
 
 /*---------------------------------------------------------------------------*/
diff --git a/arcane/src/arcane/core/materials/ComponentItem.h b/arcane/src/arcane/core/materials/ComponentItem.h
@@ -144,9 +144,9 @@ class ARCANE_CORE_EXPORT ComponentCell
   }
 
   //! \internal
-  ARCCORE_HOST_DEVICE ComponentItemInternalLocalId _internalLocalId() const
+  ARCCORE_HOST_DEVICE ConstituentItemIndex _internalLocalId() const
   {
-    return m_internal->_internalLocalId();
+    return m_internal->constituentItemIndex();
   }
 };
 
diff --git a/arcane/src/arcane/core/materials/ComponentItemInternal.cc b/arcane/src/arcane/core/materials/ComponentItemInternal.cc
@@ -34,7 +34,7 @@ ComponentItemSharedInfo* ComponentItemSharedInfo::null_shared_info_pointer = &Co
 /*---------------------------------------------------------------------------*/
 
 std::ostream&
-operator<<(std::ostream& o,const ComponentItemInternalLocalId& id)
+operator<<(std::ostream& o,const ConstituentItemIndex& id)
 {
   o << id.localId();
   return o;
diff --git a/arcane/src/arcane/core/materials/ComponentItemInternal.h b/arcane/src/arcane/core/materials/ComponentItemInternal.h
diff --git a/arcane/src/arcane/core/materials/ComponentItemVector.cc b/arcane/src/arcane/core/materials/ComponentItemVector.cc
@@ -103,8 +103,8 @@ ComponentItemVector(ComponentItemVectorView rhs)
 /*---------------------------------------------------------------------------*/
 
 void ComponentItemVector::
-_setItems(ConstArrayView<ComponentItemInternalLocalId> globals,
-          ConstArrayView<ComponentItemInternalLocalId> multiples)
+_setItems(ConstArrayView<ConstituentItemIndex> globals,
+          ConstArrayView<ConstituentItemIndex> multiples)
 {
   m_p->m_constituent_list->copyPureAndPartial(globals, multiples);
 }
diff --git a/arcane/src/arcane/core/materials/ComponentItemVector.h b/arcane/src/arcane/core/materials/ComponentItemVector.h
@@ -133,8 +133,8 @@ class ARCANE_CORE_EXPORT ComponentItemVector
 
  protected:
 
-  void _setItems(ConstArrayView<ComponentItemInternalLocalId> globals,
-                 ConstArrayView<ComponentItemInternalLocalId> multiples);
+  void _setItems(ConstArrayView<ConstituentItemIndex> globals,
+                 ConstArrayView<ConstituentItemIndex> multiples);
 
   void _setMatVarIndexes(ConstArrayView<MatVarIndex> globals,
                          ConstArrayView<MatVarIndex> multiples);
diff --git a/arcane/src/arcane/core/materials/EnvItemVector.cc b/arcane/src/arcane/core/materials/EnvItemVector.cc
@@ -53,7 +53,7 @@ EnvCellVector(CellVectorView view,IMeshEnvironment* environment)
 void EnvCellVector::
 _build(CellVectorView view)
 {
-  FixedArray<UniqueArray<ComponentItemInternalLocalId>,2> internals;
+  FixedArray<UniqueArray<ConstituentItemIndex>,2> internals;
   FixedArray<UniqueArray<MatVarIndex>,2> matvar_indexes;
   FixedArray<UniqueArray<Int32>,2> local_ids;
   IMeshComponent* my_component = _component();
diff --git a/arcane/src/arcane/core/materials/MatItemVector.cc b/arcane/src/arcane/core/materials/MatItemVector.cc
@@ -50,7 +50,7 @@ MatCellVector(CellVectorView view,IMeshMaterial* material)
 void MatCellVector::
 _build(CellVectorView view)
 {
-  FixedArray<UniqueArray<ComponentItemInternalLocalId>,2> internals;
+  FixedArray<UniqueArray<ConstituentItemIndex>,2> internals;
   FixedArray<UniqueArray<MatVarIndex>,2> matvar_indexes;
   FixedArray<UniqueArray<Int32>,2> local_ids;
   IMeshComponent* my_component = _component();
diff --git a/arcane/src/arcane/core/materials/internal/ConstituentItemLocalIdList.h b/arcane/src/arcane/core/materials/internal/ConstituentItemLocalIdList.h
@@ -44,13 +44,13 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList
 
  public:
 
-  void setConstituentItem(Int32 index, ComponentItemInternalLocalId id)
+  void setConstituentItem(Int32 index, ConstituentItemIndex id)
   {
     m_item_internal_local_id_list[index] = id;
     m_items_internal[index] = m_shared_info->_itemInternal(id);
   }
 
-  void copy(ConstArrayView<ComponentItemInternalLocalId> ids)
+  void copy(ConstArrayView<ConstituentItemIndex> ids)
   {
     const Int32 size = ids.size();
     resize(size);
@@ -70,8 +70,8 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList
   /*!
    * \brief Copie les constituents partitionnés en partie pure et partielle.
    */
-  void copyPureAndPartial(ConstArrayView<ComponentItemInternalLocalId> pure_ids,
-                          ConstArrayView<ComponentItemInternalLocalId> partial_ids)
+  void copyPureAndPartial(ConstArrayView<ConstituentItemIndex> pure_ids,
+                          ConstArrayView<ConstituentItemIndex> partial_ids)
   {
     Int32 nb_pure = pure_ids.size();
     Int32 nb_partial = partial_ids.size();
@@ -83,15 +83,15 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList
       setConstituentItem(nb_pure + i, partial_ids[i]);
   }
 
-  ConstArrayView<ComponentItemInternalLocalId> localIds() const
+  ConstArrayView<ConstituentItemIndex> localIds() const
   {
     return m_item_internal_local_id_list;
   }
   matimpl::ConstituentItemBase itemBase(Int32 index) const
   {
     return m_shared_info->_item(localId(index));
   }
-  ComponentItemInternalLocalId localId(Int32 index) const
+  ConstituentItemIndex localId(Int32 index) const
   {
     return m_item_internal_local_id_list[index];
   }
@@ -111,8 +111,8 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList
   //! Liste des ComponentItemInternal* pour ce constituant.
   UniqueArray<ComponentItemInternal*> m_items_internal;
 
-  //! Liste des ComponentItemInternalLocalId pour ce constituant.
-  UniqueArray<ComponentItemInternalLocalId> m_item_internal_local_id_list;
+  //! Liste des ConstituentItemIndex pour ce constituant.
+  UniqueArray<ConstituentItemIndex> m_item_internal_local_id_list;
 
   ComponentItemSharedInfo* m_shared_info = nullptr;
 
diff --git a/arcane/src/arcane/materials/AllEnvData.cc b/arcane/src/arcane/materials/AllEnvData.cc
@@ -262,7 +262,7 @@ _computeInfosForEnvCells()
         ++current_pos[lid];
         Int16 nb_mat = m_component_connectivity_list->cellNbMaterial(CellLocalId(lid), env_id);
         matimpl::ConstituentItemBase ref_ii = m_item_internal_data.envItemBase(pos);
-        ComponentItemInternalLocalId cii_lid = all_env_items_internal_range[lid];
+        ConstituentItemIndex cii_lid = all_env_items_internal_range[lid];
         env->setConstituentItem(z, ref_ii._internalLocalId());
         ref_ii._setSuperAndGlobalItem(cii_lid, ItemLocalId(lid));
         ref_ii._setNbSubItem(nb_mat);
diff --git a/arcane/src/arcane/materials/ComponentItemInternalData.cc b/arcane/src/arcane/materials/ComponentItemInternalData.cc
@@ -122,22 +122,22 @@ endCreate()
 void ComponentItemInternalData::
 _resetItemsInternal()
 {
-  ComponentItemInternalLocalId internal_local_id;
+  ConstituentItemIndex internal_local_id;
   ArrayView<ComponentItemInternal> all_env_storage = m_all_env_item_internal_storage;
   ArrayView<ComponentItemInternal> env_storage = m_env_item_internal_storage;
   ArrayView<ComponentItemInternal> mat_storage = m_mat_item_internal_storage;
 
   ComponentItemSharedInfo* all_env_shared_info = allEnvSharedInfo();
-  for (ComponentItemInternalLocalId id : m_all_env_items_internal_range)
+  for (ConstituentItemIndex id : m_all_env_items_internal_range)
     all_env_storage[id.localId()]._reset(id, all_env_shared_info);
 
   ComponentItemSharedInfo* env_shared_info = envSharedInfo();
-  for (ComponentItemInternalLocalId id : m_env_items_internal_range)
+  for (ConstituentItemIndex id : m_env_items_internal_range)
     env_storage[id.localId()]._reset(id, env_shared_info);
 
   ComponentItemSharedInfo* mat_shared_info = matSharedInfo();
   for (ComponentItemInternalRange mat_range : m_mat_items_internal_range) {
-    for (ComponentItemInternalLocalId id : mat_range)
+    for (ConstituentItemIndex id : mat_range)
       mat_storage[id.localId()]._reset(id, mat_shared_info);
   }
 }
diff --git a/arcane/src/arcane/materials/MeshComponentData.cc b/arcane/src/arcane/materials/MeshComponentData.cc
@@ -126,8 +126,8 @@ _changeLocalIdsForInternalList(Int32ConstArrayView old_to_new_ids)
 {
   // TODO: regarder s'il est possible de supprimer le tableau temporaire
   // new_internals (c'est à peu près sur que c'est possible).
-  ConstArrayView<ComponentItemInternalLocalId> current_internals(m_constituent_local_id_list.localIds());
-  UniqueArray<ComponentItemInternalLocalId> new_internals;
+  ConstArrayView<ConstituentItemIndex> current_internals(m_constituent_local_id_list.localIds());
+  UniqueArray<ConstituentItemIndex> new_internals;
 
   Int32ConstArrayView local_ids = variableIndexer()->localIds();
 
diff --git a/arcane/src/arcane/materials/MeshEnvironment.cc b/arcane/src/arcane/materials/MeshEnvironment.cc
@@ -209,7 +209,7 @@ computeMaterialIndexes(ComponentItemInternalData* item_internal_data)
   Int32UniqueArray cells_pos(max_local_id);
   //TODO: regarder comment supprimer ce tableau cells_env qui n'est normalement pas utile
   // car on doit pouvoir directement utiliser les m_items_internal
-  UniqueArray<ComponentItemInternalLocalId> cells_env(max_local_id);
+  UniqueArray<ConstituentItemIndex> cells_env(max_local_id);
 
   {
     Integer cell_index = 0;
diff --git a/arcane/src/arcane/materials/internal/ComponentItemInternalData.h b/arcane/src/arcane/materials/internal/ComponentItemInternalData.h
@@ -53,7 +53,7 @@ class ComponentItemInternalRange
 
    public:
 
-    ComponentItemInternalLocalId operator*() const { return ComponentItemInternalLocalId(m_current_value); }
+    ConstituentItemIndex operator*() const { return ConstituentItemIndex(m_current_value); }
     void operator++() { ++m_current_value; }
     bool operator==(const Sentinel&) const
     {
@@ -72,10 +72,10 @@ class ComponentItemInternalRange
 
  public:
 
-  ComponentItemInternalLocalId operator[](Int32 index) const
+  ConstituentItemIndex operator[](Int32 index) const
   {
     ARCANE_CHECK_AT(index, m_nb_value);
-    return ComponentItemInternalLocalId(m_first_index + index);
+    return ConstituentItemIndex(m_first_index + index);
   }
 
  public:
@@ -94,7 +94,7 @@ class ComponentItemInternalRange
     return {};
   }
   Int32 size() const { return m_nb_value; }
-  ComponentItemInternalLocalId firstValue() const { return ComponentItemInternalLocalId(m_first_index); }
+  ConstituentItemIndex firstValue() const { return ConstituentItemIndex(m_first_index); }
 
  private:
 
@@ -127,8 +127,8 @@ class ComponentItemInternalData
 
    private:
 
-    UniqueArray<ComponentItemInternalLocalId> m_first_sub_constituent_item_id_list;
-    UniqueArray<ComponentItemInternalLocalId> m_super_component_item_local_id_list;
+    UniqueArray<ConstituentItemIndex> m_first_sub_constituent_item_id_list;
+    UniqueArray<ConstituentItemIndex> m_super_component_item_local_id_list;
     UniqueArray<Int16> m_component_id_list;
     UniqueArray<Int16> m_nb_sub_constituent_item_list;
     UniqueArray<Int32> m_global_item_local_id_list;
diff --git a/arcane/src/arcane/materials/internal/MeshComponentData.h b/arcane/src/arcane/materials/internal/MeshComponentData.h
@@ -83,7 +83,7 @@ class MeshComponentData
     return m_constituent_local_id_list.itemBase(index);
   }
 
-  void _setConstituentItem(Int32 index, ComponentItemInternalLocalId id)
+  void _setConstituentItem(Int32 index, ConstituentItemIndex id)
   {
     return m_constituent_local_id_list.setConstituentItem(index, id);
   }
@@ -135,7 +135,7 @@ class MeshComponentData
   //! Infos pour l'indexation des variables partielles.
   MeshMaterialVariableIndexer* m_variable_indexer = nullptr;
 
-  //! Liste des ComponentItemInternalLocalId pour ce constituant.
+  //! Liste des ConstituentItemIndex pour ce constituant.
   ConstituentItemLocalIdList m_constituent_local_id_list;
 
   MeshComponentPartData* m_part_data = nullptr;
diff --git a/arcane/src/arcane/materials/internal/MeshEnvironment.h b/arcane/src/arcane/materials/internal/MeshEnvironment.h
@@ -135,7 +135,7 @@ class MeshEnvironment
 
  public:
 
-  void setConstituentItem(Int32 index, ComponentItemInternalLocalId id)
+  void setConstituentItem(Int32 index, ConstituentItemIndex id)
   {
     m_data._setConstituentItem(index,id);
   }
diff --git a/arcane/src/arcane/materials/internal/MeshMaterial.h b/arcane/src/arcane/materials/internal/MeshMaterial.h
@@ -128,7 +128,7 @@ class MeshMaterial
 
  public:
 
-  void setConstituentItem(Int32 index, ComponentItemInternalLocalId id)
+  void setConstituentItem(Int32 index, ConstituentItemIndex id)
   {
     m_data._setConstituentItem(index,id);
   }
diff --git a/arcane/tools/wrapper/materials/csharp/ComponentItem.cs b/arcane/tools/wrapper/materials/csharp/ComponentItem.cs
@@ -22,8 +22,8 @@ public ComponentItemInternal* Internal
       set { m_internal = value; }
     }
 
-    public Cell GlobalCell { get { return m_internal->m_shared_info->GlobalCell(m_internal->m_component_item_internal_local_id); } }
-    public MatVarIndex MatVarIndex { get { return m_internal->m_shared_info->VarIndex(m_internal->m_component_item_internal_local_id); } }
+    public Cell GlobalCell { get { return m_internal->m_shared_info->GlobalCell(m_internal->m_component_item_index); } }
+    public MatVarIndex MatVarIndex { get { return m_internal->m_shared_info->VarIndex(m_internal->m_component_item_index); } }
     internal int _matvarArrayIndex { get { return MatVarIndex.ArrayIndex; } }
     internal int _matvarValueIndex { get { return MatVarIndex.ValueIndex; } }
 
@@ -45,8 +45,8 @@ public ComponentItemInternal* Internal
       get { return m_internal; }
       set { m_internal = value; }
     }
-    public Cell GlobalCell { get { return m_internal->m_shared_info->GlobalCell(m_internal->m_component_item_internal_local_id); } }
-    public MatVarIndex MatVarIndex { get { return m_internal->m_shared_info->VarIndex(m_internal->m_component_item_internal_local_id); } }
+    public Cell GlobalCell { get { return m_internal->m_shared_info->GlobalCell(m_internal->m_component_item_index); } }
+    public MatVarIndex MatVarIndex { get { return m_internal->m_shared_info->VarIndex(m_internal->m_component_item_index); } }
     internal int _matvarArrayIndex { get { return MatVarIndex.ArrayIndex; } }
     internal int _matvarValueIndex { get { return MatVarIndex.ValueIndex; } }
     [Obsolete("This method is internal to Arcane")]
@@ -66,8 +66,8 @@ public ComponentItemInternal* Internal
       set { m_internal = value; }
     }
 
-    public Cell GlobalCell { get { return m_internal->m_shared_info->GlobalCell(m_internal->m_component_item_internal_local_id); } }
-    public MatVarIndex MatVarIndex { get { return m_internal->m_shared_info->VarIndex(m_internal->m_component_item_internal_local_id); } }
+    public Cell GlobalCell { get { return m_internal->m_shared_info->GlobalCell(m_internal->m_component_item_index); } }
+    public MatVarIndex MatVarIndex { get { return m_internal->m_shared_info->VarIndex(m_internal->m_component_item_index); } }
     internal int _matvarArrayIndex { get { return MatVarIndex.ArrayIndex; } }
     internal int _matvarValueIndex { get { return MatVarIndex.ValueIndex; } }
 
diff --git a/arcane/tools/wrapper/materials/csharp/ComponentItemInternal.cs b/arcane/tools/wrapper/materials/csharp/ComponentItemInternal.cs
@@ -37,7 +37,7 @@ internal MatVarIndex VarIndex(Int32 constituent_local_id)
   [StructLayout(LayoutKind.Sequential)]
   public unsafe struct ComponentItemInternal
   {
-    internal Int32 m_component_item_internal_local_id;
+    internal Int32 m_component_item_index;
     internal ComponentItemSharedInfo* m_shared_info;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void ComponentCell::`
`29`	`29`	`_badConversion(ComponentItemInternal* item_internal, Int32 level,Int32 expected_level)`
`30`	`30`	`{`
`31`	`31`	`ARCANE_FATAL("bad level for internal component cell level={0} expected={1} cid={2} component_id={3}",`
`32`		`- level,expected_level,item_internal->_internalLocalId(),item_internal->componentId());`
	`32`	`+ level,expected_level, item_internal->constituentItemIndex(),item_internal->componentId());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/---------------------------------------------------------------------------/`
Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,9 @@ class ARCANE_CORE_EXPORT ComponentCell`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`//! \internal`
`147`		`- ARCCORE_HOST_DEVICE ComponentItemInternalLocalId _internalLocalId() const`
	`147`	`+ ARCCORE_HOST_DEVICE ConstituentItemIndex _internalLocalId() const`
`148`	`148`	`{`
`149`		`- return m_internal->_internalLocalId();`
	`149`	`+ return m_internal->constituentItemIndex();`
`150`	`150`	`}`
`151`	`151`	`};`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ ComponentItemSharedInfo* ComponentItemSharedInfo::null_shared_info_pointer = &Co`
`34`	`34`	`/---------------------------------------------------------------------------/`
`35`	`35`
`36`	`36`	`std::ostream&`
`37`		`-operator<<(std::ostream& o,const ComponentItemInternalLocalId& id)`
	`37`	`+operator<<(std::ostream& o,const ConstituentItemIndex& id)`
`38`	`38`	`{`
`39`	`39`	`o << id.localId();`
`40`	`40`	`return o;`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ ComponentItemVector(ComponentItemVectorView rhs)`
`103`	`103`	`/---------------------------------------------------------------------------/`
`104`	`104`
`105`	`105`	`void ComponentItemVector::`
`106`		`-_setItems(ConstArrayView<ComponentItemInternalLocalId> globals,`
`107`		`- ConstArrayView<ComponentItemInternalLocalId> multiples)`
	`106`	`+_setItems(ConstArrayView<ConstituentItemIndex> globals,`
	`107`	`+ ConstArrayView<ConstituentItemIndex> multiples)`
`108`	`108`	`{`
`109`	`109`	`m_p->m_constituent_list->copyPureAndPartial(globals, multiples);`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ EnvCellVector(CellVectorView view,IMeshEnvironment* environment)`
`53`	`53`	`void EnvCellVector::`
`54`	`54`	`_build(CellVectorView view)`
`55`	`55`	`{`
`56`		`- FixedArray<UniqueArray<ComponentItemInternalLocalId>,2> internals;`
	`56`	`+ FixedArray<UniqueArray<ConstituentItemIndex>,2> internals;`
`57`	`57`	`FixedArray<UniqueArray<MatVarIndex>,2> matvar_indexes;`
`58`	`58`	`FixedArray<UniqueArray<Int32>,2> local_ids;`
`59`	`59`	`IMeshComponent* my_component = _component();`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ MatCellVector(CellVectorView view,IMeshMaterial* material)`
`50`	`50`	`void MatCellVector::`
`51`	`51`	`_build(CellVectorView view)`
`52`	`52`	`{`
`53`		`- FixedArray<UniqueArray<ComponentItemInternalLocalId>,2> internals;`
	`53`	`+ FixedArray<UniqueArray<ConstituentItemIndex>,2> internals;`
`54`	`54`	`FixedArray<UniqueArray<MatVarIndex>,2> matvar_indexes;`
`55`	`55`	`FixedArray<UniqueArray<Int32>,2> local_ids;`
`56`	`56`	`IMeshComponent* my_component = _component();`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList`
`44`	`44`
`45`	`45`	`public:`
`46`	`46`
`47`		`- void setConstituentItem(Int32 index, ComponentItemInternalLocalId id)`
	`47`	`+ void setConstituentItem(Int32 index, ConstituentItemIndex id)`
`48`	`48`	`{`
`49`	`49`	`m_item_internal_local_id_list[index] = id;`
`50`	`50`	`m_items_internal[index] = m_shared_info->_itemInternal(id);`
`51`	`51`	`}`
`52`	`52`
`53`		`- void copy(ConstArrayView<ComponentItemInternalLocalId> ids)`
	`53`	`+ void copy(ConstArrayView<ConstituentItemIndex> ids)`
`54`	`54`	`{`
`55`	`55`	`const Int32 size = ids.size();`
`56`	`56`	`resize(size);`
`@@ -70,8 +70,8 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList`
`70`	`70`	`/*!`
`71`	`71`	`* \brief Copie les constituents partitionnés en partie pure et partielle.`
`72`	`72`	`*/`
`73`		`- void copyPureAndPartial(ConstArrayView<ComponentItemInternalLocalId> pure_ids,`
`74`		`- ConstArrayView<ComponentItemInternalLocalId> partial_ids)`
	`73`	`+ void copyPureAndPartial(ConstArrayView<ConstituentItemIndex> pure_ids,`
	`74`	`+ ConstArrayView<ConstituentItemIndex> partial_ids)`
`75`	`75`	`{`
`76`	`76`	`Int32 nb_pure = pure_ids.size();`
`77`	`77`	`Int32 nb_partial = partial_ids.size();`
`@@ -83,15 +83,15 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList`
`83`	`83`	`setConstituentItem(nb_pure + i, partial_ids[i]);`
`84`	`84`	`}`
`85`	`85`
`86`		`- ConstArrayView<ComponentItemInternalLocalId> localIds() const`
	`86`	`+ ConstArrayView<ConstituentItemIndex> localIds() const`
`87`	`87`	`{`
`88`	`88`	`return m_item_internal_local_id_list;`
`89`	`89`	`}`
`90`	`90`	`matimpl::ConstituentItemBase itemBase(Int32 index) const`
`91`	`91`	`{`
`92`	`92`	`return m_shared_info->_item(localId(index));`
`93`	`93`	`}`
`94`		`- ComponentItemInternalLocalId localId(Int32 index) const`
	`94`	`+ ConstituentItemIndex localId(Int32 index) const`
`95`	`95`	`{`
`96`	`96`	`return m_item_internal_local_id_list[index];`
`97`	`97`	`}`
`@@ -111,8 +111,8 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList`
`111`	`111`	`//! Liste des ComponentItemInternal* pour ce constituant.`
`112`	`112`	`UniqueArray<ComponentItemInternal*> m_items_internal;`
`113`	`113`
`114`		`- //! Liste des ComponentItemInternalLocalId pour ce constituant.`
`115`		`- UniqueArray<ComponentItemInternalLocalId> m_item_internal_local_id_list;`
	`114`	`+ //! Liste des ConstituentItemIndex pour ce constituant.`
	`115`	`+ UniqueArray<ConstituentItemIndex> m_item_internal_local_id_list;`
`116`	`116`
`117`	`117`	`ComponentItemSharedInfo* m_shared_info = nullptr;`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ _changeLocalIdsForInternalList(Int32ConstArrayView old_to_new_ids)`
`126`	`126`	`{`
`127`	`127`	`// TODO: regarder s'il est possible de supprimer le tableau temporaire`
`128`	`128`	`// new_internals (c'est à peu près sur que c'est possible).`
`129`		`- ConstArrayView<ComponentItemInternalLocalId> current_internals(m_constituent_local_id_list.localIds());`
`130`		`- UniqueArray<ComponentItemInternalLocalId> new_internals;`
	`129`	`+ ConstArrayView<ConstituentItemIndex> current_internals(m_constituent_local_id_list.localIds());`
	`130`	`+ UniqueArray<ConstituentItemIndex> new_internals;`
`131`	`131`
`132`	`132`	`Int32ConstArrayView local_ids = variableIndexer()->localIds();`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ computeMaterialIndexes(ComponentItemInternalData* item_internal_data)`
`209`	`209`	`Int32UniqueArray cells_pos(max_local_id);`
`210`	`210`	`//TODO: regarder comment supprimer ce tableau cells_env qui n'est normalement pas utile`
`211`	`211`	`// car on doit pouvoir directement utiliser les m_items_internal`
`212`		`- UniqueArray<ComponentItemInternalLocalId> cells_env(max_local_id);`
	`212`	`+ UniqueArray<ConstituentItemIndex> cells_env(max_local_id);`
`213`	`213`
`214`	`214`	`{`
`215`	`215`	`Integer cell_index = 0;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class MeshComponentData`
`83`	`83`	`return m_constituent_local_id_list.itemBase(index);`
`84`	`84`	`}`
`85`	`85`
`86`		`- void _setConstituentItem(Int32 index, ComponentItemInternalLocalId id)`
	`86`	`+ void _setConstituentItem(Int32 index, ConstituentItemIndex id)`
`87`	`87`	`{`
`88`	`88`	`return m_constituent_local_id_list.setConstituentItem(index, id);`
`89`	`89`	`}`
`@@ -135,7 +135,7 @@ class MeshComponentData`
`135`	`135`	`//! Infos pour l'indexation des variables partielles.`
`136`	`136`	`MeshMaterialVariableIndexer* m_variable_indexer = nullptr;`
`137`	`137`
`138`		`- //! Liste des ComponentItemInternalLocalId pour ce constituant.`
	`138`	`+ //! Liste des ConstituentItemIndex pour ce constituant.`
`139`	`139`	`ConstituentItemLocalIdList m_constituent_local_id_list;`
`140`	`140`
`141`	`141`	`MeshComponentPartData* m_part_data = nullptr;`