Merge pull request #1199 from arcaneframework/dev/gg-continue-removing-usage-of-componentiteminternal3

Remove remaining usage of 'ComponentItemInternal'

Author: grospelliergilles

arcane/src/arcane/core/materials/CellToAllEnvCellConverter.h

@@ -69,16 +69,22 @@ namespace Arcane::Materials
  */
 class CellToAllEnvCellConverter
 {
- public:
+  friend class MeshMaterialMng;
 
-  explicit CellToAllEnvCellConverter(ConstArrayView<ComponentItemInternal> v)
-  : m_all_env_items_internal(v){}
+ public:
 
   explicit CellToAllEnvCellConverter(IMeshMaterialMng* mm)
   {
     *this = mm->cellToAllEnvCellConverter();
   }
 
+ private:
+
+  explicit CellToAllEnvCellConverter(ComponentItemSharedInfo* shared_info)
+  : m_shared_info(shared_info)
+  {
+  }
+
  public:
 
   //! Converti une maille \a Cell en maille \a AllEnvCell
@@ -89,13 +95,15 @@ class CellToAllEnvCellConverter
   //! Converti une maille \a CellLocalId en maille \a AllEnvCell
   ARCCORE_HOST_DEVICE AllEnvCell operator[](CellLocalId c) const
   {
-    const ComponentItemInternal* p = &m_all_env_items_internal[c.localId()];
-    return AllEnvCell(matimpl::ConstituentItemBase(const_cast<ComponentItemInternal*>(p)));
+    //const ComponentItemInternal* p = &m_all_env_items_internal[c.localId()];
+    // Pour les AllEnvCell, l'index dans la liste est le localid() de la maille.
+    return AllEnvCell(m_shared_info->_item(ConstituentItemIndex(c.localId())));
   }
 
  private:
 
   ConstArrayView<ComponentItemInternal> m_all_env_items_internal;
+  ComponentItemSharedInfo* m_shared_info = nullptr;
 };
 
 /*---------------------------------------------------------------------------*/

arcane/src/arcane/core/materials/ComponentItemInternal.h

@@ -27,6 +27,8 @@ class MeshEnvironment;
 class MeshComponentData;
 class AllEnvData;
 class MeshMaterialMng;
+class ComponentItemInternalData;
+
 namespace matimpl
 {
   class ConstituentItemBase;
@@ -128,6 +130,8 @@ class ARCANE_CORE_EXPORT ComponentItemSharedInfo
   friend class ConstituentItemLocalIdListView;
   friend matimpl::ConstituentItemBase;
   friend class ComponentCell;
+  friend class CellToAllEnvCellConverter;
+  friend class AllEnvCellVectorView;
 
   static const int MAT_INDEX_OFFSET = 10;
 
@@ -237,7 +241,6 @@ class ARCANE_CORE_EXPORT ComponentItemSharedInfo
   ConstArrayView<IMeshComponent*> m_components;
   ComponentItemSharedInfo* m_super_component_item_shared_info = null_shared_info_pointer;
   ComponentItemSharedInfo* m_sub_component_item_shared_info = null_shared_info_pointer;
-  ArrayView<ComponentItemInternal> m_component_item_internal_view;
 };
 
 /*---------------------------------------------------------------------------*/
@@ -265,10 +268,7 @@ class ARCANE_CORE_EXPORT ConstituentItemBase
 
   friend Arcane::Materials::MeshEnvironment;
   friend Arcane::Materials::MeshComponentData;
-
- public:
-
-  ARCCORE_HOST_DEVICE ConstituentItemBase(ComponentItemInternal* component_item);
+  friend Arcane::Materials::ComponentItemInternalData;
 
  private:
 
@@ -384,19 +384,7 @@ namespace Arcane::Materials
  */
 class ARCANE_CORE_EXPORT ComponentItemInternal
 {
-  friend class ComponentCell;
-  friend class MatCell;
-  friend class EnvCell;
-  friend class ComponentCell;
-  friend class AllEnvCell;
-  friend class CellComponentCellEnumerator;
   friend class ComponentItemInternalData;
-  friend class MeshComponentData;
-  friend class MeshEnvironment;
-  friend class AllEnvData;
-  friend class MeshMaterialMng;
-  friend class ConstituentItemLocalIdList;
-  friend class ConstituentItemLocalIdListView;
 
   friend matimpl::ConstituentItemBase;
 
@@ -409,30 +397,6 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
 
   ComponentItemInternal() = default;
 
- public:
-
-  //! Indexeur dans les variables matériaux
-  ARCCORE_HOST_DEVICE MatVarIndex variableIndex() const
-  {
-    return m_shared_info->_varIndex(m_component_item_index);
-  }
-
-  //! Identifiant du composant
-  ARCCORE_HOST_DEVICE Int32 componentId() const { return m_shared_info->_componentId(m_component_item_index); }
-
-  //! Indique s'il s'agit de la maille nulle.
-  ARCCORE_HOST_DEVICE constexpr bool null() const { return m_component_item_index.isNull(); }
-
-  /*!
-   * \brief Composant associé.
-   *
-   * 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->_component(m_component_item_index); }
-
-  ARCCORE_HOST_DEVICE constexpr Int32 level() const { return m_shared_info->m_level; }
-
  protected:
 
   // NOTE : Cette classe est partagée avec le wrapper C#
@@ -457,13 +421,6 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-inline ARCCORE_HOST_DEVICE matimpl::ConstituentItemBase::
-ConstituentItemBase(ComponentItemInternal* component_item)
-: m_constituent_item_index(component_item->m_component_item_index)
-, m_shared_info(component_item->m_shared_info)
-{
-}
-
 inline constexpr matimpl::ConstituentItemBase::
 ConstituentItemBase(ComponentItemSharedInfo* shared_info, ConstituentItemIndex id)
 : m_constituent_item_index(id)

arcane/src/arcane/core/materials/MatItemEnumerator.h

@@ -76,8 +76,10 @@ class ARCANE_CORE_EXPORT AllEnvCellVectorView
 
  protected:
 
-  AllEnvCellVectorView(Int32ConstArrayView local_ids, ConstArrayView<ComponentItemInternal> items_internal)
-  : m_local_ids(local_ids), m_items_internal(items_internal)
+  AllEnvCellVectorView(Int32ConstArrayView local_ids,
+                       ComponentItemSharedInfo* shared_info)
+  : m_local_ids(local_ids)
+  , m_shared_info(shared_info)
   {
   }
 
@@ -87,22 +89,18 @@ class ARCANE_CORE_EXPORT AllEnvCellVectorView
   Integer size() const { return m_local_ids.size(); }
 
   // \i ème maille du vecteur
-  AllEnvCell operator[](Integer index)
+  AllEnvCell operator[](Integer index) const
   {
-    const ComponentItemInternal* c = &m_items_internal[m_local_ids[index]];
-    return AllEnvCell(matimpl::ConstituentItemBase(const_cast<ComponentItemInternal*>(c)));
+    return AllEnvCell(m_shared_info->_item(ConstituentItemIndex(m_local_ids[index])));
   }
 
   // localId() de la \i ème maille du vecteur
-  Int32 localId(Integer index)
-  {
-    return m_local_ids[index];
-  }
+  Int32 localId(Integer index) const { return m_local_ids[index]; }
 
  private:
 
   Int32ConstArrayView m_local_ids;
-  ConstArrayView<ComponentItemInternal> m_items_internal;
+  ComponentItemSharedInfo* m_shared_info = nullptr;
 };
 
 /*---------------------------------------------------------------------------*/
@@ -298,7 +296,7 @@ class ARCANE_CORE_EXPORT ComponentPartCellEnumerator
   Integer m_base_index;
   Int32ConstArrayView m_value_indexes;
   Int32ConstArrayView m_item_indexes;
-  ConstituentItemLocalIdListView m_constituent_list_view; // ConstArrayView<ComponentItemInternal*> m_items_internal;
+  ConstituentItemLocalIdListView m_constituent_list_view;
   IMeshComponent* m_component;
 
  protected:
@@ -364,8 +362,8 @@ class ARCANE_CORE_EXPORT CellComponentCellEnumerator
 
   ARCCORE_HOST_DEVICE explicit CellComponentCellEnumerator(ComponentCell super_item)
   : m_size(super_item.nbSubItem())
-  , m_items_begin(super_item._firstSubConstituentLocalId().localId())
-  , m_item_internal_list(super_item.m_shared_info->m_sub_component_item_shared_info->m_component_item_internal_view)
+  , m_first_sub_index(super_item._firstSubConstituentLocalId().localId())
+  , m_sub_constituent_shared_info(super_item.m_shared_info->m_sub_component_item_shared_info)
   {
   }
 
@@ -377,9 +375,12 @@ class ARCANE_CORE_EXPORT CellComponentCellEnumerator
   ARCCORE_HOST_DEVICE ComponentCell operator*() const
   {
     ARCANE_CHECK_AT(m_index,m_size);
-    return ComponentCell(_currentItemBase());
+    return ComponentCell(_currentSubItemBase());
+  }
+  ARCCORE_HOST_DEVICE MatVarIndex _varIndex() const
+  {
+    return m_sub_constituent_shared_info->_varIndex(ConstituentItemIndex(m_first_sub_index + m_index));
   }
-  ARCCORE_HOST_DEVICE MatVarIndex _varIndex() const { return m_item_internal_list[m_items_begin+m_index].variableIndex(); }
   ARCCORE_HOST_DEVICE Integer index() const { return m_index; }
   ARCCORE_HOST_DEVICE operator ComponentItemLocalId() const
   {
@@ -390,14 +391,14 @@ class ARCANE_CORE_EXPORT CellComponentCellEnumerator
 
   Int32 m_index = 0;
   Int32 m_size = 0;
-  Int32 m_items_begin = -1;
-  ArrayView<ComponentItemInternal> m_item_internal_list;
+  Int32 m_first_sub_index = -1;
+  ComponentItemSharedInfo* m_sub_constituent_shared_info = nullptr;
 
  protected:
 
- ARCCORE_HOST_DEVICE matimpl::ConstituentItemBase _currentItemBase() const
+  ARCCORE_HOST_DEVICE matimpl::ConstituentItemBase _currentSubItemBase() const
   {
-    return matimpl::ConstituentItemBase(const_cast<ComponentItemInternal*>(m_item_internal_list.ptrAt(m_items_begin+m_index)));
+    return m_sub_constituent_shared_info->_item(ConstituentItemIndex(m_first_sub_index+m_index));
   }
 };
 
@@ -419,7 +420,7 @@ template <typename ComponentCellType> class CellComponentCellEnumeratorT
   ARCCORE_HOST_DEVICE ComponentCellType operator*() const
   {
     ARCANE_CHECK_AT(m_index,m_size);
-    return ComponentCellType(_currentItemBase());
+    return ComponentCellType(_currentSubItemBase());
   }
 };
 

arcane/src/arcane/materials/ComponentItemInternalData.cc

@@ -179,11 +179,6 @@ resizeComponentItemInternals(Int32 max_local_id, Int32 total_nb_env_cell)
   m_mat_storage.resize(total_nb_mat_cell, matSharedInfo());
 
   _resetItemsInternal();
-
-  // Met à jour les vues sur m_component_item_internal_storage.
-  allEnvSharedInfo()->m_component_item_internal_view = m_all_env_item_internal_storage;
-  envSharedInfo()->m_component_item_internal_view = m_env_item_internal_storage;
-  matSharedInfo()->m_component_item_internal_view = m_mat_item_internal_storage;
 }
 
 /*---------------------------------------------------------------------------*/

arcane/src/arcane/materials/MeshMaterialMng.cc

@@ -921,7 +921,7 @@ dumpCellInfos(Cell cell,std::ostream& o)
 CellToAllEnvCellConverter MeshMaterialMng::
 cellToAllEnvCellConverter()
 {
-  return CellToAllEnvCellConverter(m_all_env_data->allEnvItemsInternal());
+  return CellToAllEnvCellConverter(componentItemSharedInfo(LEVEL_ALLENVIRONMENT));
 }
 
 /*---------------------------------------------------------------------------*/
@@ -940,7 +940,7 @@ _checkEndCreate()
 AllEnvCellVectorView MeshMaterialMng::
 view(Int32ConstArrayView local_ids)
 {
-  return AllEnvCellVectorView(local_ids,m_all_env_data->allEnvItemsInternal());
+  return AllEnvCellVectorView(local_ids, componentItemSharedInfo(LEVEL_ALLENVIRONMENT));
 }
 
 /*---------------------------------------------------------------------------*/
@@ -1205,6 +1205,8 @@ componentItemSharedInfo(Int32 level) const
     shared_info = data->matSharedInfo();
   else if (level == LEVEL_ENVIRONMENT)
     shared_info = data->envSharedInfo();
+  else if (level==LEVEL_ALLENVIRONMENT)
+    shared_info = data->allEnvSharedInfo();
   else
     ARCANE_FATAL("Bad internal type of component");
 

arcane/src/arcane/materials/internal/AllEnvData.h

@@ -55,11 +55,6 @@ class AllEnvData
 
  public:
 
-  ConstArrayView<ComponentItemInternal> allEnvItemsInternal()
-  {
-    return m_item_internal_data.allEnvItemsInternal();
-  }
-
   //! Notification de la fin de création des milieux/matériaux
   void endCreate(bool is_continue);
 

arcane/src/arcane/materials/internal/ComponentItemInternalData.h

@@ -146,28 +146,22 @@ class ComponentItemInternalData
 
  public:
 
-  //! Liste des AllEnvCell. Uniquement pour les itérateurs.
-  ConstArrayView<ComponentItemInternal> allEnvItemsInternal() const
-  {
-    return m_all_env_items_internal;
-  }
-
   //! Retourne la AllEnvCell correspondant à la maille \a id
   matimpl::ConstituentItemBase allEnvItemBase(CellLocalId id)
   {
-    return matimpl::ConstituentItemBase(&m_all_env_items_internal[id.localId()]);
+    return matimpl::ConstituentItemBase(allEnvSharedInfo(),ConstituentItemIndex(id.localId()));
   }
 
   //! Retourne la EnvCell correspondant à l'indice \a index
   matimpl::ConstituentItemBase envItemBase(Int32 index)
   {
-    return matimpl::ConstituentItemBase(&m_env_items_internal[index]);
+    return matimpl::ConstituentItemBase(envSharedInfo(), ConstituentItemIndex(index));
   }
 
   //! Retourne la MatCell correspondant au milieu d'indice \a index du milieu \a env_index
   matimpl::ConstituentItemBase matItemBase(Int16 env_index,Int32 index)
   {
-    return matimpl::ConstituentItemBase(&m_mat_items_internal[env_index][index]);
+    return matimpl::ConstituentItemBase(matSharedInfo(), ConstituentItemIndex(matItemsInternalRange(env_index)[index]));
   }
 
   ComponentItemInternalRange allEnvItemsInternalRange() const