Skip to content

Commit d98c881

Browse files
Merge pull request #1174 from arcaneframework/dev/gg-use-by-default-version2-for-itemgroup-applyoperation
Use by default version2 of item type computation for 'ItemGroup::applyOperation()'
2 parents 67ad26b + c28abbc commit d98c881

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

arcane/src/arcane/core/ItemGroupImpl.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -1606,8 +1606,9 @@ _computeChildrenByTypeV2()
16061606
trace->info() << "ItemGroupImpl::_computeChildrenByTypeV2 for " << name()
16071607
<< " type=" << type_mng->typeName(i) << " nb=" << n;
16081608
}
1609-
trace->info() << "ItemGroupImpl::_computeChildrenByTypeV2 for " << name()
1610-
<< " nb_item=" << nb_item << " nb_different_type=" << nb_different_type;
1609+
if (is_verbose)
1610+
trace->info() << "ItemGroupImpl::_computeChildrenByTypeV2 for " << name()
1611+
<< " nb_item=" << nb_item << " nb_different_type=" << nb_different_type;
16111612

16121613
// Si nb_different_type == 1, cela signifie qu'il n'y a qu'un seul
16131614
// type d'entité et on conserve juste ce type car dans ce cas on passera

arcane/src/arcane/core/internal/ItemGroupInternal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class ItemGroupInternal
184184

185185
//! Gestion pour applyOperation() Version 2
186186
//@{
187-
bool m_use_v2_for_apply_operation = false;
187+
bool m_use_v2_for_apply_operation = true;
188188

189189
public:
190190

arcane/src/arcane/tests/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,8 @@ arcane_add_test_sequential(simple_csv_output_service testSimpleCsvOutputService.
727727
arcane_add_test_sequential(simple_csv_comparator_service testSimpleCsvComparatorService.arc)
728728

729729
arcane_add_test(geometry testGeom.arc)
730-
arcane_add_test(geometry_applyoperation_v2 testGeom.arc -We,ARCANE_APPLYOPERATION_VERSION,2 -We,ARCANE_DEBUG_APPLYOPERATION,1)
730+
arcane_add_test(geometry_applyoperation_v2 testGeom.arc -We,ARCANE_DEBUG_APPLYOPERATION,1)
731+
arcane_add_test(geometry_applyoperation_v1 testGeom.arc -We,ARCANE_APPLYOPERATION_VERSION,1 -We,ARCANE_DEBUG_APPLYOPERATION,1)
731732

732733
if(ARCANE_HAS_SOLVERS)
733734
ARCANE_ADD_TEST_PARALLEL(solver testSolver.arc 1)

0 commit comments

Comments
 (0)