[arcane,materials] Conserve le numéro du constituant et le nombre d'entités sous-consituantes dans 'ComponenItemSharedInfo'.

grospelliergilles · grospelliergilles · commit b79acee4a59e · 2024-02-18T16:17:48.000+01:00
diff --git a/arcane/src/arcane/core/materials/ComponentItemInternal.cc b/arcane/src/arcane/core/materials/ComponentItemInternal.cc
@@ -33,18 +33,6 @@ ComponentItemSharedInfo* ComponentItemSharedInfo::null_shared_info_pointer = &Co
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-void ComponentItemInternal::
-_throwBadCast(Int32 v)
-{
-  throw BadCastException(A_FUNCINFO,String::format("Can not cast v={0} to type 'Int16'",v));
-}
-
-void matimpl::ConstituentItemBase::
-_throwBadCast(Int32 v)
-{
-  throw BadCastException(A_FUNCINFO,String::format("Can not cast v={0} to type 'Int16'",v));
-}
-
 std::ostream&
 operator<<(std::ostream& o,const ComponentItemInternalLocalId& id)
 {
diff --git a/arcane/src/arcane/core/materials/ComponentItemInternal.h b/arcane/src/arcane/core/materials/ComponentItemInternal.h
@@ -71,11 +71,27 @@ class ARCANE_CORE_EXPORT ComponentItemInternalLocalId
  */
 class ARCANE_CORE_EXPORT ComponentItemSharedInfoStorageView
 {
- protected:
+  // Les champs de cette classe sont des tableaux dont la taille est
+  // \a m_storage_size et qui peuvent être indexés par une entité nulle
+  // (ComponentItemInternalLocalId==(-1)).
+  // Le conteneur est géré par ComponenItemInternalData.
+  // Seuls ComponentItemSharedInfo et ComponenItemInternalData
+  // doivent accéder aux champs de cette classe
 
-  Int32 m_storage_size = 0;
   // TODO: Utiliser stockage avec un seul élément pour le nullComponent
-  ComponentItemInternalLocalId* m_first_sub_constituent_list_ptr = nullptr;
+
+  friend class ComponentItemInternalData;
+  friend class ComponentItemSharedInfo;
+
+ private:
+
+  Int32 m_storage_size = 0;
+  //! Id de la première entité sous-constituant
+  ComponentItemInternalLocalId* m_first_sub_constituent_item_id_data = nullptr;
+  //! Index du constituant (IMeshComponent)
+  Int16* m_component_id_data = nullptr;
+  //! Nombre d'entités sous-constituant
+  Int16* m_nb_sub_constituent_item_data = nullptr;
 };
 
 /*---------------------------------------------------------------------------*/
@@ -91,7 +107,7 @@ class ARCANE_CORE_EXPORT ComponentItemSharedInfoStorageView
  * d'un MeshMaterialMng.
  */
 class ARCANE_CORE_EXPORT ComponentItemSharedInfo
-: ComponentItemSharedInfoStorageView
+: private ComponentItemSharedInfoStorageView
 {
   friend class ComponentItemInternal;
   friend class ComponentItemInternalData;
@@ -111,22 +127,52 @@ class ARCANE_CORE_EXPORT ComponentItemSharedInfo
 
   inline constexpr ComponentItemInternal* _itemInternal(ComponentItemInternalLocalId id);
   inline constexpr matimpl::ConstituentItemBase _item(ComponentItemInternalLocalId id);
-  inline ARCCORE_HOST_DEVICE ComponentItemInternalLocalId _firstSubConstituentLocalId(ComponentItemInternalLocalId id)
+  inline ARCCORE_HOST_DEVICE ComponentItemInternalLocalId _firstSubConstituentLocalId(ComponentItemInternalLocalId id) const
+  {
+    ARCCORE_CHECK_RANGE(id.localId(), -1, m_storage_size);
+    return m_first_sub_constituent_item_id_data[id.localId()];
+  }
+  inline ARCCORE_HOST_DEVICE Int16 _nbSubConstituent(ComponentItemInternalLocalId id) const
   {
     ARCCORE_CHECK_RANGE(id.localId(), -1, m_storage_size);
-    return m_first_sub_constituent_list_ptr[id.localId()];
+    return m_nb_sub_constituent_item_data[id.localId()];
   }
+  inline void _setNbSubConstituent(ComponentItemInternalLocalId id, Int16 n)
+  {
+    ARCCORE_CHECK_RANGE(id.localId(), -1, m_storage_size);
+    m_nb_sub_constituent_item_data[id.localId()] = n;
+  }
+  inline ARCCORE_HOST_DEVICE Int16 _componentId(ComponentItemInternalLocalId id) const
+  {
+    ARCCORE_CHECK_RANGE(id.localId(), -1, m_storage_size);
+    return m_component_id_data[id.localId()];
+  }
+  inline void _setComponentId(ComponentItemInternalLocalId id, Int16 component_id)
+  {
+    ARCCORE_CHECK_RANGE(id.localId(), -1, m_storage_size);
+    m_component_id_data[id.localId()] = component_id;
+  }
+
   inline ARCCORE_HOST_DEVICE void
   _setFirstSubConstituentLocalId(ComponentItemInternalLocalId id, ComponentItemInternalLocalId first_id)
   {
     ARCCORE_CHECK_RANGE(id.localId(), -1, m_storage_size);
-    m_first_sub_constituent_list_ptr[id.localId()] = first_id;
+    m_first_sub_constituent_item_id_data[id.localId()] = first_id;
+  }
+
+  IMeshComponent* _component(ComponentItemInternalLocalId id) const
+  {
+    return m_components[_componentId(id)];
   }
+
   inline void _reset(ComponentItemInternalLocalId id)
   {
     Int32 local_id = id.localId();
     ARCCORE_CHECK_RANGE(local_id, -1, m_storage_size);
-    m_first_sub_constituent_list_ptr[local_id] = {};
+
+    m_first_sub_constituent_item_id_data[local_id] = {};
+    m_nb_sub_constituent_item_data[local_id] = 0;
+    m_component_id_data[local_id] = -1;
   }
 
  private:
@@ -184,7 +230,7 @@ class ARCANE_CORE_EXPORT ConstituentItemBase
   inline ARCCORE_HOST_DEVICE constexpr MatVarIndex variableIndex() const;
 
   //! Identifiant du composant
-  inline ARCCORE_HOST_DEVICE constexpr Int32 componentId() const;
+  inline ARCCORE_HOST_DEVICE Int32 componentId() const;
 
   //! Indique s'il s'agit de la maille nulle.
   inline ARCCORE_HOST_DEVICE constexpr bool null() const;
@@ -198,7 +244,7 @@ class ARCANE_CORE_EXPORT ConstituentItemBase
   inline IMeshComponent* component() const;
 
   //! Nombre de sous-composants.
-  inline ARCCORE_HOST_DEVICE constexpr Int32 nbSubItem() const;
+  inline ARCCORE_HOST_DEVICE Int32 nbSubItem() const;
 
   //! Entité globale correspondante.
   inline impl::ItemBase globalItemBase() const;
@@ -239,12 +285,12 @@ class ARCANE_CORE_EXPORT ConstituentItemBase
   inline ARCCORE_HOST_DEVICE matimpl::ConstituentItemBase _subItemBase(Int32 i) const;
 
   //! Positionne le nombre de sous-composants.
-  inline void _setNbSubItem(Int32 nb_sub_item);
+  inline void _setNbSubItem(Int16 nb_sub_item);
 
   //! Positionne le premier sous-composant.
   inline void _setFirstSubItem(ComponentItemInternalLocalId first_sub_item);
 
-  inline void _setComponent(Int32 component_id);
+  inline void _setComponent(Int16 component_id);
 
   inline ARCCORE_HOST_DEVICE ComponentItemInternalLocalId _internalLocalId() const;
 
@@ -260,12 +306,8 @@ class ARCANE_CORE_EXPORT ConstituentItemBase
 
  private:
 
-  void _checkIsInt16(Int32 v)
-  {
-    if (v < (-32768) || v > 32767)
-      _throwBadCast(v);
-  }
-  void _throwBadCast(Int32 v);
+  inline ComponentItemSharedInfo* _sharedInfo() const;
+  inline ComponentItemInternalLocalId _localId() const;
 };
 
 /*---------------------------------------------------------------------------*/
@@ -334,7 +376,7 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
   }
 
   //! Identifiant du composant
-  ARCCORE_HOST_DEVICE constexpr Int32 componentId() const { return m_component_id; }
+  ARCCORE_HOST_DEVICE Int32 componentId() const { return m_shared_info->_componentId(m_component_item_internal_local_id); }
 
   //! Indique s'il s'agit de la maille nulle.
   ARCCORE_HOST_DEVICE constexpr bool null() const { return m_var_index.null(); }
@@ -345,12 +387,12 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
    * Cet appel n'est valide que pour les mailles matériaux ou milieux. Si on souhaite
    * un appel valide pour toutes les 'ComponentItem', il faut utiliser componentId().
    */
-  IMeshComponent* component() const { return m_shared_info->m_components[m_component_id]; }
+  IMeshComponent* component() const { return m_shared_info->_component(m_component_item_internal_local_id); }
 
   //! Nombre de sous-composants.
-  ARCCORE_HOST_DEVICE constexpr Int32 nbSubItem() const
+  ARCCORE_HOST_DEVICE Int32 nbSubItem() const
   {
-    return m_nb_sub_component_item;
+    return m_shared_info->_nbSubConstituent(m_component_item_internal_local_id);
   }
 
   //! Entité globale correspondante.
@@ -375,22 +417,11 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
   // Toute modification de la structure interne doit être reportée
   // dans la structure C# correspondante
   MatVarIndex m_var_index;
-  Int16 m_component_id = -1;
-  Int16 m_nb_sub_component_item = 0;
   Int32 m_global_item_local_id = NULL_ITEM_LOCAL_ID;
   ComponentItemInternalLocalId m_component_item_internal_local_id;
   ComponentItemInternalLocalId m_super_component_item_local_id;
   ComponentItemSharedInfo* m_shared_info = nullptr;
 
- private:
-
-  void _checkIsInt16(Int32 v)
-  {
-    if (v < (-32768) || v > 32767)
-      _throwBadCast(v);
-  }
-  void _throwBadCast(Int32 v);
-
  private:
 
   //! Entité nulle
@@ -418,10 +449,8 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
   void _reset(ComponentItemInternalLocalId id, ComponentItemSharedInfo* shared_info)
   {
     m_var_index.reset();
-    m_component_id = -1;
     m_super_component_item_local_id = {};
     m_component_item_internal_local_id = id;
-    m_nb_sub_component_item = 0;
     m_global_item_local_id = NULL_ITEM_LOCAL_ID;
     m_shared_info = shared_info;
     m_shared_info->_reset(id);
@@ -452,6 +481,18 @@ ConstituentItemBase(ComponentItemSharedInfo* shared_info, ComponentItemInternalL
 {
 }
 
+inline ComponentItemSharedInfo* matimpl::ConstituentItemBase::
+_sharedInfo() const
+{
+  return m_component_item->m_shared_info;
+}
+
+inline ComponentItemInternalLocalId matimpl::ConstituentItemBase::
+_localId() const
+{
+  return m_component_item->m_component_item_internal_local_id;
+}
+
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
@@ -478,7 +519,7 @@ variableIndex() const
   return m_component_item->variableIndex();
 }
 
-inline ARCCORE_HOST_DEVICE constexpr Int32 matimpl::ConstituentItemBase::
+inline ARCCORE_HOST_DEVICE Int32 matimpl::ConstituentItemBase::
 componentId() const
 {
   return m_component_item->componentId();
@@ -496,7 +537,7 @@ component() const
   return m_component_item->component();
 }
 
-inline ARCCORE_HOST_DEVICE constexpr Int32 matimpl::ConstituentItemBase::
+inline ARCCORE_HOST_DEVICE Int32 matimpl::ConstituentItemBase::
 nbSubItem() const
 {
   return m_component_item->nbSubItem();
@@ -560,28 +601,22 @@ _subItemBase(Int32 i) const
 
 //! Positionne le nombre de sous-composants.
 inline void matimpl::ConstituentItemBase::
-_setNbSubItem(Int32 nb_sub_item)
+_setNbSubItem(Int16 nb_sub_item)
 {
-#ifdef ARCANE_CHECK
-  _checkIsInt16(nb_sub_item);
-#endif
-  m_component_item->m_nb_sub_component_item = static_cast<Int16>(nb_sub_item);
+  _sharedInfo()->_setNbSubConstituent(_localId(), nb_sub_item);
 }
 
 //! Positionne le premier sous-composant.
 inline void matimpl::ConstituentItemBase::
 _setFirstSubItem(ComponentItemInternalLocalId first_sub_item)
 {
-  m_component_item->m_shared_info->_setFirstSubConstituentLocalId(m_component_item->m_component_item_internal_local_id, first_sub_item);
+  _sharedInfo()->_setFirstSubConstituentLocalId(_localId(), first_sub_item);
 }
 
 inline void matimpl::ConstituentItemBase::
-_setComponent(Int32 component_id)
+_setComponent(Int16 component_id)
 {
-#ifdef ARCANE_CHECK
-  _checkIsInt16(component_id);
-#endif
-  m_component_item->m_component_id = static_cast<Int16>(component_id);
+  _sharedInfo()->_setComponentId(_localId(), component_id);
 }
 
 inline ARCCORE_HOST_DEVICE ComponentItemInternalLocalId matimpl::ConstituentItemBase::
diff --git a/arcane/src/arcane/materials/AllEnvData.cc b/arcane/src/arcane/materials/AllEnvData.cc
@@ -260,7 +260,7 @@ _computeInfosForEnvCells()
         Int32 lid = local_ids[z];
         Int32 pos = current_pos[lid];
         ++current_pos[lid];
-        Int32 nb_mat = m_component_connectivity_list->cellNbMaterial(CellLocalId(lid), env_id);
+        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];
         env->setConstituentItem(z, ref_ii._internalLocalId());
@@ -280,7 +280,7 @@ _computeInfosForEnvCells()
     ENUMERATE_CELL (icell, all_cells) {
       Cell c = *icell;
       Int32 lid = icell.itemLocalId();
-      Int32 n = cells_nb_env[lid];
+      Int16 n = cells_nb_env[lid];
       matimpl::ConstituentItemBase ref_ii = m_item_internal_data.allEnvItemBase(c);
       ref_ii._setSuperAndGlobalItem({}, c);
       ref_ii._setVariableIndex(MatVarIndex(0, lid));
diff --git a/arcane/src/arcane/materials/ComponentItemInternalData.cc b/arcane/src/arcane/materials/ComponentItemInternalData.cc
@@ -31,7 +31,9 @@ namespace Arcane::Materials
 
 ComponentItemInternalData::Storage::
 Storage(const MemoryAllocationOptions& alloc_info)
-: m_first_sub_constituent_list(alloc_info)
+: m_first_sub_constituent_item_id_list(alloc_info)
+, m_component_id_list(alloc_info)
+, m_nb_sub_constituent_item_list(alloc_info)
 {
 }
 
@@ -44,11 +46,20 @@ resize(Int32 new_size, ComponentItemSharedInfo* shared_info)
   // On dimensionne au nombre d'éléments + 1.
   // On décale de 1 la vue pour qu'elle puisse être indexée avec l'entité
   // nulle (d'indice (-1)).
-  m_first_sub_constituent_list.resize(new_size + 1);
-  m_first_sub_constituent_list[0] = {};
+  Int32 true_size = new_size + 1;
+  m_first_sub_constituent_item_id_list.resize(true_size);
+  m_first_sub_constituent_item_id_list[0] = {};
+
+  m_component_id_list.resize(true_size);
+  m_component_id_list[0] = -1;
+
+  m_nb_sub_constituent_item_list.resize(true_size);
+  m_nb_sub_constituent_item_list[0] = 0;
 
   shared_info->m_storage_size = new_size;
-  shared_info->m_first_sub_constituent_list_ptr = m_first_sub_constituent_list.data() + 1;
+  shared_info->m_first_sub_constituent_item_id_data = m_first_sub_constituent_item_id_list.data() + 1;
+  shared_info->m_component_id_data = m_component_id_list.data() + 1;
+  shared_info->m_nb_sub_constituent_item_data = m_nb_sub_constituent_item_list.data() + 1;
 }
 
 /*---------------------------------------------------------------------------*/
diff --git a/arcane/src/arcane/materials/MeshEnvironment.cc b/arcane/src/arcane/materials/MeshEnvironment.cc
@@ -233,7 +233,7 @@ computeMaterialIndexes(ComponentItemInternalData* item_internal_data)
     Integer nb_mat = m_true_materials.size();
     for (Integer i = 0; i < nb_mat; ++i) {
       MeshMaterial* mat = m_true_materials[i];
-      Int32 mat_id = mat->id();
+      Int16 mat_id = mat->componentId();
       const MeshMaterialVariableIndexer* var_indexer = mat->variableIndexer();
       CellGroup mat_cells = mat->cells();
       info(4) << "COMPUTE (V2) mat_cells mat=" << mat->name() << " nb_cell=" << mat_cells.size()
diff --git a/arcane/src/arcane/materials/internal/ComponentItemInternalData.h b/arcane/src/arcane/materials/internal/ComponentItemInternalData.h
@@ -114,6 +114,7 @@ class ComponentItemInternalRange
 class ComponentItemInternalData
 : public TraceAccessor
 {
+  //! Conteneur pour les informations de ComponentItemSharedInfo
   class Storage
   {
    public:
@@ -126,7 +127,9 @@ class ComponentItemInternalData
 
    private:
 
-    UniqueArray<ComponentItemInternalLocalId> m_first_sub_constituent_list;
+    UniqueArray<ComponentItemInternalLocalId> m_first_sub_constituent_item_id_list;
+    UniqueArray<Int16> m_component_id_list;
+    UniqueArray<Int16> m_nb_sub_constituent_item_list;
   };
 
  public:
diff --git a/arcane/tools/wrapper/materials/csharp/ComponentItemInternal.cs b/arcane/tools/wrapper/materials/csharp/ComponentItemInternal.cs
