From ce927ab2b7bd1e7d6cb1c0c92d8c62c89f21ab97 Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Fri, 25 Apr 2025 11:31:18 +0200 Subject: [PATCH] Remove P4EST_WITH_SEARCH_LOCAL. --- cmake/configure/configure_50_p4est.cmake | 1 - cmake/modules/FindDEAL_II_P4EST.cmake | 12 ------------ ...nt_owner_rank_01.mpirun=1.with_p4est=true.output} | 0 ...nt_owner_rank_01.mpirun=3.with_p4est=true.output} | 0 ...nt_owner_rank_01.mpirun=5.with_p4est=true.output} | 0 ...nt_owner_rank_02.mpirun=1.with_p4est=true.output} | 0 ...nt_owner_rank_02.mpirun=3.with_p4est=true.output} | 0 ...nt_owner_rank_02.mpirun=5.with_p4est=true.output} | 0 ...nt_owner_rank_01.mpirun=1.with_p4est=true.output} | 0 ...nt_owner_rank_01.mpirun=3.with_p4est=true.output} | 0 ...nt_owner_rank_01.mpirun=5.with_p4est=true.output} | 0 ...nt_owner_rank_02.mpirun=1.with_p4est=true.output} | 0 ...nt_owner_rank_02.mpirun=3.with_p4est=true.output} | 0 ...nt_owner_rank_02.mpirun=5.with_p4est=true.output} | 0 14 files changed, 13 deletions(-) rename tests/mpi/{p4est_2d_find_point_owner_rank_01.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output => p4est_2d_find_point_owner_rank_01.mpirun=1.with_p4est=true.output} (100%) rename tests/mpi/{p4est_2d_find_point_owner_rank_01.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output => p4est_2d_find_point_owner_rank_01.mpirun=3.with_p4est=true.output} (100%) rename tests/mpi/{p4est_2d_find_point_owner_rank_01.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output => p4est_2d_find_point_owner_rank_01.mpirun=5.with_p4est=true.output} (100%) rename tests/mpi/{p4est_2d_find_point_owner_rank_02.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output => p4est_2d_find_point_owner_rank_02.mpirun=1.with_p4est=true.output} (100%) rename tests/mpi/{p4est_2d_find_point_owner_rank_02.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output => p4est_2d_find_point_owner_rank_02.mpirun=3.with_p4est=true.output} (100%) rename tests/mpi/{p4est_2d_find_point_owner_rank_02.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output => p4est_2d_find_point_owner_rank_02.mpirun=5.with_p4est=true.output} (100%) rename tests/mpi/{p4est_3d_find_point_owner_rank_01.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output => p4est_3d_find_point_owner_rank_01.mpirun=1.with_p4est=true.output} (100%) rename tests/mpi/{p4est_3d_find_point_owner_rank_01.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output => p4est_3d_find_point_owner_rank_01.mpirun=3.with_p4est=true.output} (100%) rename tests/mpi/{p4est_3d_find_point_owner_rank_01.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output => p4est_3d_find_point_owner_rank_01.mpirun=5.with_p4est=true.output} (100%) rename tests/mpi/{p4est_3d_find_point_owner_rank_02.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output => p4est_3d_find_point_owner_rank_02.mpirun=1.with_p4est=true.output} (100%) rename tests/mpi/{p4est_3d_find_point_owner_rank_02.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output => p4est_3d_find_point_owner_rank_02.mpirun=3.with_p4est=true.output} (100%) rename tests/mpi/{p4est_3d_find_point_owner_rank_02.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output => p4est_3d_find_point_owner_rank_02.mpirun=5.with_p4est=true.output} (100%) diff --git a/cmake/configure/configure_50_p4est.cmake b/cmake/configure/configure_50_p4est.cmake index 77c170d967..e4e34a794c 100644 --- a/cmake/configure/configure_50_p4est.cmake +++ b/cmake/configure/configure_50_p4est.cmake @@ -76,7 +76,6 @@ endmacro() macro(feature_p4est_configure_external) set(DEAL_II_P4EST_WITH_VTK_BINARY ${P4EST_WITH_VTK_BINARY}) - set(DEAL_II_P4EST_WITH_SEARCH_LOCAL ${P4EST_WITH_SEARCH_LOCAL}) endmacro() diff --git a/cmake/modules/FindDEAL_II_P4EST.cmake b/cmake/modules/FindDEAL_II_P4EST.cmake index 5031393f09..c945645a16 100644 --- a/cmake/modules/FindDEAL_II_P4EST.cmake +++ b/cmake/modules/FindDEAL_II_P4EST.cmake @@ -21,7 +21,6 @@ # P4EST_WITH_MPI # P4EST_WITH_ZLIB # P4EST_WITH_VTK_BINARY -# P4EST_WITH_SEARCH_LOCAL # P4EST_VERSION # P4EST_VERSION_MAJOR # P4EST_VERSION_MINOR @@ -146,17 +145,6 @@ if(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h) else() set(P4EST_WITH_VTK_BINARY TRUE) endif() - - # - # Does p4est have search local? - # - file(STRINGS "${P4EST_INCLUDE_DIR}/p4est_base.h" P4EST_SEARCH_LOCAL_STRING - REGEX "#define.*P4EST_SEARCH_LOCAL") - if("${P4EST_SEARCH_LOCAL_STRING}" STREQUAL "") - set(P4EST_WITH_SEARCH_LOCAL FALSE) - else() - set(P4EST_WITH_SEARCH_LOCAL TRUE) - endif() # # Extract version numbers: diff --git a/tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=1.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=1.with_p4est=true.output diff --git a/tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=3.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=3.with_p4est=true.output diff --git a/tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=5.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_2d_find_point_owner_rank_01.mpirun=5.with_p4est=true.output diff --git a/tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=1.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=1.with_p4est=true.output diff --git a/tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=3.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=3.with_p4est=true.output diff --git a/tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=5.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_2d_find_point_owner_rank_02.mpirun=5.with_p4est=true.output diff --git a/tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=1.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=1.with_p4est=true.output diff --git a/tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=3.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=3.with_p4est=true.output diff --git a/tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=5.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_3d_find_point_owner_rank_01.mpirun=5.with_p4est=true.output diff --git a/tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=1.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=1.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=1.with_p4est=true.output diff --git a/tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=3.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=3.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=3.with_p4est=true.output diff --git a/tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output b/tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=5.with_p4est=true.output similarity index 100% rename from tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=5.with_p4est=true.with_p4est_with_search_local=true.output rename to tests/mpi/p4est_3d_find_point_owner_rank_02.mpirun=5.with_p4est=true.output -- 2.39.5