Merge pull request #913 from arcaneframework/dev/gg-move-cartesianmes…

…h-in-arcane-part Move directory 'cartesianmesh' from 'ceapart' to 'arcane'
arcaneframework · Oct 5, 2023 · 9471522 · 9471522
2 parents 5f9a489 + b4ad4a5
commit 9471522
Show file tree

Hide file tree

Showing 31 changed files with 37 additions and 37 deletions.
diff --git a/arcane/CMakeLists.txt b/arcane/CMakeLists.txt
@@ -972,9 +972,10 @@ add_subdirectory(src/arcane/tests)
 add_subdirectory(samples_build)
 
 # ----------------------------------------------------------------------------
-# Ajoute le répertoire matériaux.
+# Ajoute les répertoires 'matériaux' et 'cartesianmesh'
 # Pour l'instant on le fait après les tests pour cohérence avec l'existant
-# car avant ce répertoire était dans ceapart.
+# car avant ces répertoires étaientt dans ceapart.
+add_subdirectory(src/arcane/cartesianmesh)
 add_subdirectory(src/arcane/materials)
 
 # ----------------------------------------------------------------------------

diff --git a/arcane/ceapart/CMakeLists.txt b/arcane/ceapart/CMakeLists.txt
@@ -39,7 +39,6 @@ if(NOT WIN32 AND MATHLINK_FOUND)
   add_subdirectory(src/arcane/mathlink)
 endif()
 
-add_subdirectory(src/arcane/cartesianmesh)
 add_subdirectory(src/arcane/cea)
 add_subdirectory(src/arcane/geometric)
 add_subdirectory(src/arcane/meshutils)

diff --git a/...t/src/arcane/cartesianmesh/CMakeLists.txt → ...e/src/arcane/cartesianmesh/CMakeLists.txt b/...t/src/arcane/cartesianmesh/CMakeLists.txt → ...e/src/arcane/cartesianmesh/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(srcs.cmake)
 
 arcane_add_library(arcane_cartesianmesh
-  INPUT_PATH ${ARCANECEA_SRC_PATH}
+  INPUT_PATH ${Arcane_SOURCE_DIR}/src
   RELATIVE_PATH arcane/cartesianmesh
   FILES ${ARCANE_SOURCES}
   )

diff --git a/...ne/cartesianmesh/CartesianConnectivity.cc → ...ne/cartesianmesh/CartesianConnectivity.cc b/...ne/cartesianmesh/CartesianConnectivity.cc → ...ne/cartesianmesh/CartesianConnectivity.cc
diff --git a/...ane/cartesianmesh/CartesianConnectivity.h → ...ane/cartesianmesh/CartesianConnectivity.h b/...ane/cartesianmesh/CartesianConnectivity.h → ...ane/cartesianmesh/CartesianConnectivity.h
diff --git a/...artesianmesh/CartesianItemDirectionInfo.h → ...artesianmesh/CartesianItemDirectionInfo.h b/...artesianmesh/CartesianItemDirectionInfo.h → ...artesianmesh/CartesianItemDirectionInfo.h
diff --git a/...src/arcane/cartesianmesh/CartesianMesh.cc → ...src/arcane/cartesianmesh/CartesianMesh.cc b/...src/arcane/cartesianmesh/CartesianMesh.cc → ...src/arcane/cartesianmesh/CartesianMesh.cc
diff --git a/.../cartesianmesh/CartesianMeshCoarsening.cc → .../cartesianmesh/CartesianMeshCoarsening.cc b/.../cartesianmesh/CartesianMeshCoarsening.cc → .../cartesianmesh/CartesianMeshCoarsening.cc
@@ -49,7 +49,9 @@ coarseCartesianMesh()
     ARCANE_FATAL("This method is only valid for 1 patch (nb_patch={0})", nb_patch);
 
   // TODO: Supprimer les mailles fantômes puis les reconstruire
-
+  // TODO: Mettre à jour les informations dans CellDirectionMng
+  // de ownNbCell(), globalNbCell(), ...
+
   Integer nb_dir = mesh->dimension();
   if (nb_dir != 2)
     ARCANE_FATAL("This method is only valid for 2D mesh");

diff --git a/...e/cartesianmesh/CartesianMeshCoarsening.h → ...e/cartesianmesh/CartesianMeshCoarsening.h b/...e/cartesianmesh/CartesianMeshCoarsening.h → ...e/cartesianmesh/CartesianMeshCoarsening.h
diff --git a/...rcane/cartesianmesh/CartesianMeshGlobal.h → ...rcane/cartesianmesh/CartesianMeshGlobal.h b/...rcane/cartesianmesh/CartesianMeshGlobal.h → ...rcane/cartesianmesh/CartesianMeshGlobal.h
diff --git a/...rcane/cartesianmesh/CartesianMeshPatch.cc → ...rcane/cartesianmesh/CartesianMeshPatch.cc b/...rcane/cartesianmesh/CartesianMeshPatch.cc → ...rcane/cartesianmesh/CartesianMeshPatch.cc
diff --git a/...tesianmesh/CartesianMeshRenumberingInfo.h → ...tesianmesh/CartesianMeshRenumberingInfo.h b/...tesianmesh/CartesianMeshRenumberingInfo.h → ...tesianmesh/CartesianMeshRenumberingInfo.h
diff --git a/.../arcane/cartesianmesh/CellDirectionMng.cc → .../arcane/cartesianmesh/CellDirectionMng.cc b/.../arcane/cartesianmesh/CellDirectionMng.cc → .../arcane/cartesianmesh/CellDirectionMng.cc
diff --git a/...c/arcane/cartesianmesh/CellDirectionMng.h → ...c/arcane/cartesianmesh/CellDirectionMng.h b/...c/arcane/cartesianmesh/CellDirectionMng.h → ...c/arcane/cartesianmesh/CellDirectionMng.h
diff --git a/.../arcane/cartesianmesh/FaceDirectionMng.cc → .../arcane/cartesianmesh/FaceDirectionMng.cc b/.../arcane/cartesianmesh/FaceDirectionMng.cc → .../arcane/cartesianmesh/FaceDirectionMng.cc
diff --git a/...c/arcane/cartesianmesh/FaceDirectionMng.h → ...c/arcane/cartesianmesh/FaceDirectionMng.h b/...c/arcane/cartesianmesh/FaceDirectionMng.h → ...c/arcane/cartesianmesh/FaceDirectionMng.h
diff --git a/...src/arcane/cartesianmesh/ICartesianMesh.h → ...src/arcane/cartesianmesh/ICartesianMesh.h b/...src/arcane/cartesianmesh/ICartesianMesh.h → ...src/arcane/cartesianmesh/ICartesianMesh.h
diff --git a/...rcane/cartesianmesh/ICartesianMeshPatch.h → ...rcane/cartesianmesh/ICartesianMeshPatch.h b/...rcane/cartesianmesh/ICartesianMeshPatch.h → ...rcane/cartesianmesh/ICartesianMeshPatch.h
diff --git a/.../arcane/cartesianmesh/NodeDirectionMng.cc → .../arcane/cartesianmesh/NodeDirectionMng.cc b/.../arcane/cartesianmesh/NodeDirectionMng.cc → .../arcane/cartesianmesh/NodeDirectionMng.cc
diff --git a/...c/arcane/cartesianmesh/NodeDirectionMng.h → ...c/arcane/cartesianmesh/NodeDirectionMng.h b/...c/arcane/cartesianmesh/NodeDirectionMng.h → ...c/arcane/cartesianmesh/NodeDirectionMng.h
diff --git a/...rtesianmesh/internal/CartesianMeshPatch.h → ...rtesianmesh/internal/CartesianMeshPatch.h b/...rtesianmesh/internal/CartesianMeshPatch.h → ...rtesianmesh/internal/CartesianMeshPatch.h
@@ -1,28 +1,28 @@
 // -*- 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-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* CartesianMeshPatch.h                                        (C) 2000-2020 */
+/* CartesianMeshPatch.h                                        (C) 2000-2023 */
 /*                                                                           */
 /* Informations sur un patch AMR d'un maillage cartésien.                    */
 /*---------------------------------------------------------------------------*/
-#ifndef ARCANE_CEA_CARTESIANMESHPATCH_H
-#define ARCANE_CEA_CARTESIANMESHPATCH_H
+#ifndef ARCANE_CARTESIANMESH_CARTESIANMESHPATCH_H
+#define ARCANE_CARTESIANMESH_CARTESIANMESHPATCH_H
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
 #include "arcane/utils/TraceAccessor.h"
 
-#include "arcane/ItemTypes.h"
-#include "arcane/VariableTypes.h"
+#include "arcane/core/ItemTypes.h"
+#include "arcane/core/VariableTypes.h"
 
-#include "arcane/cea/ICartesianMeshPatch.h"
-#include "arcane/cea/CellDirectionMng.h"
-#include "arcane/cea/FaceDirectionMng.h"
-#include "arcane/cea/NodeDirectionMng.h"
+#include "arcane/cartesianmesh/ICartesianMeshPatch.h"
+#include "arcane/cartesianmesh/CellDirectionMng.h"
+#include "arcane/cartesianmesh/FaceDirectionMng.h"
+#include "arcane/cartesianmesh/NodeDirectionMng.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/

diff --git a/...ernal/CartesianMeshUniqueIdRenumbering.cc → ...ernal/CartesianMeshUniqueIdRenumbering.cc b/...ernal/CartesianMeshUniqueIdRenumbering.cc → ...ernal/CartesianMeshUniqueIdRenumbering.cc
@@ -15,8 +15,8 @@
 
 #include "arcane/utils/PlatformUtils.h"
 
-#include "arcane/cea/ICartesianMesh.h"
-#include "arcane/cea/ICartesianMeshPatch.h"
+#include "arcane/cartesianmesh/ICartesianMesh.h"
+#include "arcane/cartesianmesh/ICartesianMeshPatch.h"
 
 #include "arcane/core/CartesianGridDimension.h"
 #include "arcane/core/VariableTypes.h"

diff --git a/...ternal/CartesianMeshUniqueIdRenumbering.h → ...ternal/CartesianMeshUniqueIdRenumbering.h b/...ternal/CartesianMeshUniqueIdRenumbering.h → ...ternal/CartesianMeshUniqueIdRenumbering.h
@@ -1,25 +1,25 @@
 // -*- 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-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* CartesianMeshUniqueIdRenumbering.h                          (C) 2000-2021 */
+/* CartesianMeshUniqueIdRenumbering.h                          (C) 2000-2023 */
 /*                                                                           */
 /* Renumérotation des uniqueId() pour les maillages cartésiens.              */
 /*---------------------------------------------------------------------------*/
-#ifndef ARCANE_CEA_CARTESIANMESHUNIQUEIDRENUMBERING_H
-#define ARCANE_CEA_CARTESIANMESHUNIQUEIDRENUMBERING_H
+#ifndef ARCANE_CARTESIANMESH_CARTESIANMESHUNIQUEIDRENUMBERING_H
+#define ARCANE_CARTESIANMESH_CARTESIANMESHUNIQUEIDRENUMBERING_H
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
 #include "arcane/utils/TraceAccessor.h"
 
-#include "arcane/ItemTypes.h"
-#include "arcane/VariableTypedef.h"
+#include "arcane/core/ItemTypes.h"
+#include "arcane/core/VariableTypedef.h"
 
-#include "arcane/cea/CeaGlobal.h"
+#include "arcane/cartesianmesh/CartesianMeshGlobal.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/

diff --git a/...apart/src/arcane/cartesianmesh/srcs.cmake → arcane/src/arcane/cartesianmesh/srcs.cmake b/...apart/src/arcane/cartesianmesh/srcs.cmake → arcane/src/arcane/cartesianmesh/srcs.cmake
diff --git a/...arcane/cartesianmesh/tests/CMakeLists.txt → ...arcane/cartesianmesh/tests/CMakeLists.txt b/...arcane/cartesianmesh/tests/CMakeLists.txt → ...arcane/cartesianmesh/tests/CMakeLists.txt
diff --git a/...artesianmesh/tests/TestCartesianMeshV2.cc → ...artesianmesh/tests/TestCartesianMeshV2.cc b/...artesianmesh/tests/TestCartesianMeshV2.cc → ...artesianmesh/tests/TestCartesianMeshV2.cc
@@ -7,8 +7,6 @@
 
 #include <gtest/gtest.h>
 
-#include "arcane/tests/CartesianMeshV2TestUtils.h"
-
 #include "arcane/cartesianmesh/v2/CartesianTypes.h"
 #include "arcane/cartesianmesh/v2/CartesianGrid.h"
 #include "arcane/cartesianmesh/v2/CartesianNumbering.h"

diff --git a/...c/arcane/cartesianmesh/v2/CartesianGrid.h → ...c/arcane/cartesianmesh/v2/CartesianGrid.h b/...c/arcane/cartesianmesh/v2/CartesianGrid.h → ...c/arcane/cartesianmesh/v2/CartesianGrid.h
diff --git a/.../v2/CartesianMeshUniqueIdRenumberingV2.cc → .../v2/CartesianMeshUniqueIdRenumberingV2.cc b/.../v2/CartesianMeshUniqueIdRenumberingV2.cc → .../v2/CartesianMeshUniqueIdRenumberingV2.cc
@@ -15,13 +15,13 @@
 
 #include "arcane/utils/PlatformUtils.h"
 
-#include "arcane/cea/ICartesianMesh.h"
-#include "arcane/cea/ICartesianMeshPatch.h"
+#include "arcane/cartesianmesh/ICartesianMesh.h"
+#include "arcane/cartesianmesh/ICartesianMeshPatch.h"
 
-#include "arcane/VariableTypes.h"
-#include "arcane/IMesh.h"
-#include "arcane/IItemFamily.h"
-#include "arcane/ICartesianMeshGenerationInfo.h"
+#include "arcane/core/VariableTypes.h"
+#include "arcane/core/IMesh.h"
+#include "arcane/core/IItemFamily.h"
+#include "arcane/core/ICartesianMeshGenerationInfo.h"
 
 #include <array>
 

diff --git a/...h/v2/CartesianMeshUniqueIdRenumberingV2.h → ...h/v2/CartesianMeshUniqueIdRenumberingV2.h b/...h/v2/CartesianMeshUniqueIdRenumberingV2.h → ...h/v2/CartesianMeshUniqueIdRenumberingV2.h
@@ -9,17 +9,17 @@
 /*                                                                           */
 /* Renumérotation des uniqueId() pour les maillages cartésiens.              */
 /*---------------------------------------------------------------------------*/
-#ifndef ARCANE_CEA_CARTESIANMESHUNIQUEIDRENUMBERINGV2_H
-#define ARCANE_CEA_CARTESIANMESHUNIQUEIDRENUMBERINGV2_H
+#ifndef ARCANE_CARTESIANMESH_CARTESIANMESHUNIQUEIDRENUMBERINGV2_H
+#define ARCANE_CARTESIANMESH_CARTESIANMESHUNIQUEIDRENUMBERINGV2_H
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
 #include "arcane/utils/TraceAccessor.h"
 
-#include "arcane/ItemTypes.h"
-#include "arcane/VariableTypedef.h"
+#include "arcane/core/ItemTypes.h"
+#include "arcane/core/VariableTypedef.h"
 
-#include "arcane/cea/CeaGlobal.h"
+#include "arcane/cartesianmesh/CartesianMeshGlobal.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/

diff --git a/...ane/cartesianmesh/v2/CartesianNumbering.h → ...ane/cartesianmesh/v2/CartesianNumbering.h b/...ane/cartesianmesh/v2/CartesianNumbering.h → ...ane/cartesianmesh/v2/CartesianNumbering.h
diff --git a/.../arcane/cartesianmesh/v2/CartesianTypes.h → .../arcane/cartesianmesh/v2/CartesianTypes.h b/.../arcane/cartesianmesh/v2/CartesianTypes.h → .../arcane/cartesianmesh/v2/CartesianTypes.h