Skip to content

Commit 87d1a86

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1976 from arcaneframework/dev/gg-remove-type-declaration-in-alien
Include Arccore header file instead of manually defining Arccore types
2 parents c48c5e1 + e7d7064 commit 87d1a86

File tree

25 files changed

+116
-420
lines changed

25 files changed

+116
-420
lines changed

‎alien/ArcaneInterface/modules/arcane_tools/src/alien/arcane_tools/IIndexManager.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
2+
//-----------------------------------------------------------------------------
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
4+
// See the top-level COPYRIGHT file for details.
5+
// SPDX-License-Identifier: Apache-2.0
6+
//-----------------------------------------------------------------------------
17
#ifndef ALIEN_IINDEX_MANAGER_H
28
#define ALIEN_IINDEX_MANAGER_H
39

@@ -16,9 +22,6 @@
1622
#include <arcane/utils/Math.h>
1723

1824
#include <alien/AlienArcaneToolsPrecomp.h>
19-
namespace Arccore {
20-
class ITraceMng;
21-
}
2225

2326
namespace Arcane {
2427
class IParallelMng;

‎alien/ArcaneInterface/modules/external_packages/src/alien/kernels/hypre/HypreBackEnd.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* MTLBackEnd (C) 2000-2024 */
8+
/* MTLBackEnd (C) 2000-2025 */
99
/* */
1010
/* Tools for Hypre backend */
1111
/*---------------------------------------------------------------------------*/
1212
/*---------------------------------------------------------------------------*/
1313
#ifndef ALIEN_KERNELS_HYPRE_HYPREBACKEND_H
1414
#define ALIEN_KERNELS_HYPRE_HYPREBACKEND_H
1515

16+
#include <arccore/message_passing/MessagePassingGlobal.h>
1617
#include <alien/core/backend/BackEnd.h>
1718
#include <alien/AlienExternalPackagesPrecomp.h>
1819

1920
/*---------------------------------------------------------------------------*/
2021
/*---------------------------------------------------------------------------*/
2122

22-
namespace Arccore::MessagePassing {
23-
class IMessagePassingMng;
24-
}
25-
26-
/*---------------------------------------------------------------------------*/
27-
/*---------------------------------------------------------------------------*/
28-
2923
class IOptionsHypreSolver;
3024

3125
namespace Alien {

‎alien/ArcaneInterface/modules/external_packages/src/alien/kernels/mtl/MTLBackEnd.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* MTLBackEnd (C) 2000-2024 */
8+
/* MTLBackEnd (C) 2000-2025 */
99
/* */
1010
/* Tools for MTL backend */
1111
/*---------------------------------------------------------------------------*/
1212
/*---------------------------------------------------------------------------*/
1313
#ifndef ALIEN_MTLIMPL_MTLBACKEND_H
1414
#define ALIEN_MTLIMPL_MTLBACKEND_H
1515

16-
16+
#include <arccore/message_passing/MessagePassingGlobal.h>
1717
#include <alien/core/backend/BackEnd.h>
1818
#include <alien/utils/Precomp.h>
1919
#include <alien/AlienExternalPackagesExport.h>
2020

21-
namespace Arccore::MessagePassing {
22-
class IMessagePassingMng;
23-
}
24-
2521
/*---------------------------------------------------------------------------*/
2622
/*---------------------------------------------------------------------------*/
2723
class IOptionsMTLLinearSolver;

‎alien/ArcaneInterface/modules/external_packages/src/alien/kernels/petsc/PETScBackEnd.h

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* MTLBackEnd (C) 2000-2024 */
8+
/* MTLBackEnd (C) 2000-2025 */
99
/* */
1010
/* Tools for PETSc backend */
1111
/*---------------------------------------------------------------------------*/
1212
/*---------------------------------------------------------------------------*/
1313
#ifndef ALIEN_PETSCIMPL_PETSCBACKEND_H
1414
#define ALIEN_PETSCIMPL_PETSCBACKEND_H
1515

16-
16+
#include <arccore/message_passing/MessagePassingGlobal.h>
1717
#include <alien/core/backend/BackEnd.h>
1818
#include <alien/utils/Precomp.h>
1919
#include <alien/AlienExternalPackagesExport.h>
2020

2121
/*---------------------------------------------------------------------------*/
2222
/*---------------------------------------------------------------------------*/
2323

24-
namespace Arccore::MessagePassing {
25-
class IMessagePassingMng;
26-
}
27-
28-
/*---------------------------------------------------------------------------*/
29-
/*---------------------------------------------------------------------------*/
30-
3124
class IOptionsPETScLinearSolver;
3225

3326
namespace Alien {

‎alien/ArcaneInterface/modules/external_packages/src/alien/kernels/petsc/io/AsciiDumper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
@@ -10,13 +10,10 @@
1010
* Generated by createNew
1111
*/
1212

13+
#include <arccore/trace/TraceGlobal.h>
1314
#include <alien/AlienExternalPackagesPrecomp.h>
1415
#include <alien/utils/Precomp.h>
1516

16-
namespace Arccore {
17-
class ITraceMng;
18-
}
19-
2017
/*---------------------------------------------------------------------------*/
2118
/*---------------------------------------------------------------------------*/
2219

‎alien/ArcaneInterface/modules/trilinos/src/alien/kernels/trilinos/TrilinosBackEnd.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
@@ -10,6 +10,7 @@
1010
* Generated by createNew
1111
*/
1212

13+
#include <arccore/message_passing/MessagePassingGlobal.h>
1314
#include <alien/utils/Precomp.h>
1415
#include <alien/core/backend/BackEnd.h>
1516
#include <alien/kernels/trilinos/TrilinosPrecomp.h>
@@ -21,10 +22,6 @@
2122

2223
class IOptionsTrilinosSolver;
2324

24-
namespace Arccore::MessagePassing {
25-
class IMessagePassingMng;
26-
}
27-
2825
namespace Alien {
2926

3027
/*---------------------------------------------------------------------------*/

‎alien/standalone/src/core/alien/core/backend/EigenSolver.h

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
1-
/*
2-
* Copyright 2020 IFPEN-CEA
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*
16-
* SPDX-License-Identifier: Apache-2.0
17-
*/
18-
1+
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
2+
//-----------------------------------------------------------------------------
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
4+
// See the top-level COPYRIGHT file for details.
5+
// SPDX-License-Identifier: Apache-2.0
6+
//-----------------------------------------------------------------------------
197
#pragma once
208

9+
#include <arccore/message_passing/MessagePassingGlobal.h>
2110
#include <alien/utils/Precomp.h>
2211

2312
#include <memory>
@@ -29,14 +18,6 @@
2918
/*---------------------------------------------------------------------------*/
3019
/*---------------------------------------------------------------------------*/
3120

32-
namespace Arccore::MessagePassing
33-
{
34-
class IMessagePassingMng;
35-
}
36-
37-
/*---------------------------------------------------------------------------*/
38-
/*---------------------------------------------------------------------------*/
39-
4021
namespace Alien
4122
{
4223

‎alien/standalone/src/core/alien/core/backend/IInternalLinearSolverT.h

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,22 @@
1-
/*
2-
* Copyright 2020 IFPEN-CEA
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*
16-
* SPDX-License-Identifier: Apache-2.0
17-
*/
18-
1+
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
2+
//-----------------------------------------------------------------------------
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
4+
// See the top-level COPYRIGHT file for details.
5+
// SPDX-License-Identifier: Apache-2.0
6+
//-----------------------------------------------------------------------------
197
/*!
208
* \file IInternalLinearSolverT.h
219
* \brief IInternalLinearSolverT.h
2210
*/
2311
#pragma once
2412

13+
#include <arccore/message_passing/MessagePassingGlobal.h>
2514
#include <alien/utils/Precomp.h>
2615
#include <memory>
2716

2817
/*---------------------------------------------------------------------------*/
2918
/*---------------------------------------------------------------------------*/
3019

31-
namespace Arccore::MessagePassing
32-
{
33-
class IMessagePassingMng;
34-
}
35-
36-
/*---------------------------------------------------------------------------*/
37-
/*---------------------------------------------------------------------------*/
38-
3920
namespace Alien
4021
{
4122

‎alien/standalone/src/core/alien/data/Universe.h

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
1-
/*
2-
* Copyright 2020 IFPEN-CEA
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*
16-
* SPDX-License-Identifier: Apache-2.0
17-
*/
18-
1+
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
2+
//-----------------------------------------------------------------------------
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
4+
// See the top-level COPYRIGHT file for details.
5+
// SPDX-License-Identifier: Apache-2.0
6+
//-----------------------------------------------------------------------------
197
/*!
208
* \file Universe.h
219
* \brief Universe.h
@@ -24,17 +12,13 @@
2412
#pragma once
2513

2614
#include <alien/utils/Precomp.h>
15+
#include <arccore/trace/TraceGlobal.h>
2716

2817
#include <memory>
2918

3019
/*---------------------------------------------------------------------------*/
3120
/*---------------------------------------------------------------------------*/
3221

33-
namespace Arccore
34-
{
35-
class ITraceMng;
36-
}
37-
3822
namespace Alien
3923
{
4024

‎alien/standalone/src/core/alien/distribution/MatrixDistribution.h

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
/*
2-
* Copyright 2020 IFPEN-CEA
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*
16-
* SPDX-License-Identifier: Apache-2.0
17-
*/
1+
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
2+
//-----------------------------------------------------------------------------
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
4+
// See the top-level COPYRIGHT file for details.
5+
// SPDX-License-Identifier: Apache-2.0
6+
//-----------------------------------------------------------------------------
187

198
/*!
209
* \file MatrixDistribution.h
@@ -24,14 +13,10 @@
2413
#pragma once
2514

2615
#include <arccore/base/BaseTypes.h>
16+
#include <arccore/message_passing/MessagePassingGlobal.h>
2717

2818
#include <alien/data/ISpace.h>
2919

30-
namespace Arccore::MessagePassing
31-
{
32-
class IMessagePassingMng;
33-
}
34-
3520
/*---------------------------------------------------------------------------*/
3621
/*---------------------------------------------------------------------------*/
3722

‎alien/standalone/src/core/alien/distribution/VectorDistribution.h

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
/*
2-
* Copyright 2020 IFPEN-CEA
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*
16-
* SPDX-License-Identifier: Apache-2.0
17-
*/
1+
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
2+
//-----------------------------------------------------------------------------
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
4+
// See the top-level COPYRIGHT file for details.
5+
// SPDX-License-Identifier: Apache-2.0
6+
//-----------------------------------------------------------------------------
187

198
/*!
209
* \file VectorDistribution.h
@@ -23,13 +12,9 @@
2312

2413
#pragma once
2514

15+
#include <arccore/message_passing/MessagePassingGlobal.h>
2616
#include "alien/data/ISpace.h"
2717

28-
namespace Arccore::MessagePassing
29-
{
30-
class IMessagePassingMng;
31-
}
32-
3318
/*---------------------------------------------------------------------------*/
3419
/*---------------------------------------------------------------------------*/
3520

0 commit comments

Comments
 (0)