From 3ec9a91d73c9f3171c30dca5fcec217e630d7b8d Mon Sep 17 00:00:00 2001 From: Marco Feder Date: Tue, 5 Dec 2023 15:24:05 +0000 Subject: [PATCH] Update name of shared library --- CMakeLists.txt | 4 ++-- README.md | 2 +- examples/CMakeLists.txt | 5 +++-- examples/poisson.cc | 2 +- src/CMakeLists.txt | 4 ++-- test/{agglomeration => polydeal}/CMakeLists.txt | 2 +- test/{agglomeration => polydeal}/agg_handler_bbox_test.cc | 0 .../{agglomeration => polydeal}/agg_handler_bbox_test.output | 0 .../aggl_handler_master_and_slaves_01.cc | 0 .../aggl_handler_master_and_slaves_01.output | 0 .../{agglomeration => polydeal}/agglomerated_neighbors_01.cc | 0 .../agglomerated_neighbors_01.output | 0 .../{agglomeration => polydeal}/agglomerated_neighbors_02.cc | 0 .../agglomerated_neighbors_02.output | 0 .../{agglomeration => polydeal}/agglomerated_neighbors_03.cc | 0 .../agglomerated_neighbors_03.output | 0 test/{agglomeration => polydeal}/agglomeration_signals.cc | 0 .../{agglomeration => polydeal}/agglomeration_signals.output | 0 test/{agglomeration => polydeal}/circle-grid.inp | 0 .../fe_collection_agglomeration.cc | 0 .../fe_collection_agglomeration.output | 0 test/{agglomeration => polydeal}/fe_space_on_bbox.cc | 0 test/{agglomeration => polydeal}/fe_space_on_bbox.output | 0 test/{agglomeration => polydeal}/hp_structure_01.cc | 0 test/{agglomeration => polydeal}/hp_structure_01.output | 0 test/{agglomeration => polydeal}/minimal_SIP_Poisson.cc | 0 test/{agglomeration => polydeal}/minimal_SIP_Poisson.output | 0 test/{agglomeration => polydeal}/poisson.cc | 0 test/{agglomeration => polydeal}/poisson.output | 0 test/{agglomeration => polydeal}/poisson_sanity_check_01.cc | 0 .../poisson_sanity_check_01.output | 0 test/{agglomeration => polydeal}/poisson_sanity_check_02.cc | 0 .../poisson_sanity_check_02.output | 0 test/{agglomeration => polydeal}/reinit_cell_face_01.cc | 0 test/{agglomeration => polydeal}/reinit_cell_face_01.output | 0 test/{agglomeration => polydeal}/reinit_cell_face_02.cc | 0 test/{agglomeration => polydeal}/reinit_cell_face_02.output | 0 .../reinit_cell_face_master_master.cc | 0 .../reinit_cell_face_master_master.output | 0 .../{agglomeration => polydeal}/reinit_cell_face_quad_pts.cc | 0 .../reinit_cell_face_quad_pts.output | 0 .../sparsity_agglomerated_tria.cc | 0 .../sparsity_agglomerated_tria.output | 0 test/{agglomeration => polydeal}/sparsity_agglomeration.svg | 0 test/{agglomeration => polydeal}/t2.msh | 0 test/{agglomeration => polydeal}/unstructured_grid.cc | 0 test/{agglomeration => polydeal}/unstructured_grid.output | 0 47 files changed, 10 insertions(+), 9 deletions(-) rename test/{agglomeration => polydeal}/CMakeLists.txt (71%) rename test/{agglomeration => polydeal}/agg_handler_bbox_test.cc (100%) rename test/{agglomeration => polydeal}/agg_handler_bbox_test.output (100%) rename test/{agglomeration => polydeal}/aggl_handler_master_and_slaves_01.cc (100%) rename test/{agglomeration => polydeal}/aggl_handler_master_and_slaves_01.output (100%) rename test/{agglomeration => polydeal}/agglomerated_neighbors_01.cc (100%) rename test/{agglomeration => polydeal}/agglomerated_neighbors_01.output (100%) rename test/{agglomeration => polydeal}/agglomerated_neighbors_02.cc (100%) rename test/{agglomeration => polydeal}/agglomerated_neighbors_02.output (100%) rename test/{agglomeration => polydeal}/agglomerated_neighbors_03.cc (100%) rename test/{agglomeration => polydeal}/agglomerated_neighbors_03.output (100%) rename test/{agglomeration => polydeal}/agglomeration_signals.cc (100%) rename test/{agglomeration => polydeal}/agglomeration_signals.output (100%) rename test/{agglomeration => polydeal}/circle-grid.inp (100%) rename test/{agglomeration => polydeal}/fe_collection_agglomeration.cc (100%) rename test/{agglomeration => polydeal}/fe_collection_agglomeration.output (100%) rename test/{agglomeration => polydeal}/fe_space_on_bbox.cc (100%) rename test/{agglomeration => polydeal}/fe_space_on_bbox.output (100%) rename test/{agglomeration => polydeal}/hp_structure_01.cc (100%) rename test/{agglomeration => polydeal}/hp_structure_01.output (100%) rename test/{agglomeration => polydeal}/minimal_SIP_Poisson.cc (100%) rename test/{agglomeration => polydeal}/minimal_SIP_Poisson.output (100%) rename test/{agglomeration => polydeal}/poisson.cc (100%) rename test/{agglomeration => polydeal}/poisson.output (100%) rename test/{agglomeration => polydeal}/poisson_sanity_check_01.cc (100%) rename test/{agglomeration => polydeal}/poisson_sanity_check_01.output (100%) rename test/{agglomeration => polydeal}/poisson_sanity_check_02.cc (100%) rename test/{agglomeration => polydeal}/poisson_sanity_check_02.output (100%) rename test/{agglomeration => polydeal}/reinit_cell_face_01.cc (100%) rename test/{agglomeration => polydeal}/reinit_cell_face_01.output (100%) rename test/{agglomeration => polydeal}/reinit_cell_face_02.cc (100%) rename test/{agglomeration => polydeal}/reinit_cell_face_02.output (100%) rename test/{agglomeration => polydeal}/reinit_cell_face_master_master.cc (100%) rename test/{agglomeration => polydeal}/reinit_cell_face_master_master.output (100%) rename test/{agglomeration => polydeal}/reinit_cell_face_quad_pts.cc (100%) rename test/{agglomeration => polydeal}/reinit_cell_face_quad_pts.output (100%) rename test/{agglomeration => polydeal}/sparsity_agglomerated_tria.cc (100%) rename test/{agglomeration => polydeal}/sparsity_agglomerated_tria.output (100%) rename test/{agglomeration => polydeal}/sparsity_agglomeration.svg (100%) rename test/{agglomeration => polydeal}/t2.msh (100%) rename test/{agglomeration => polydeal}/unstructured_grid.cc (100%) rename test/{agglomeration => polydeal}/unstructured_grid.output (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41837bed..5006f1fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ IF(NOT ${deal.II_FOUND}) ENDIF() DEAL_II_INITIALIZE_CACHED_VARIABLES() -PROJECT(Agglomeration_suite) +PROJECT(polydeal) # Enable testing and descent into tests/ subdirectory: ENABLE_TESTING() @@ -24,6 +24,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(examples) -ADD_SUBDIRECTORY(test/agglomeration) +ADD_SUBDIRECTORY(test/polydeal) # ADD_SUBDIRECTORY(tests/step) \ No newline at end of file diff --git a/README.md b/README.md index 18c09beb..6884e341 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![GitHub CI](https://github.com/fdrmrc/AggloDeal/actions/workflows/tests.yml/badge.svg) ![GitHub CI](https://github.com/fdrmrc/AggloDeal/actions/workflows/indentation.yml/badge.svg) -***PolyDEAL*** is an open source project in C++ which aims to provide building block for Polygonal Discontinuous Galerkin methods, within the Finite Element library [**deal.II**](https:dealii.org). +***PolyDEAL*** is an open source project in C++ which aims to provide building blocks for the implementation of Polygonal Discontinuous Galerkin methods, within the Finite Element library [**deal.II**](https:dealii.org). ## Getting started diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d1058d46..6ac74de8 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,6 @@ # set up executable with autopilot macro: SET(TARGET "poisson") -SET(TARGET_SRC minimal_SIP.cc) +# SET(TARGET_SRC minimal_SIP.cc) +SET(TARGET_SRC poisson.cc) DEAL_II_INVOKE_AUTOPILOT() -TARGET_LINK_LIBRARIES(${TARGET} Agglomeration_suite) \ No newline at end of file +TARGET_LINK_LIBRARIES(${TARGET} polydeal) \ No newline at end of file diff --git a/examples/poisson.cc b/examples/poisson.cc index dbfe0127..b421d208 100644 --- a/examples/poisson.cc +++ b/examples/poisson.cc @@ -241,7 +241,7 @@ Poisson::make_grid() const auto csr_and_agglomerates = extract_children_of_level(tree, extraction_level); - boost::geometry::index::detail::rtree::utilities::print(std::cout, tree); + // boost::geometry::index::detail::rtree::utilities::print(std::cout, tree); const auto &agglomerates = csr_and_agglomerates.second; // vec> [[maybe_unused]] auto csrs = csr_and_agglomerates.first; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fba6976d..164e3240 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ # src/CMakeLists.txt # set up shared library by hand: -ADD_LIBRARY(Agglomeration_suite SHARED agglomeration_handler.cc) -DEAL_II_SETUP_TARGET(Agglomeration_suite) +ADD_LIBRARY(polydeal SHARED agglomeration_handler.cc) +DEAL_II_SETUP_TARGET(polydeal) diff --git a/test/agglomeration/CMakeLists.txt b/test/polydeal/CMakeLists.txt similarity index 71% rename from test/agglomeration/CMakeLists.txt rename to test/polydeal/CMakeLists.txt index 79de9da0..963f3cd0 100644 --- a/test/agglomeration/CMakeLists.txt +++ b/test/polydeal/CMakeLists.txt @@ -1,6 +1,6 @@ # tests/support/CMakeLists.txt -SET(TEST_LIBRARIES Agglomeration_suite) +SET(TEST_LIBRARIES polydeal) DEAL_II_PICKUP_TESTS() set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") \ No newline at end of file diff --git a/test/agglomeration/agg_handler_bbox_test.cc b/test/polydeal/agg_handler_bbox_test.cc similarity index 100% rename from test/agglomeration/agg_handler_bbox_test.cc rename to test/polydeal/agg_handler_bbox_test.cc diff --git a/test/agglomeration/agg_handler_bbox_test.output b/test/polydeal/agg_handler_bbox_test.output similarity index 100% rename from test/agglomeration/agg_handler_bbox_test.output rename to test/polydeal/agg_handler_bbox_test.output diff --git a/test/agglomeration/aggl_handler_master_and_slaves_01.cc b/test/polydeal/aggl_handler_master_and_slaves_01.cc similarity index 100% rename from test/agglomeration/aggl_handler_master_and_slaves_01.cc rename to test/polydeal/aggl_handler_master_and_slaves_01.cc diff --git a/test/agglomeration/aggl_handler_master_and_slaves_01.output b/test/polydeal/aggl_handler_master_and_slaves_01.output similarity index 100% rename from test/agglomeration/aggl_handler_master_and_slaves_01.output rename to test/polydeal/aggl_handler_master_and_slaves_01.output diff --git a/test/agglomeration/agglomerated_neighbors_01.cc b/test/polydeal/agglomerated_neighbors_01.cc similarity index 100% rename from test/agglomeration/agglomerated_neighbors_01.cc rename to test/polydeal/agglomerated_neighbors_01.cc diff --git a/test/agglomeration/agglomerated_neighbors_01.output b/test/polydeal/agglomerated_neighbors_01.output similarity index 100% rename from test/agglomeration/agglomerated_neighbors_01.output rename to test/polydeal/agglomerated_neighbors_01.output diff --git a/test/agglomeration/agglomerated_neighbors_02.cc b/test/polydeal/agglomerated_neighbors_02.cc similarity index 100% rename from test/agglomeration/agglomerated_neighbors_02.cc rename to test/polydeal/agglomerated_neighbors_02.cc diff --git a/test/agglomeration/agglomerated_neighbors_02.output b/test/polydeal/agglomerated_neighbors_02.output similarity index 100% rename from test/agglomeration/agglomerated_neighbors_02.output rename to test/polydeal/agglomerated_neighbors_02.output diff --git a/test/agglomeration/agglomerated_neighbors_03.cc b/test/polydeal/agglomerated_neighbors_03.cc similarity index 100% rename from test/agglomeration/agglomerated_neighbors_03.cc rename to test/polydeal/agglomerated_neighbors_03.cc diff --git a/test/agglomeration/agglomerated_neighbors_03.output b/test/polydeal/agglomerated_neighbors_03.output similarity index 100% rename from test/agglomeration/agglomerated_neighbors_03.output rename to test/polydeal/agglomerated_neighbors_03.output diff --git a/test/agglomeration/agglomeration_signals.cc b/test/polydeal/agglomeration_signals.cc similarity index 100% rename from test/agglomeration/agglomeration_signals.cc rename to test/polydeal/agglomeration_signals.cc diff --git a/test/agglomeration/agglomeration_signals.output b/test/polydeal/agglomeration_signals.output similarity index 100% rename from test/agglomeration/agglomeration_signals.output rename to test/polydeal/agglomeration_signals.output diff --git a/test/agglomeration/circle-grid.inp b/test/polydeal/circle-grid.inp similarity index 100% rename from test/agglomeration/circle-grid.inp rename to test/polydeal/circle-grid.inp diff --git a/test/agglomeration/fe_collection_agglomeration.cc b/test/polydeal/fe_collection_agglomeration.cc similarity index 100% rename from test/agglomeration/fe_collection_agglomeration.cc rename to test/polydeal/fe_collection_agglomeration.cc diff --git a/test/agglomeration/fe_collection_agglomeration.output b/test/polydeal/fe_collection_agglomeration.output similarity index 100% rename from test/agglomeration/fe_collection_agglomeration.output rename to test/polydeal/fe_collection_agglomeration.output diff --git a/test/agglomeration/fe_space_on_bbox.cc b/test/polydeal/fe_space_on_bbox.cc similarity index 100% rename from test/agglomeration/fe_space_on_bbox.cc rename to test/polydeal/fe_space_on_bbox.cc diff --git a/test/agglomeration/fe_space_on_bbox.output b/test/polydeal/fe_space_on_bbox.output similarity index 100% rename from test/agglomeration/fe_space_on_bbox.output rename to test/polydeal/fe_space_on_bbox.output diff --git a/test/agglomeration/hp_structure_01.cc b/test/polydeal/hp_structure_01.cc similarity index 100% rename from test/agglomeration/hp_structure_01.cc rename to test/polydeal/hp_structure_01.cc diff --git a/test/agglomeration/hp_structure_01.output b/test/polydeal/hp_structure_01.output similarity index 100% rename from test/agglomeration/hp_structure_01.output rename to test/polydeal/hp_structure_01.output diff --git a/test/agglomeration/minimal_SIP_Poisson.cc b/test/polydeal/minimal_SIP_Poisson.cc similarity index 100% rename from test/agglomeration/minimal_SIP_Poisson.cc rename to test/polydeal/minimal_SIP_Poisson.cc diff --git a/test/agglomeration/minimal_SIP_Poisson.output b/test/polydeal/minimal_SIP_Poisson.output similarity index 100% rename from test/agglomeration/minimal_SIP_Poisson.output rename to test/polydeal/minimal_SIP_Poisson.output diff --git a/test/agglomeration/poisson.cc b/test/polydeal/poisson.cc similarity index 100% rename from test/agglomeration/poisson.cc rename to test/polydeal/poisson.cc diff --git a/test/agglomeration/poisson.output b/test/polydeal/poisson.output similarity index 100% rename from test/agglomeration/poisson.output rename to test/polydeal/poisson.output diff --git a/test/agglomeration/poisson_sanity_check_01.cc b/test/polydeal/poisson_sanity_check_01.cc similarity index 100% rename from test/agglomeration/poisson_sanity_check_01.cc rename to test/polydeal/poisson_sanity_check_01.cc diff --git a/test/agglomeration/poisson_sanity_check_01.output b/test/polydeal/poisson_sanity_check_01.output similarity index 100% rename from test/agglomeration/poisson_sanity_check_01.output rename to test/polydeal/poisson_sanity_check_01.output diff --git a/test/agglomeration/poisson_sanity_check_02.cc b/test/polydeal/poisson_sanity_check_02.cc similarity index 100% rename from test/agglomeration/poisson_sanity_check_02.cc rename to test/polydeal/poisson_sanity_check_02.cc diff --git a/test/agglomeration/poisson_sanity_check_02.output b/test/polydeal/poisson_sanity_check_02.output similarity index 100% rename from test/agglomeration/poisson_sanity_check_02.output rename to test/polydeal/poisson_sanity_check_02.output diff --git a/test/agglomeration/reinit_cell_face_01.cc b/test/polydeal/reinit_cell_face_01.cc similarity index 100% rename from test/agglomeration/reinit_cell_face_01.cc rename to test/polydeal/reinit_cell_face_01.cc diff --git a/test/agglomeration/reinit_cell_face_01.output b/test/polydeal/reinit_cell_face_01.output similarity index 100% rename from test/agglomeration/reinit_cell_face_01.output rename to test/polydeal/reinit_cell_face_01.output diff --git a/test/agglomeration/reinit_cell_face_02.cc b/test/polydeal/reinit_cell_face_02.cc similarity index 100% rename from test/agglomeration/reinit_cell_face_02.cc rename to test/polydeal/reinit_cell_face_02.cc diff --git a/test/agglomeration/reinit_cell_face_02.output b/test/polydeal/reinit_cell_face_02.output similarity index 100% rename from test/agglomeration/reinit_cell_face_02.output rename to test/polydeal/reinit_cell_face_02.output diff --git a/test/agglomeration/reinit_cell_face_master_master.cc b/test/polydeal/reinit_cell_face_master_master.cc similarity index 100% rename from test/agglomeration/reinit_cell_face_master_master.cc rename to test/polydeal/reinit_cell_face_master_master.cc diff --git a/test/agglomeration/reinit_cell_face_master_master.output b/test/polydeal/reinit_cell_face_master_master.output similarity index 100% rename from test/agglomeration/reinit_cell_face_master_master.output rename to test/polydeal/reinit_cell_face_master_master.output diff --git a/test/agglomeration/reinit_cell_face_quad_pts.cc b/test/polydeal/reinit_cell_face_quad_pts.cc similarity index 100% rename from test/agglomeration/reinit_cell_face_quad_pts.cc rename to test/polydeal/reinit_cell_face_quad_pts.cc diff --git a/test/agglomeration/reinit_cell_face_quad_pts.output b/test/polydeal/reinit_cell_face_quad_pts.output similarity index 100% rename from test/agglomeration/reinit_cell_face_quad_pts.output rename to test/polydeal/reinit_cell_face_quad_pts.output diff --git a/test/agglomeration/sparsity_agglomerated_tria.cc b/test/polydeal/sparsity_agglomerated_tria.cc similarity index 100% rename from test/agglomeration/sparsity_agglomerated_tria.cc rename to test/polydeal/sparsity_agglomerated_tria.cc diff --git a/test/agglomeration/sparsity_agglomerated_tria.output b/test/polydeal/sparsity_agglomerated_tria.output similarity index 100% rename from test/agglomeration/sparsity_agglomerated_tria.output rename to test/polydeal/sparsity_agglomerated_tria.output diff --git a/test/agglomeration/sparsity_agglomeration.svg b/test/polydeal/sparsity_agglomeration.svg similarity index 100% rename from test/agglomeration/sparsity_agglomeration.svg rename to test/polydeal/sparsity_agglomeration.svg diff --git a/test/agglomeration/t2.msh b/test/polydeal/t2.msh similarity index 100% rename from test/agglomeration/t2.msh rename to test/polydeal/t2.msh diff --git a/test/agglomeration/unstructured_grid.cc b/test/polydeal/unstructured_grid.cc similarity index 100% rename from test/agglomeration/unstructured_grid.cc rename to test/polydeal/unstructured_grid.cc diff --git a/test/agglomeration/unstructured_grid.output b/test/polydeal/unstructured_grid.output similarity index 100% rename from test/agglomeration/unstructured_grid.output rename to test/polydeal/unstructured_grid.output