From 3d0696d0a5c2575a5ce77b6d0ee520b997ded933 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Mon, 10 Jul 2023 12:47:21 +0200 Subject: [PATCH 1/5] [arcane,materials] Supprime 'ComponentItemInternal::globalItem()'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cette méthode est remplacée par 'globalItemBase()' qui retourne un 'ItemBase' au lieu d'un 'ItemInternal*'. Comme 'globalItem()' n'est pas utilisé en dehors de Arcane on peut la supprimer directement. --- arcane/src/arcane/core/materials/ComponentItem.h | 2 +- arcane/src/arcane/core/materials/ComponentItemInternal.h | 6 +----- arcane/src/arcane/core/materials/MatItem.h | 6 +++--- arcane/src/arcane/materials/MeshMaterialMng.cc | 4 ++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/arcane/src/arcane/core/materials/ComponentItem.h b/arcane/src/arcane/core/materials/ComponentItem.h index a8347816d..dc8767f17 100644 --- a/arcane/src/arcane/core/materials/ComponentItem.h +++ b/arcane/src/arcane/core/materials/ComponentItem.h @@ -89,7 +89,7 @@ class ARCANE_CORE_EXPORT ComponentCell //! Maille arcane Cell globalCell() const { - return Cell(m_internal->globalItem()); + return Cell(m_internal->globalItemBase()); } /*! diff --git a/arcane/src/arcane/core/materials/ComponentItemInternal.h b/arcane/src/arcane/core/materials/ComponentItemInternal.h index 49d0480aa..ded60010e 100644 --- a/arcane/src/arcane/core/materials/ComponentItemInternal.h +++ b/arcane/src/arcane/core/materials/ComponentItemInternal.h @@ -51,7 +51,6 @@ class ARCANE_CORE_EXPORT ComponentItemInternal { private: - //static const Int64 UID_MASK = 0x00ffffff; static const int MAT_INDEX_OFFSET = 10; //! Entité nulle @@ -120,11 +119,8 @@ class ARCANE_CORE_EXPORT ComponentItemInternal //! Première entité sous-composant. ComponentItemInternal* firstSubItem() const { return m_first_sub_component_item; } - //! ItemInternal de l'entité Item correspondante. - ItemInternal* globalItem() { return m_global_item; } - //! Entité globale correspondante. - Item globalItem2() { return m_global_item; } + impl::ItemBase globalItemBase() { return m_global_item; } //! Positionne le nombre de sous-composants. void setNbSubItem(Int32 nb_sub_item) diff --git a/arcane/src/arcane/core/materials/MatItem.h b/arcane/src/arcane/core/materials/MatItem.h index 986d4e4d3..686fb039c 100644 --- a/arcane/src/arcane/core/materials/MatItem.h +++ b/arcane/src/arcane/core/materials/MatItem.h @@ -66,7 +66,7 @@ class MatCell //! Maille arcane Cell globalCell() const { - return Cell(m_internal->globalItem()); + return Cell(m_internal->globalItemBase()); } //! Materiau associé @@ -121,7 +121,7 @@ class EnvCell Int32 nbMaterial() const { return m_internal->nbSubItem(); } //! Maille arcane - Cell globalCell() const { return Cell(m_internal->globalItem()); } + Cell globalCell() const { return Cell(m_internal->globalItemBase()); } //! Maille contenant les infos sur tous les milieux AllEnvCell allEnvCell() const; @@ -176,7 +176,7 @@ class AllEnvCell Int32 nbEnvironment() { return m_internal->nbSubItem(); } //! Maille arcane standard - Cell globalCell() const { return Cell(m_internal->globalItem()); } + Cell globalCell() const { return Cell(m_internal->globalItemBase()); } //! i-ème maille milieu EnvCell cell(Integer i) const diff --git a/arcane/src/arcane/materials/MeshMaterialMng.cc b/arcane/src/arcane/materials/MeshMaterialMng.cc index 8f21010c1..fd58fc475 100644 --- a/arcane/src/arcane/materials/MeshMaterialMng.cc +++ b/arcane/src/arcane/materials/MeshMaterialMng.cc @@ -665,7 +665,7 @@ checkValid() ComponentItemInternal* eii = ec.internal(); if (all_env_cell.internal()!=eii->superItem()) ARCANE_FATAL("Bad corresponding allEnvItem() in env_item uid={0}",cell_uid); - if (eii->globalItem2()!=cell) + if (eii->globalItemBase()!=cell) ARCANE_FATAL("Bad corresponding globalItem() in env_item"); if (eii->level()!=LEVEL_ENVIRONMENT) ARCANE_FATAL("Bad level '{0}' for in env_item",eii->level()); @@ -679,7 +679,7 @@ checkValid() ComponentItemInternal* mci = mc.internal(); if (eii!=mci->superItem()) ARCANE_FATAL("Bad corresponding env_item in mat_item"); - if (mci->globalItem2()!=cell) + if (mci->globalItemBase()!=cell) ARCANE_FATAL("Bad corresponding globalItem() in mat_item"); if (mci->level()!=LEVEL_MATERIAL) ARCANE_FATAL("Bad level '{0}' for in mat_item",mci->level()); From 8bac3e84b667ddfdf268cced0d98de6f0571ae41 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Mon, 10 Jul 2023 12:59:52 +0200 Subject: [PATCH 2/5] [arcane,materials] Supprime le constructeur de 'CellComponentCellEnumerator' qui utilise un 'ComponentItemInernal*' en argument. --- arcane/src/arcane/core/materials/MatItemEnumerator.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arcane/src/arcane/core/materials/MatItemEnumerator.h b/arcane/src/arcane/core/materials/MatItemEnumerator.h index 7a367608a..5f0fc9083 100644 --- a/arcane/src/arcane/core/materials/MatItemEnumerator.h +++ b/arcane/src/arcane/core/materials/MatItemEnumerator.h @@ -351,16 +351,13 @@ class ARCANE_CORE_EXPORT CellComponentCellEnumerator public: - // TODO: rendre obsolète - explicit CellComponentCellEnumerator(ComponentItemInternal* super_item) - : m_index(0), m_size(super_item->nbSubItem()), m_items_begin(super_item->firstSubItem()) - { - } explicit CellComponentCellEnumerator(ComponentCell super_item) : m_index(0), m_size(super_item.internal()->nbSubItem()), m_items_begin(super_item.internal()->firstSubItem()) { } + public: + void operator++() { ++m_index; } bool hasNext() const { return m_index class CellComponentCellEnumeratorT { public: - explicit CellComponentCellEnumeratorT(ComponentItemInternal* super_item) - : CellComponentCellEnumerator(super_item){} - explicit CellComponentCellEnumeratorT(ComponentCell super_item) : CellComponentCellEnumerator(super_item){} From 6883ccb9dbb8fa32184944ef0e8bdde55bd9e110 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Mon, 10 Jul 2023 13:52:01 +0200 Subject: [PATCH 3/5] =?UTF-8?q?[arcane,materials]=20Cr=C3=A9e=20une=20inte?= =?UTF-8?q?rface=20'IMeshComponentInternal'=20pour=20g=C3=A9rer=20l'API=20?= =?UTF-8?q?interne=20=C3=A0=20Arcane=20de=20'IMeshComponent'.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arcane/core/materials/IMeshComponent.h | 6 +++ .../internal/IMeshComponentInternal.h | 51 +++++++++++++++++++ arcane/src/arcane/core/srcs.cmake | 1 + .../src/arcane/materials/MeshEnvironment.cc | 1 + arcane/src/arcane/materials/MeshMaterial.cc | 1 + .../materials/internal/MeshEnvironment.h | 30 +++++++++-- .../arcane/materials/internal/MeshMaterial.h | 27 ++++++++-- 7 files changed, 109 insertions(+), 8 deletions(-) create mode 100644 arcane/src/arcane/core/materials/internal/IMeshComponentInternal.h diff --git a/arcane/src/arcane/core/materials/IMeshComponent.h b/arcane/src/arcane/core/materials/IMeshComponent.h index 381384582..45f9eb36f 100644 --- a/arcane/src/arcane/core/materials/IMeshComponent.h +++ b/arcane/src/arcane/core/materials/IMeshComponent.h @@ -22,6 +22,7 @@ namespace Arcane::Materials { +class IMeshComponentInternal; /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ @@ -129,6 +130,11 @@ class ARCANE_CORE_EXPORT IMeshComponent */ ARCANE_DEPRECATED_REASON("Y2023: This method is internal to Arcane") virtual ConstArrayView itemsInternalView() const =0; + + public: + + //! API interne + virtual IMeshComponentInternal* _internalApi() =0; }; /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/core/materials/internal/IMeshComponentInternal.h b/arcane/src/arcane/core/materials/internal/IMeshComponentInternal.h new file mode 100644 index 000000000..cd456bfac --- /dev/null +++ b/arcane/src/arcane/core/materials/internal/IMeshComponentInternal.h @@ -0,0 +1,51 @@ +// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- +//----------------------------------------------------------------------------- +// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// See the top-level COPYRIGHT file for details. +// SPDX-License-Identifier: Apache-2.0 +//----------------------------------------------------------------------------- +/*---------------------------------------------------------------------------*/ +/* IMeshComponentInternal.h (C) 2000-2023 */ +/* */ +/* API interne Arcane de 'IMeshComponent'. */ +/*---------------------------------------------------------------------------*/ +#ifndef ARCANE_CORE_MATERIALS_INTERNAL_IMESHCOMPONENTINTERNAL_H +#define ARCANE_CORE_MATERIALS_INTERNAL_IMESHCOMPONENTINTERNAL_H +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +#include "arcane/core/ItemTypes.h" +#include "arcane/core/materials/MaterialsCoreGlobal.h" + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +namespace Arcane::Materials +{ + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ +/*! + * \brief API interne Arcane de 'IMeshComponent'. + */ +class ARCANE_CORE_EXPORT IMeshComponentInternal +{ + public: + + virtual ~IMeshComponentInternal() = default; + + public: + + //! Vue sur les mailles du composant. + virtual ConstArrayView itemsInternalView() const = 0; +}; + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +} // namespace Arcane::Materials + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +#endif diff --git a/arcane/src/arcane/core/srcs.cmake b/arcane/src/arcane/core/srcs.cmake index f86973792..b149cdb43 100644 --- a/arcane/src/arcane/core/srcs.cmake +++ b/arcane/src/arcane/core/srcs.cmake @@ -53,6 +53,7 @@ set(ARCANE_MATERIALS_SOURCES materials/MeshMaterialVariableComputeFunction.h materials/IMeshMaterialVariableComputeFunction.h materials/internal/IMeshMaterialVariableInternal.h + materials/internal/IMeshComponentInternal.h ) set(ARCANE_INTERNAL_SOURCES diff --git a/arcane/src/arcane/materials/MeshEnvironment.cc b/arcane/src/arcane/materials/MeshEnvironment.cc index 381e75006..8cc1f536e 100644 --- a/arcane/src/arcane/materials/MeshEnvironment.cc +++ b/arcane/src/arcane/materials/MeshEnvironment.cc @@ -101,6 +101,7 @@ MeshEnvironment(IMeshMaterialMng* mm, const String& name, Int32 env_id) , m_nb_mat_per_cell(VariableBuildInfo(mm->mesh(), mm->name() + "_CellNbMaterial_" + name)) , m_data(this, name, env_id, false) , m_non_const_this(this) +, m_internal_api(this) { } diff --git a/arcane/src/arcane/materials/MeshMaterial.cc b/arcane/src/arcane/materials/MeshMaterial.cc index b6f15b104..880bd80db 100644 --- a/arcane/src/arcane/materials/MeshMaterial.cc +++ b/arcane/src/arcane/materials/MeshMaterial.cc @@ -46,6 +46,7 @@ MeshMaterial(MeshMaterialInfo* infos, MeshEnvironment* env, , m_user_material(nullptr) , m_data(this, name, mat_id, true) , m_non_const_this(this) +, m_internal_api(this) { if (!env) throw ArgumentException(A_FUNCINFO, diff --git a/arcane/src/arcane/materials/internal/MeshEnvironment.h b/arcane/src/arcane/materials/internal/MeshEnvironment.h index e6f0e29ca..95794d55e 100644 --- a/arcane/src/arcane/materials/internal/MeshEnvironment.h +++ b/arcane/src/arcane/materials/internal/MeshEnvironment.h @@ -16,12 +16,13 @@ #include "arcane/utils/TraceAccessor.h" -#include "arcane/ItemGroup.h" -#include "arcane/MeshVariableScalarRef.h" -#include "arcane/VariableTypedef.h" +#include "arcane/core/ItemGroup.h" +#include "arcane/core/MeshVariableScalarRef.h" +#include "arcane/core/VariableTypedef.h" +#include "arcane/core/materials/IMeshEnvironment.h" +#include "arcane/core/materials/ComponentItemInternal.h" +#include "arcane/core/materials/internal/IMeshComponentInternal.h" -#include "arcane/materials/IMeshEnvironment.h" -#include "arcane/materials/MatItemInternal.h" #include "arcane/materials/internal/MeshComponentData.h" /*---------------------------------------------------------------------------*/ @@ -50,6 +51,20 @@ class MeshEnvironment : public TraceAccessor , public IMeshEnvironment { + class InternalApi + : public IMeshComponentInternal + { + public: + InternalApi(MeshEnvironment* env) : m_environment(env){} + public: + ConstArrayView itemsInternalView() const override + { + return m_environment->itemsInternalView(); + } + private: + MeshEnvironment* m_environment; + }; + public: MeshEnvironment(IMeshMaterialMng* mm,const String& name,Int32 env_id); @@ -110,6 +125,10 @@ class MeshEnvironment EnvImpurePartItemVectorView impureEnvItems() const override; EnvPartItemVectorView partEnvItems(eMatPart part) const override; + public: + + IMeshComponentInternal* _internalApi() override { return &m_internal_api; } + public: ArrayView itemsInternalView() @@ -168,6 +187,7 @@ class MeshEnvironment IItemGroupObserver* m_group_observer = nullptr; MeshComponentData m_data; MeshEnvironment* m_non_const_this = nullptr; + InternalApi m_internal_api; private: diff --git a/arcane/src/arcane/materials/internal/MeshMaterial.h b/arcane/src/arcane/materials/internal/MeshMaterial.h index 3c8cf8726..2714575f7 100644 --- a/arcane/src/arcane/materials/internal/MeshMaterial.h +++ b/arcane/src/arcane/materials/internal/MeshMaterial.h @@ -16,11 +16,13 @@ #include "arcane/utils/TraceAccessor.h" -#include "arcane/ItemGroup.h" +#include "arcane/core/ItemGroup.h" +#include "arcane/core/materials/IMeshMaterial.h" +#include "arcane/core/materials/MatItem.h" +#include "arcane/core/materials/internal/IMeshComponentInternal.h" -#include "arcane/materials/IMeshMaterial.h" #include "arcane/materials/MeshMaterialVariableIndexer.h" -#include "arcane/materials/MatItem.h" + #include "arcane/materials/internal/MeshComponentData.h" /*---------------------------------------------------------------------------*/ @@ -50,6 +52,20 @@ class MeshMaterial : public TraceAccessor , public IMeshMaterial { + class InternalApi + : public IMeshComponentInternal + { + public: + InternalApi(MeshMaterial* mat) : m_material(mat){} + public: + ConstArrayView itemsInternalView() const override + { + return m_material->itemsInternalView(); + } + private: + MeshMaterial* m_material; + }; + public: MeshMaterial(MeshMaterialInfo* infos,MeshEnvironment* env, @@ -102,6 +118,10 @@ class MeshMaterial MatImpurePartItemVectorView impureMatItems() const override; MatPartItemVectorView partMatItems(eMatPart part) const override; + public: + + IMeshComponentInternal* _internalApi() override { return &m_internal_api; } + public: ArrayView itemsInternalView() @@ -127,6 +147,7 @@ class MeshMaterial IUserMeshMaterial* m_user_material; MeshComponentData m_data; MeshMaterial* m_non_const_this; + InternalApi m_internal_api; }; /*---------------------------------------------------------------------------*/ From b08aacd82db311468dda0c5b0a62f9c3dac100c1 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Mon, 10 Jul 2023 14:58:11 +0200 Subject: [PATCH 4/5] =?UTF-8?q?[arcane,materials]=20Utilise=20'IMeshCompon?= =?UTF-8?q?entInternal'=20pour=20r=C3=A9cup=C3=A9rer=20'itemsInternalView(?= =?UTF-8?q?)'.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arcane/core/materials/ComponentItemVector.cc | 4 ++-- .../core/materials/ComponentItemVectorView.cc | 2 +- .../arcane/core/materials/ComponentItemVectorView.h | 5 +++++ .../src/arcane/core/materials/MatItemEnumerator.cc | 13 +++++++------ .../arcane/core/materials/MaterialsCoreGlobal.cc | 7 +++++-- .../arcane/materials/MeshMaterialVariableArray.cc | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/arcane/src/arcane/core/materials/ComponentItemVector.cc b/arcane/src/arcane/core/materials/ComponentItemVector.cc index fb0421561..73b2cf895 100644 --- a/arcane/src/arcane/core/materials/ComponentItemVector.cc +++ b/arcane/src/arcane/core/materials/ComponentItemVector.cc @@ -106,8 +106,8 @@ ComponentItemVector(IMeshComponent* component) ComponentItemVector:: ComponentItemVector(ComponentItemVectorView rhs) -: m_p(new Impl(rhs.component(),rhs.itemsInternalView(), - rhs.matvarIndexes(),rhs._internalLocalIds())) +: m_p(new Impl(rhs.component(),rhs._itemsInternalView(), + rhs._matvarIndexes(),rhs._internalLocalIds())) { } diff --git a/arcane/src/arcane/core/materials/ComponentItemVectorView.cc b/arcane/src/arcane/core/materials/ComponentItemVectorView.cc index 515463468..2bb0aa1dc 100644 --- a/arcane/src/arcane/core/materials/ComponentItemVectorView.cc +++ b/arcane/src/arcane/core/materials/ComponentItemVectorView.cc @@ -65,7 +65,7 @@ _subView(Integer begin,Integer size) } ConstArrayView mn = m_items_internal_main_view.subView(begin,size); - ConstArrayView mvs = matvarIndexes().subView(begin,size); + ConstArrayView mvs = _matvarIndexes().subView(begin,size); ConstArrayView ids = _internalLocalIds().subView(begin,size); return ComponentItemVectorView(m_component,mvs,mn,ids); diff --git a/arcane/src/arcane/core/materials/ComponentItemVectorView.h b/arcane/src/arcane/core/materials/ComponentItemVectorView.h index 72f8f282c..cfd9ca784 100644 --- a/arcane/src/arcane/core/materials/ComponentItemVectorView.h +++ b/arcane/src/arcane/core/materials/ComponentItemVectorView.h @@ -50,11 +50,16 @@ class ARCANE_CORE_EXPORT ComponentItemVectorView friend class ComponentItemVector; friend class MatItemVectorView; friend class EnvItemVectorView; + friend class MatCellEnumerator; + friend class EnvCellEnumerator; + friend class ComponentCellEnumerator; friend Arcane::Accelerator::impl::MatCommandContainerBase; friend ArcaneTest::MeshMaterialTesterModule; friend ArcaneTest::MaterialHeatTestModule; template friend class LambdaMatItemRangeFunctorT; + template friend class + MaterialVariableArrayTraits; protected: diff --git a/arcane/src/arcane/core/materials/MatItemEnumerator.cc b/arcane/src/arcane/core/materials/MatItemEnumerator.cc index 03830bad3..2d0fa741b 100644 --- a/arcane/src/arcane/core/materials/MatItemEnumerator.cc +++ b/arcane/src/arcane/core/materials/MatItemEnumerator.cc @@ -18,6 +18,7 @@ #include "arcane/core/materials/IMeshBlock.h" #include "arcane/core/materials/MatItemVector.h" #include "arcane/core/materials/EnvItemVector.h" +#include "arcane/core/materials/internal/IMeshComponentInternal.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ @@ -34,7 +35,7 @@ namespace Arcane::Materials MatCellEnumerator MatCellEnumerator:: create(IMeshMaterial* mat) { - return MatCellEnumerator(mat->itemsInternalView(), + return MatCellEnumerator(mat->_internalApi()->itemsInternalView(), mat->variableIndexer()->matvarIndexes(),mat); } @@ -53,7 +54,7 @@ create(const MatCellVector& miv) MatCellEnumerator MatCellEnumerator:: create(MatCellVectorView v) { - return MatCellEnumerator(v.itemsInternalView(),v.matvarIndexes(),v.component()); + return MatCellEnumerator(v._itemsInternalView(),v._matvarIndexes(),v.component()); } /*---------------------------------------------------------------------------*/ @@ -65,7 +66,7 @@ create(MatCellVectorView v) EnvCellEnumerator EnvCellEnumerator:: create(IMeshEnvironment* env) { - return EnvCellEnumerator(env->itemsInternalView(), + return EnvCellEnumerator(env->_internalApi()->itemsInternalView(), env->variableIndexer()->matvarIndexes(),env); } @@ -84,7 +85,7 @@ create(const EnvCellVector& miv) EnvCellEnumerator EnvCellEnumerator:: create(EnvCellVectorView v) { - return EnvCellEnumerator(v.itemsInternalView(),v.matvarIndexes(),v.component()); + return EnvCellEnumerator(v._itemsInternalView(),v._matvarIndexes(),v.component()); } /*---------------------------------------------------------------------------*/ @@ -173,7 +174,7 @@ create(IMeshComponent* component) { MeshMaterialVariableIndexer* vi = component->variableIndexer(); - return ComponentCellEnumerator(component->itemsInternalView(), + return ComponentCellEnumerator(component->_internalApi()->itemsInternalView(), vi->matvarIndexes(),component); } @@ -192,7 +193,7 @@ create(const ComponentItemVector& v) ComponentCellEnumerator ComponentCellEnumerator:: create(ComponentItemVectorView v) { - return ComponentCellEnumerator(v.itemsInternalView(),v.matvarIndexes(), + return ComponentCellEnumerator(v._itemsInternalView(),v._matvarIndexes(), v.component()); } diff --git a/arcane/src/arcane/core/materials/MaterialsCoreGlobal.cc b/arcane/src/arcane/core/materials/MaterialsCoreGlobal.cc index 134c56493..4eb263d57 100644 --- a/arcane/src/arcane/core/materials/MaterialsCoreGlobal.cc +++ b/arcane/src/arcane/core/materials/MaterialsCoreGlobal.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MaterialsCoreGlobal.cc (C) 2000-2022 */ +/* MaterialsCoreGlobal.cc (C) 2000-2023 */ /* */ /* Déclarations générales des matériaux de Arcane. */ /*---------------------------------------------------------------------------*/ @@ -22,6 +22,9 @@ #include "arcane/core/materials/IMeshMaterialVariableFactoryMng.h" #include "arcane/core/materials/IMeshMaterialVariableFactory.h" +// Pas utilisé directement mais nécessaire pour la définition des symboles. +#include "arcane/core/materials/internal/IMeshComponentInternal.h" + /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/materials/MeshMaterialVariableArray.cc b/arcane/src/arcane/materials/MeshMaterialVariableArray.cc index db19edbb0..95f1cca95 100644 --- a/arcane/src/arcane/materials/MeshMaterialVariableArray.cc +++ b/arcane/src/arcane/materials/MeshMaterialVariableArray.cc @@ -99,7 +99,7 @@ saveData(IMeshComponent* component,IData* data, Integer current_dim1_size = values.dim1Size(); Integer added_dim1_size = component_view.nbItem(); values.resizeNoInit(current_dim1_size+added_dim1_size,dim2_size); - ConstArrayView mvi_indexes = component_view.matvarIndexes(); + ConstArrayView mvi_indexes = component_view._matvarIndexes(); for( Integer i=0, n=mvi_indexes.size(); i Date: Mon, 10 Jul 2023 15:33:47 +0200 Subject: [PATCH 5/5] [arcane,materials] Corrige copyright. --- arcane/src/arcane/core/materials/ComponentItem.h | 4 ++-- arcane/src/arcane/core/materials/ComponentItemVectorView.cc | 4 ++-- arcane/src/arcane/core/materials/MatItem.h | 4 ++-- arcane/src/arcane/core/materials/MatItemEnumerator.cc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arcane/src/arcane/core/materials/ComponentItem.h b/arcane/src/arcane/core/materials/ComponentItem.h index dc8767f17..1c04d9ec2 100644 --- a/arcane/src/arcane/core/materials/ComponentItem.h +++ b/arcane/src/arcane/core/materials/ComponentItem.h @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* ComponentItem.h (C) 2000-2022 */ +/* ComponentItem.h (C) 2000-2023 */ /* */ /* Entité composant d'une maillage multi-matériau. */ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/core/materials/ComponentItemVectorView.cc b/arcane/src/arcane/core/materials/ComponentItemVectorView.cc index 2bb0aa1dc..f0e383ae7 100644 --- a/arcane/src/arcane/core/materials/ComponentItemVectorView.cc +++ b/arcane/src/arcane/core/materials/ComponentItemVectorView.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* ComponentItemVectorView.cc (C) 2000-2022 */ +/* ComponentItemVectorView.cc (C) 2000-2023 */ /* */ /* Vue sur un vecteur sur des entités composants. */ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/core/materials/MatItem.h b/arcane/src/arcane/core/materials/MatItem.h index 686fb039c..74b37047f 100644 --- a/arcane/src/arcane/core/materials/MatItem.h +++ b/arcane/src/arcane/core/materials/MatItem.h @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MatItem.h (C) 2000-2022 */ +/* MatItem.h (C) 2000-2023 */ /* */ /* Entités matériau et milieux. */ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/core/materials/MatItemEnumerator.cc b/arcane/src/arcane/core/materials/MatItemEnumerator.cc index 2d0fa741b..4159c96ab 100644 --- a/arcane/src/arcane/core/materials/MatItemEnumerator.cc +++ b/arcane/src/arcane/core/materials/MatItemEnumerator.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MatItemEnumerator.cc (C) 2000-2022 */ +/* MatItemEnumerator.cc (C) 2000-2023 */ /* */ /* Enumérateurs sur les mailles materiaux. */ /*---------------------------------------------------------------------------*/