Merge pull request #1197 from arcaneframework/dev/gg-remove-some-usage-of-componentiteminternal

Remove some usage of 'ComponentItemInternal'

Author: grospelliergilles

arcane/src/arcane/core/materials/ComponentItem.cc

@@ -26,10 +26,10 @@ namespace Arcane::Materials
 /*---------------------------------------------------------------------------*/
 
 void ComponentCell::
-_badConversion(ComponentItemInternal* item_internal, Int32 level,Int32 expected_level)
+_badConversion(matimpl::ConstituentItemBase item_base, 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->constituentItemIndex(),item_internal->componentId());
+               level,expected_level, item_base._constituentItemIndex(),item_base.componentId());
 }
 
 /*---------------------------------------------------------------------------*/

arcane/src/arcane/core/materials/ComponentItem.h

@@ -62,12 +62,11 @@ class ARCANE_CORE_EXPORT ComponentCell
  public:
 
   ARCCORE_HOST_DEVICE ComponentCell(const matimpl::ConstituentItemBase& mii)
-  : m_internal(mii._internal())
+  : m_constituent_item_index(mii.m_constituent_item_index)
+  , m_shared_info(mii.m_shared_info)
   {}
 
-  ComponentCell()
-  : m_internal(ComponentItemInternal::_nullItem())
-  {}
+  ComponentCell() = default;
 
  public:
 
@@ -77,32 +76,32 @@ class ARCANE_CORE_EXPORT ComponentCell
  public:
 
   //! \internal
-  ARCCORE_HOST_DEVICE MatVarIndex _varIndex() const { return m_internal->variableIndex(); }
+  ARCCORE_HOST_DEVICE MatVarIndex _varIndex() const { return m_shared_info->_varIndex(m_constituent_item_index); }
 
-  ARCCORE_HOST_DEVICE matimpl::ConstituentItemBase constituentItemBase() const { return m_internal; }
+  ARCCORE_HOST_DEVICE matimpl::ConstituentItemBase constituentItemBase() const { return { m_shared_info, m_constituent_item_index}; }
 
   //! Composant associé
-  IMeshComponent* component() const { return m_internal->component(); }
+  IMeshComponent* component() const { return m_shared_info->_component(m_constituent_item_index); }
 
   //! Identifiant du composant dans la liste des composants de ce type.
-  Int32 componentId() const { return m_internal->componentId(); }
+  ARCCORE_HOST_DEVICE Int32 componentId() const { return m_shared_info->_componentId(m_constituent_item_index); }
 
   //! Indique s'il s'agit de la maille nulle
-  bool null() const { return m_internal->null(); }
+  bool null() const { return m_constituent_item_index.isNull(); }
 
   //! Maille de niveau supérieur dans la hiérarchie
-  ComponentCell superCell() const { return ComponentCell(m_internal->_superItemBase()); }
+  ComponentCell superCell() const { return ComponentCell(_superItemBase()); }
 
   //! Niveau hiérarchique de l'entité
-  Int32 level() const { return m_internal->level(); }
+  ARCCORE_HOST_DEVICE Int32 level() const { return m_shared_info->m_level; }
 
   //! Nombre de sous-éléments
-  Int32 nbSubItem() const { return m_internal->nbSubItem(); }
+  ARCCORE_HOST_DEVICE Int32 nbSubItem() const { return m_shared_info->_nbSubConstituent(m_constituent_item_index); }
 
   //! Maille arcane
   Cell globalCell() const
   {
-    return Cell(m_internal->globalItemBase());
+    return Cell(m_shared_info->_globalItemBase(m_constituent_item_index));
   }
 
   /*!
@@ -113,40 +112,47 @@ class ARCANE_CORE_EXPORT ComponentCell
    * \warning Ce numéro unique n'est pas le même que celui de la maille globale
    * associée.
    */
-  Int64 componentUniqueId() const { return m_internal->componentUniqueId(); }
+  Int64 componentUniqueId() const { return m_shared_info->_componentUniqueId(m_constituent_item_index); }
 
  protected:
 
-  static ARCCORE_HOST_DEVICE void _checkLevel([[maybe_unused]] ComponentItemInternal* item_internal,
+  static ARCCORE_HOST_DEVICE void _checkLevel([[maybe_unused]] matimpl::ConstituentItemBase item_base,
                                               [[maybe_unused]] Int32 expected_level)
   {
 #if !defined(ARCCORE_DEVICE_CODE)
-    if (item_internal->null())
+    if (item_base.null())
       return;
-    Int32 lvl = item_internal->level();
+    Int32 lvl = item_base.level();
     if (lvl != expected_level)
-      _badConversion(item_internal, lvl, expected_level);
+      _badConversion(item_base, lvl, expected_level);
 #endif
   }
-  static void _badConversion(ComponentItemInternal* item_internal, Int32 level, Int32 expected_level);
+  static void _badConversion(matimpl::ConstituentItemBase item_base, Int32 level, Int32 expected_level);
+
+  matimpl::ConstituentItemBase _subItemBase(Int32 index) const
+  {
+    return m_shared_info->_subItemBase(m_constituent_item_index, index);
+  }
+  matimpl::ConstituentItemBase _superItemBase() const
+  {
+    return m_shared_info->_superItemBase(m_constituent_item_index);
+  }
+  ARCCORE_HOST_DEVICE ConstituentItemIndex _firstSubConstituentLocalId() const
+  {
+    return m_shared_info->_firstSubConstituentLocalId(m_constituent_item_index);
+  }
 
  protected:
 
-  ComponentItemInternal* m_internal;
+  ConstituentItemIndex m_constituent_item_index;
+  ComponentItemSharedInfo* m_shared_info = ComponentItemSharedInfo::_nullInstance();
 
  private:
 
   //! \internal
-  // TODO: rendre obsolète
-  ARCCORE_HOST_DEVICE ComponentItemInternal* _internal() const
-  {
-    return m_internal;
-  }
-
-  //! \internal
-  ARCCORE_HOST_DEVICE ConstituentItemIndex _internalLocalId() const
+  ARCCORE_HOST_DEVICE ConstituentItemIndex _constituentItemIndex() const
   {
-    return m_internal->constituentItemIndex();
+    return m_constituent_item_index;
   }
 };
 

arcane/src/arcane/core/materials/ComponentItemInternal.cc

@@ -46,19 +46,8 @@ operator<<(std::ostream& o,const ConstituentItemIndex& id)
 void ConstituentItemLocalIdListView::
 _checkCoherency() const
 {
-  Int32 nb_item = m_items_internal.size();
   if (!m_component_shared_info)
-    ARCANE_FATAL("Null ComponentItemSharedInfo nb_item={0}", nb_item);
-  return;
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-void ConstituentItemLocalIdListView::
-_throwIncoherentSharedInfo(Int32 index) const
-{
-  ARCANE_FATAL("Incoherent ComponentItemSharedInfo for item index={0}", index);
+    ARCANE_FATAL("Null ComponentItemSharedInfo");
 }
 
 /*---------------------------------------------------------------------------*/