Merge pull request #794 from arcaneframework/dev/gg-cleanup-materials4

Create internal API for 'IMeshComponent' and remove some internal deprecated methods

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.                           */
 /*---------------------------------------------------------------------------*/
@@ -89,7 +89,7 @@ class ARCANE_CORE_EXPORT ComponentCell
   //! Maille arcane
   Cell globalCell() const
   {
-    return Cell(m_internal->globalItem());
+    return Cell(m_internal->globalItemBase());
   }
 
   /*!

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)

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()))
 {
 }
 

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.                            */
 /*---------------------------------------------------------------------------*/
@@ -65,7 +65,7 @@ _subView(Integer begin,Integer size)
   }
 
   ConstArrayView<ComponentItemInternal*> mn = m_items_internal_main_view.subView(begin,size);
-  ConstArrayView<MatVarIndex> mvs = matvarIndexes().subView(begin,size);
+  ConstArrayView<MatVarIndex> mvs = _matvarIndexes().subView(begin,size);
   ConstArrayView<Int32> ids = _internalLocalIds().subView(begin,size);
 
   return ComponentItemVectorView(m_component,mvs,mn,ids);

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<typename ViewType,typename LambdaType>
   friend class LambdaMatItemRangeFunctorT;
+  template<typename DataType> friend class
+  MaterialVariableArrayTraits;
 
  protected:
 

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<ComponentItemInternal*> itemsInternalView() const =0;
+
+ public:
+
+  //! API interne
+  virtual IMeshComponentInternal* _internalApi() =0;
 };
 
 /*---------------------------------------------------------------------------*/

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.                                              */
 /*---------------------------------------------------------------------------*/
@@ -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

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.                                   */
 /*---------------------------------------------------------------------------*/
@@ -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());
 }
 

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<m_size; }
 
@@ -391,9 +388,6 @@ template <typename ComponentCellType> class CellComponentCellEnumeratorT
 {
  public:
 
-  explicit CellComponentCellEnumeratorT(ComponentItemInternal* super_item)
-  : CellComponentCellEnumerator(super_item){}
-
   explicit CellComponentCellEnumeratorT(ComponentCell super_item)
   : CellComponentCellEnumerator(super_item){}
 

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"
+
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 

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<ComponentItemInternal*> itemsInternalView() const = 0;
+};
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
+} // namespace Arcane::Materials
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
+#endif

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

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)
 {
 }
 

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,

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());

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<MatVarIndex> mvi_indexes = component_view.matvarIndexes();
+  ConstArrayView<MatVarIndex> mvi_indexes = component_view._matvarIndexes();
 
   for( Integer i=0, n=mvi_indexes.size(); i<n; ++i ){
     MatVarIndex mvi = mvi_indexes[i];