Merge pull request #1813 from arcaneframework/dev/gg-minor-improvement-in-materials

Minor improvement in materials

Author: grospelliergilles

arcane/src/arcane/materials/MeshMaterialModifierImpl.cc

@@ -121,7 +121,7 @@ initOptimizationFlags()
     m_allow_optimize_multiple_operation = true;
   }
 
-  info() << "MeshMaterialModifier::optimization: "
+  info() << "MeshMaterialModifier::optimization:"
          << " allow?=" << m_allow_optimization
          << " allow_multiple?=" << m_allow_optimize_multiple_operation
          << " allow_multiple_mat?=" << m_allow_optimize_multiple_material
@@ -428,7 +428,8 @@ beginUpdate()
 void MeshMaterialModifierImpl::
 dumpStats()
 {
-  info() << "MeshMaterialModifierImpl statistics:";
+  info() << "MeshMaterialModifierImpl statistics mesh=" << m_material_mng->mesh()->name();
+
   info() << " Nb update : " << nb_update;
   info() << " Nb save/restore : " << nb_save_restore;
   info() << " Nb optimized add : " << nb_optimize_add;

arcane/src/arcane/tests/accelerator/MeshMaterialAcceleratorUnitTest.cc

@@ -578,8 +578,9 @@ _executeTest2(Integer nb_z)
           {
             auto [mvi, cid] = evi();
             Real value_to_add = inout_env_a[mvi] * in_d[cid];
+            EnvCell ev0(envcellsv.envCell(evi.index()));
             out_c[mvi] += value_to_add;
-            out_env_c[mvi] += inout_env_a[mvi] * in_d[cid];
+            out_env_c[ev0] += inout_env_a[mvi] * in_d[cid];
             reducer2.combine(value_to_add);
           };
           Real reduced_value = reducer2.reducedValue();
@@ -957,12 +958,23 @@ _executeTest7()
     Int32 nb_sub_item = sub_env_view.nbItem();
     info() << "NB_SUB_ITEM (env)=" << nb_sub_item;
     // TODO: Vérifier la validité
+
+    ENUMERATE_ENVCELL (ienvcell, sub_env_view) {
+      EnvCell ec = *ienvcell;
+      if ((ec.globalCellId() % 2) != 0)
+        ARCANE_FATAL("Bad env cell lid={0}", ec.globalCellId());
+    }
   }
   {
     MatCellVector mat_vector(cell_vector1.view(), m_env1->materials()[1]);
     MatCellVectorView sub_mat_view(mat_vector.view());
     Int32 nb_sub_item = sub_mat_view.nbItem();
     info() << "NB_SUB_ITEM (mat)=" << nb_sub_item;
+    ENUMERATE_MATCELL (imatcell, sub_mat_view) {
+      MatCell mc = *imatcell;
+      if ((mc.globalCellId() % 2) != 0)
+        ARCANE_FATAL("Bad mat cell lid={0}", mc.globalCellId());
+    }
   }
 }