Skip to content

Commit e1b4d23

Browse files
Merge pull request #1196 from arcaneframework/dev/gg-rename-componentiteminternallocalid
Rename class 'ComponentItemInternalLocalId' to 'ConstituentItemIndex'
2 parents 3d506f5 + 4ab5774 commit e1b4d23

19 files changed

+122
-119
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void ComponentCell::
2929
_badConversion(ComponentItemInternal* item_internal, Int32 level,Int32 expected_level)
3030
{
3131
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());
3333
}
3434

3535
/*---------------------------------------------------------------------------*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ class ARCANE_CORE_EXPORT ComponentCell
144144
}
145145

146146
//! \internal
147-
ARCCORE_HOST_DEVICE ComponentItemInternalLocalId _internalLocalId() const
147+
ARCCORE_HOST_DEVICE ConstituentItemIndex _internalLocalId() const
148148
{
149-
return m_internal->_internalLocalId();
149+
return m_internal->constituentItemIndex();
150150
}
151151
};
152152

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ComponentItemSharedInfo* ComponentItemSharedInfo::null_shared_info_pointer = &Co
3434
/*---------------------------------------------------------------------------*/
3535

3636
std::ostream&
37-
operator<<(std::ostream& o,const ComponentItemInternalLocalId& id)
37+
operator<<(std::ostream& o,const ConstituentItemIndex& id)
3838
{
3939
o << id.localId();
4040
return o;

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

Lines changed: 79 additions & 76 deletions
Large diffs are not rendered by default.

arcane/src/arcane/core/materials/ComponentItemVector.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ ComponentItemVector(ComponentItemVectorView rhs)
103103
/*---------------------------------------------------------------------------*/
104104

105105
void ComponentItemVector::
106-
_setItems(ConstArrayView<ComponentItemInternalLocalId> globals,
107-
ConstArrayView<ComponentItemInternalLocalId> multiples)
106+
_setItems(ConstArrayView<ConstituentItemIndex> globals,
107+
ConstArrayView<ConstituentItemIndex> multiples)
108108
{
109109
m_p->m_constituent_list->copyPureAndPartial(globals, multiples);
110110
}

arcane/src/arcane/core/materials/ComponentItemVector.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ class ARCANE_CORE_EXPORT ComponentItemVector
133133

134134
protected:
135135

136-
void _setItems(ConstArrayView<ComponentItemInternalLocalId> globals,
137-
ConstArrayView<ComponentItemInternalLocalId> multiples);
136+
void _setItems(ConstArrayView<ConstituentItemIndex> globals,
137+
ConstArrayView<ConstituentItemIndex> multiples);
138138

139139
void _setMatVarIndexes(ConstArrayView<MatVarIndex> globals,
140140
ConstArrayView<MatVarIndex> multiples);

arcane/src/arcane/core/materials/EnvItemVector.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ EnvCellVector(CellVectorView view,IMeshEnvironment* environment)
5353
void EnvCellVector::
5454
_build(CellVectorView view)
5555
{
56-
FixedArray<UniqueArray<ComponentItemInternalLocalId>,2> internals;
56+
FixedArray<UniqueArray<ConstituentItemIndex>,2> internals;
5757
FixedArray<UniqueArray<MatVarIndex>,2> matvar_indexes;
5858
FixedArray<UniqueArray<Int32>,2> local_ids;
5959
IMeshComponent* my_component = _component();

arcane/src/arcane/core/materials/MatItemVector.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ MatCellVector(CellVectorView view,IMeshMaterial* material)
5050
void MatCellVector::
5151
_build(CellVectorView view)
5252
{
53-
FixedArray<UniqueArray<ComponentItemInternalLocalId>,2> internals;
53+
FixedArray<UniqueArray<ConstituentItemIndex>,2> internals;
5454
FixedArray<UniqueArray<MatVarIndex>,2> matvar_indexes;
5555
FixedArray<UniqueArray<Int32>,2> local_ids;
5656
IMeshComponent* my_component = _component();

arcane/src/arcane/core/materials/internal/ConstituentItemLocalIdList.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList
4444

4545
public:
4646

47-
void setConstituentItem(Int32 index, ComponentItemInternalLocalId id)
47+
void setConstituentItem(Int32 index, ConstituentItemIndex id)
4848
{
4949
m_item_internal_local_id_list[index] = id;
5050
m_items_internal[index] = m_shared_info->_itemInternal(id);
5151
}
5252

53-
void copy(ConstArrayView<ComponentItemInternalLocalId> ids)
53+
void copy(ConstArrayView<ConstituentItemIndex> ids)
5454
{
5555
const Int32 size = ids.size();
5656
resize(size);
@@ -70,8 +70,8 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList
7070
/*!
7171
* \brief Copie les constituents partitionnés en partie pure et partielle.
7272
*/
73-
void copyPureAndPartial(ConstArrayView<ComponentItemInternalLocalId> pure_ids,
74-
ConstArrayView<ComponentItemInternalLocalId> partial_ids)
73+
void copyPureAndPartial(ConstArrayView<ConstituentItemIndex> pure_ids,
74+
ConstArrayView<ConstituentItemIndex> partial_ids)
7575
{
7676
Int32 nb_pure = pure_ids.size();
7777
Int32 nb_partial = partial_ids.size();
@@ -83,15 +83,15 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList
8383
setConstituentItem(nb_pure + i, partial_ids[i]);
8484
}
8585

86-
ConstArrayView<ComponentItemInternalLocalId> localIds() const
86+
ConstArrayView<ConstituentItemIndex> localIds() const
8787
{
8888
return m_item_internal_local_id_list;
8989
}
9090
matimpl::ConstituentItemBase itemBase(Int32 index) const
9191
{
9292
return m_shared_info->_item(localId(index));
9393
}
94-
ComponentItemInternalLocalId localId(Int32 index) const
94+
ConstituentItemIndex localId(Int32 index) const
9595
{
9696
return m_item_internal_local_id_list[index];
9797
}
@@ -111,8 +111,8 @@ class ARCANE_CORE_EXPORT ConstituentItemLocalIdList
111111
//! Liste des ComponentItemInternal* pour ce constituant.
112112
UniqueArray<ComponentItemInternal*> m_items_internal;
113113

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;
116116

117117
ComponentItemSharedInfo* m_shared_info = nullptr;
118118

arcane/src/arcane/materials/AllEnvData.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ _computeInfosForEnvCells()
262262
++current_pos[lid];
263263
Int16 nb_mat = m_component_connectivity_list->cellNbMaterial(CellLocalId(lid), env_id);
264264
matimpl::ConstituentItemBase ref_ii = m_item_internal_data.envItemBase(pos);
265-
ComponentItemInternalLocalId cii_lid = all_env_items_internal_range[lid];
265+
ConstituentItemIndex cii_lid = all_env_items_internal_range[lid];
266266
env->setConstituentItem(z, ref_ii._internalLocalId());
267267
ref_ii._setSuperAndGlobalItem(cii_lid, ItemLocalId(lid));
268268
ref_ii._setNbSubItem(nb_mat);

0 commit comments

Comments
 (0)