diff --git a/arcane/src/arcane/core/Dom.h b/arcane/src/arcane/core/Dom.h index f9bced1d4f..e48287d9c0 100644 --- a/arcane/src/arcane/core/Dom.h +++ b/arcane/src/arcane/core/Dom.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-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* Dom.h (C) 2000-2018 */ +/* Dom.h (C) 2000-2024 */ /* */ /* Implémentation d'un DOM1+DOM2+DOM3(core). */ /*---------------------------------------------------------------------------*/ @@ -20,13 +20,14 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -ARCANE_BEGIN_NAMESPACE +namespace Arcane +{ class IStringImpl; class IXmlDocumentHolder; -ARCANE_END_NAMESPACE +} -ARCANE_BEGIN_NAMESPACE -ARCANE_BEGIN_NAMESPACE_DOM +namespace Arcane::dom +{ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ @@ -642,10 +643,8 @@ class ARCANE_CORE_EXPORT Attr friend class IDOM_Node; friend class Element; public: - Attr(); + Attr() = default; Attr(const Node&); - Attr(const Attr&); - ~Attr(); Attr(AttrPrv*); private: AttrPrv* _impl() const; @@ -1244,8 +1243,7 @@ class XPathNamespace /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -ARCANE_END_NAMESPACE_DOM -ARCANE_END_NAMESPACE +} /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/core/DomLibXml2V2.cc b/arcane/src/arcane/core/DomLibXml2V2.cc index 14616a8dc9..504b435868 100644 --- a/arcane/src/arcane/core/DomLibXml2V2.cc +++ b/arcane/src/arcane/core/DomLibXml2V2.cc @@ -1555,21 +1555,12 @@ replaceData(ULong offset,ULong count,const DOMString& arg) const /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -Attr:: -Attr() -: Node() -{ -} Attr:: Attr(AttrPrv* p) : Node(cvt((xmlNodePtr)impl(p))) { } -Attr:: -Attr(const Attr& f) -: Node((const Node&)f) -{ -} + Attr:: Attr(const Node& node) : Node() @@ -1580,10 +1571,7 @@ Attr(const Node& node) //if (ni && impl(ni)->getNodeType()==ATTRIBUTE_NODE) //_assign(node); } -Attr:: -~Attr() -{ -} + AttrPrv* Attr:: _impl() const { diff --git a/arcane/src/arcane/core/MeshUtils.cc b/arcane/src/arcane/core/MeshUtils.cc index c43ab60863..890fd4e873 100644 --- a/arcane/src/arcane/core/MeshUtils.cc +++ b/arcane/src/arcane/core/MeshUtils.cc @@ -938,7 +938,7 @@ writeMeshConnectivity(IMesh* mesh, const String& file_name) { ofile << ""; for (Integer j = 0; j < cell.nbHChildren(); ++j) { - ofile << ' ' << cell.hChild(j)->uniqueId(); + ofile << ' ' << cell.hChild(j).uniqueId(); } ofile << ""; } diff --git a/arcane/src/arcane/hdf5/Hdf5Utils.h b/arcane/src/arcane/hdf5/Hdf5Utils.h index 818f4af962..e0d11c39a4 100644 --- a/arcane/src/arcane/hdf5/Hdf5Utils.h +++ b/arcane/src/arcane/hdf5/Hdf5Utils.h @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* Hdf5Utils.h (C) 2000-2023 */ +/* Hdf5Utils.h (C) 2000-2024 */ /* */ /* Fonctions utilitaires pour hdf5. */ /*---------------------------------------------------------------------------*/ @@ -577,8 +577,7 @@ class ARCANE_HDF5_EXPORT StandardTypes ~StandardTypes(); - ARCANE_DEPRECATED_REASON("Y2023: Copy operator is deprecated. This class has unique ownership") - StandardTypes& operator=(const StandardTypes& rhs) = default; + StandardTypes& operator=(const StandardTypes& rhs) = delete; public: diff --git a/arcane/src/arcane/impl/VariableSynchronizer.cc b/arcane/src/arcane/impl/VariableSynchronizer.cc index 46a278ecea..2ef7fb1f3a 100644 --- a/arcane/src/arcane/impl/VariableSynchronizer.cc +++ b/arcane/src/arcane/impl/VariableSynchronizer.cc @@ -93,8 +93,7 @@ class VariableSynchronizer::SyncMessage SyncMessage(const DataSynchronizeDispatcherBuildInfo& bi, VariableSynchronizer* var_syncer, IMemoryAllocator* allocator) - : m_variable_synchronizer(var_syncer) - , m_variable_synchronizer_mng(var_syncer->synchronizeMng()) + : m_variable_synchronizer_mng(var_syncer->synchronizeMng()) , m_dispatcher(IDataSynchronizeDispatcher::create(bi)) , m_multi_dispatcher(IDataSynchronizeMultiDispatcher::create(bi)) , m_event_args(var_syncer) @@ -167,7 +166,6 @@ class VariableSynchronizer::SyncMessage private: - IVariableSynchronizer* m_variable_synchronizer = nullptr; IVariableSynchronizerMng* m_variable_synchronizer_mng = nullptr; Ref m_dispatcher; IDataSynchronizeMultiDispatcher* m_multi_dispatcher = nullptr; diff --git a/arcane/src/arcane/std/MeshPartitionerBase.h b/arcane/src/arcane/std/MeshPartitionerBase.h index dd1ebe284e..f878df5b2a 100644 --- a/arcane/src/arcane/std/MeshPartitionerBase.h +++ b/arcane/src/arcane/std/MeshPartitionerBase.h @@ -9,20 +9,20 @@ /* */ /* Classe de base d'un partitionneur de maillage. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCANE_MESHPARTITIONERBASE_H -#define ARCANE_MESHPARTITIONERBASE_H +#ifndef ARCANE_STD_MESHPARTITIONERBASE_H +#define ARCANE_STD_MESHPARTITIONERBASE_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include +#include "arcane/utils/Array.h" +#include "arcane/utils/HashTableMap.h" +#include "arcane/utils/ScopedPtr.h" #include "arcane/core/IMeshPartitioner.h" #include "arcane/core/AbstractService.h" #include "arcane/core/ILoadBalanceMng.h" -#include "arcane/utils/Array.h" -#include "arcane/utils/HashTableMap.h" -#include "arcane/utils/ScopedPtr.h" +#include /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ @@ -30,12 +30,6 @@ namespace Arcane { -/*---------------------------------------------------------------------------*/ -/*---------------------------------------------------------------------------*/ - -class ISubDomain; - - /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ /*! @@ -54,33 +48,33 @@ class ARCANE_STD_EXPORT MeshPartitionerBase public: ISubDomain* subDomain() const { return m_sub_domain; } - IMesh* mesh() const { return m_mesh; } + IMesh* mesh() const override { return m_mesh; } // DEPRECATED void setMaximumComputationTime(Real v) override { m_maximum_computation_time = v; } - virtual Real maximumComputationTime() const { return m_maximum_computation_time; } + Real maximumComputationTime() const override { return m_maximum_computation_time; } - virtual void setImbalance(Real v){ m_imbalance = v; } - virtual Real imbalance() const { return m_imbalance; } + void setImbalance(Real v) override { m_imbalance = v; } + Real imbalance() const override { return m_imbalance; } - virtual void setMaxImbalance(Real v){ m_max_imbalance = v; } - virtual Real maxImbalance() const { return m_max_imbalance; } + void setMaxImbalance(Real v) override { m_max_imbalance = v; } + Real maxImbalance() const override { return m_max_imbalance; } - virtual void setComputationTimes(RealConstArrayView v) { m_computation_times.copy(v); } - virtual RealConstArrayView computationTimes() const { return m_computation_times; } + void setComputationTimes(RealConstArrayView v) override { m_computation_times.copy(v); } + RealConstArrayView computationTimes() const override { return m_computation_times; } - virtual void setCellsWeight(ArrayView weights,Integer nb_weight); - virtual ArrayView cellsWeight() const; + void setCellsWeight(ArrayView weights,Integer nb_weight) override; + ArrayView cellsWeight() const override; // CORRECT - virtual Integer nbCellWeight() const; - virtual void setILoadBalanceMng(ILoadBalanceMng* mng) { m_lbMng = mng; } - virtual ILoadBalanceMng* loadBalanceMng() const { return m_lbMng; } + Integer nbCellWeight() const; + void setILoadBalanceMng(ILoadBalanceMng* mng) override { m_lbMng = mng; } + ILoadBalanceMng* loadBalanceMng() const override { return m_lbMng; } public: - virtual void notifyEndPartition() { loadBalanceMng()->notifyEndPartition(); } + void notifyEndPartition() override { loadBalanceMng()->notifyEndPartition(); } public: @@ -152,11 +146,10 @@ class ARCANE_STD_EXPORT MeshPartitionerBase virtual void* getCommunicator() const; virtual Parallel::Communicator communicator() const; - - virtual bool cellComm() {return true; } -protected: + protected: + virtual void _initArrayCellsWithConstraints(); virtual void _initFilterLidCells(); virtual void _initUidRef(); @@ -166,6 +159,7 @@ class ARCANE_STD_EXPORT MeshPartitionerBase virtual void _clearCellWgt(); private: + Real _addNgb(const Cell& cell, const Face& face, Int64Array& neighbourcells, Array& contrib, HashTableMapT& map, Array *ptrcommWeights, Int32 offset, HashTableMapT& lids, bool special=false); diff --git a/arcane/src/arcane/utils/HashTableMap2.h b/arcane/src/arcane/utils/HashTableMap2.h index 6475412849..60aa150c64 100644 --- a/arcane/src/arcane/utils/HashTableMap2.h +++ b/arcane/src/arcane/utils/HashTableMap2.h @@ -165,8 +165,8 @@ template