Merge pull request #1187 from arcaneframework/dev/gg-use-componentiteminternal-localid-in-more-places

Replace some usage of 'ComponentItemInternal*' with 'ComponentItemInternalLocalId'

Author: grospelliergilles

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

@@ -244,10 +244,9 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
     return &m_shared_info->m_component_item_internal_view[m_super_component_item_local_id.localId()];
   }
 
-  void _setSuperAndGlobalItem(ComponentItemInternal* cii, ItemLocalId ii)
+  void _setSuperAndGlobalItem(ComponentItemInternalLocalId cii, ItemLocalId ii)
   {
-    if (cii)
-      m_super_component_item_local_id = cii->_internalLocalId();
+    m_super_component_item_local_id = cii;
     m_global_item_local_id = ii.localId();
   }
 
@@ -277,10 +276,9 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
   }
 
   //! Positionne le premier sous-composant.
-  void _setFirstSubItem(ComponentItemInternal* first_sub_item)
+  void _setFirstSubItem(ComponentItemInternalLocalId first_sub_item)
   {
-    if (first_sub_item)
-      m_first_sub_component_item_local_id = first_sub_item->_internalLocalId();
+    m_first_sub_component_item_local_id = first_sub_item;
   }
 
   void _setComponent(Int32 component_id)

arcane/src/arcane/materials/AllEnvData.cc

@@ -199,8 +199,10 @@ _computeInfosForEnvCells()
   ItemGroup all_cells = cell_family->allItems();
   ConstArrayView<MeshEnvironment*> true_environments(m_material_mng->trueEnvironments());
 
+  ComponentItemInternalRange all_env_items_internal_range = m_item_internal_data.allEnvItemsInternalRange();
   ArrayView<ComponentItemInternal> all_env_items_internal = m_item_internal_data.allEnvItemsInternal();
   ArrayView<ComponentItemInternal> env_items_internal = m_item_internal_data.envItemsInternal();
+  ComponentItemInternalRange env_items_internal_range = m_item_internal_data.envItemsInternalRange();
   ConstArrayView<Int16> cells_nb_env = m_component_connectivity_list->cellsNbEnvironment();
 
   // Calcule pour chaque maille sa position dans le tableau des milieux
@@ -245,13 +247,14 @@ _computeInfosForEnvCells()
         Int32 nb_mat = m_component_connectivity_list->cellNbMaterial(CellLocalId(lid), env_id);
         ComponentItemInternal& ref_ii = env_items_internal[pos];
         env_items_internal_pointer[z] = &env_items_internal[pos];
-        ref_ii._setSuperAndGlobalItem(&all_env_items_internal[lid], ItemLocalId(lid));
+        ref_ii._setSuperAndGlobalItem(all_env_items_internal_range[lid], ItemLocalId(lid));
         ref_ii._setNbSubItem(nb_mat);
         ref_ii._setVariableIndex(mvi);
+        ref_ii._setComponent(env_id);
       }
     }
     for( MeshEnvironment* env : true_environments ){
-      env->computeMaterialIndexes(*m_component_connectivity_list, &m_item_internal_data);
+      env->computeMaterialIndexes(&m_item_internal_data);
     }
   }
 
@@ -262,11 +265,11 @@ _computeInfosForEnvCells()
       Int32 lid = icell.itemLocalId();
       Int32 n = cells_nb_env[lid];
       ComponentItemInternal& ref_ii = all_env_items_internal[lid];
-      ref_ii._setSuperAndGlobalItem(nullptr,c);
+      ref_ii._setSuperAndGlobalItem({},c);
       ref_ii._setVariableIndex(MatVarIndex(0,lid));
       ref_ii._setNbSubItem(n);
       if (n!=0)
-        ref_ii._setFirstSubItem(&env_items_internal[env_cell_indexes[lid]]);
+        ref_ii._setFirstSubItem(env_items_internal_range[env_cell_indexes[lid]]);
     }
   }
 }

arcane/src/arcane/materials/MeshEnvironment.cc

@@ -187,40 +187,37 @@ computeNbMatPerCell()
  * computeNbMatPerCell() et computeItemListForMaterials() ont été appelées
  */
 void MeshEnvironment::
-computeMaterialIndexes(const ConstituentConnectivityList& connectivity_list, ComponentItemInternalData* item_internal_data)
+computeMaterialIndexes(ComponentItemInternalData* item_internal_data)
 {
   info(4) << "Compute (V2) indexes for environment name=" << name();
 
   IItemFamily* cell_family = cells().itemFamily();
   Integer max_local_id = cell_family->maxLocalId();
   ArrayView<ComponentItemInternal> mat_items_internal = item_internal_data->matItemsInternal(id());
+  ComponentItemInternalRange mat_items_internal_range = item_internal_data->matItemsInternalRange(id());
 
   Int32UniqueArray cells_index(max_local_id);
   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<ComponentItemInternal*> cells_env(max_local_id);
-  //Int32ArrayView nb_mat_per_cell = m_nb_mat_per_cell.asArray();
+  UniqueArray<ComponentItemInternalLocalId> cells_env(max_local_id);
 
   {
     Integer cell_index = 0;
-    const Int16 env_id = this->componentId();
     Int32ConstArrayView local_ids = variableIndexer()->localIds();
     ConstArrayView<ComponentItemInternal*> items_internal = itemsInternalView();
 
     for( Integer z=0, nb=local_ids.size(); z<nb; ++z ){
       Int32 lid = local_ids[z];
-      Int32 nb_mat = connectivity_list.cellNbMaterial(CellLocalId(lid), env_id);
       ComponentItemInternal* env_item = items_internal[z];
+      Int32 nb_mat = env_item->nbSubItem();
       cells_index[lid] = cell_index;
       cells_pos[lid] = cell_index;
       //info(4) << "XZ=" << z << " LID=" << lid << " POS=" << cell_index;
-      env_item->_setNbSubItem(nb_mat);
-      env_item->_setComponent(env_id);
       if (nb_mat!=0){
-        env_item->_setFirstSubItem(&mat_items_internal[cell_index]);
-        cells_env[lid] = env_item;
+        env_item->_setFirstSubItem(mat_items_internal_range[cell_index]);
       }
+      cells_env[lid] = env_item->_internalLocalId();
       cell_index += nb_mat;
     }
   }

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

@@ -160,6 +160,12 @@ class ComponentItemInternalData
     return m_env_items_internal_range;
   }
 
+  //! Liste des mailles matériaux pour le \a env_index ème milieu
+  ComponentItemInternalRange matItemsInternalRange(Int32 env_index)
+  {
+    return m_mat_items_internal_range[env_index];
+  }
+
   //! Redimensionne les structures allouant les 'ComponentItemInternal'
   void resizeComponentItemInternals(Int32 max_local_id, Int32 total_env_cell);
 

arcane/src/arcane/materials/internal/MeshEnvironment.h

@@ -158,7 +158,7 @@ class MeshEnvironment
   void addToTotalNbCellMat(Int32 v) { m_total_nb_cell_mat += v; }
 
   void resizeItemsInternal(Integer nb_item);
-  void computeMaterialIndexes(const ConstituentConnectivityList& connectivity_list, ComponentItemInternalData* item_internal_data);
+  void computeMaterialIndexes(ComponentItemInternalData* item_internal_data);
   void notifyLocalIdsChanged(Int32ConstArrayView old_to_new_ids);
   MeshComponentData* componentData() { return &m_data; }