Merge pull request #1211 from arcaneframework/dev/gg-use-filter-for-switch-between-pure-and-partial

Use accelerator Filter to compute cells which switch between pure and partial

Author: grospelliergilles

arcane/ceapart/tests/CMakeLists.txt

@@ -103,10 +103,10 @@ if (ARCANE_HAS_ACCELERATOR_API)
   ARCANE_ADD_TEST(material3 testMaterial-3.arc "-m 20")
   # NOTE Ajoute test optmisation uniquement en sequentiel car pour l'instant cela
   # ne marche pas en parallele a cause de la suppression de mailles.
-  ARCANE_ADD_TEST_SEQUENTIAL(material3_opt1 testMaterial-3-opt1.arc "-m 20")
-  ARCANE_ADD_TEST_SEQUENTIAL(material3_opt3 testMaterial-3-opt3.arc "-m 20")
-  ARCANE_ADD_TEST_SEQUENTIAL(material3_opt5 testMaterial-3-opt5.arc "-m 20")
-  ARCANE_ADD_TEST_SEQUENTIAL(material3_opt7 testMaterial-3-opt7.arc "-m 20")
+  ARCANE_ADD_TEST_SEQUENTIAL(material3_opt1 testMaterial-3-opt1.arc "-m 20" "-We,ARCANE_MATERIAL_TRANSFORM_NO_FILTER,1")
+  ARCANE_ADD_TEST_SEQUENTIAL(material3_opt3 testMaterial-3-opt3.arc "-m 20" "-We,ARCANE_MATERIAL_TRANSFORM_NO_FILTER,1")
+  ARCANE_ADD_TEST_SEQUENTIAL(material3_opt5 testMaterial-3-opt5.arc "-m 20" "-We,ARCANE_MATERIAL_TRANSFORM_NO_FILTER,1")
+  ARCANE_ADD_TEST_SEQUENTIAL(material3_opt7 testMaterial-3-opt7.arc "-m 20" "-We,ARCANE_MATERIAL_TRANSFORM_NO_FILTER,1")
   if(NOT ARCANE_DISABLE_PERFCOUNTER_TESTS)
     arcane_add_test_sequential(material3_opt7_trace testMaterial-3-opt7.arc "-m 20" "-We,ARCANE_TRACE_ENUMERATOR,1")
   endif()

arcane/src/arcane/materials/CMakeLists.txt

@@ -12,6 +12,7 @@ arcane_accelerator_add_source_files(
   AllEnvData.cc
   MeshMaterialVariableScalar
   MeshMaterialVariableArray
+  MeshMaterialVariableIndexer
 )
 
 target_compile_definitions(arcane_materials PRIVATE ARCANE_COMPONENT_arcane_materials)

arcane/src/arcane/materials/ConstituentModifierWorkInfo.cc

@@ -30,6 +30,7 @@ ConstituentModifierWorkInfo::
 ConstituentModifierWorkInfo()
 : pure_local_ids(platform::getDefaultDataAllocator())
 , partial_indexes(platform::getDefaultDataAllocator())
+, m_cells_to_transform(platform::getDefaultDataAllocator())
 {
 }
 

arcane/src/arcane/materials/IncrementalComponentModifier.cc

@@ -215,7 +215,7 @@ _switchCellsForMaterials(const MeshMaterial* modified_mat,
       info(4) << "TransformCells (V3) is_add?=" << is_add << " indexer=" << indexer->name();
 
       _computeCellsToTransformForMaterial(mat, ids);
-      indexer->transformCellsV2(m_work_info);
+      indexer->transformCellsV2(m_work_info,m_copy_queue);
       m_work_info.resetTransformedCells(ids);
 
       info(4) << "NB_MAT_TRANSFORM=" << m_work_info.pure_local_ids.size() << " name=" << mat->name();
@@ -266,7 +266,7 @@ _switchCellsForEnvironments(const IMeshEnvironment* modified_env,
     info(4) << "TransformCells (V2) is_add?=" << is_add << " indexer=" << indexer->name();
 
     _computeCellsToTransformForEnvironments(ids);
-    indexer->transformCellsV2(m_work_info);
+    indexer->transformCellsV2(m_work_info, m_copy_queue);
     m_work_info.resetTransformedCells(ids);
 
     info(4) << "NB_ENV_TRANSFORM=" << m_work_info.pure_local_ids.size()