Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test/t8_forest/* #687

Merged
merged 1 commit into from
Aug 23, 2023
Merged

Update test/t8_forest/* #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions test/t8_forest/t8_gtest_element_general_function.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
* - Add a test for different schemes as soon as they are implemented
*/

/* *INDENT-OFF* */
class forest_element_function: public testing::TestWithParam<std::tuple<t8_eclass, int> > {
protected:
void
Expand All @@ -68,7 +67,6 @@ class forest_element_function: public testing::TestWithParam<std::tuple<t8_eclas
t8_eclass_scheme_c *class_scheme;
t8_forest_t forest;
};
/* *INDENT-ON* */

TEST_P (forest_element_function, test_element_general_function)
{
Expand Down Expand Up @@ -105,7 +103,5 @@ TEST_P (forest_element_function, test_element_general_function)
} /* End of element loop */
}

/* *INDENT-OFF* */
INSTANTIATE_TEST_SUITE_P (t8_gtest_element_general_function, forest_element_function,
testing::Combine (testing::Range (T8_ECLASS_ZERO, T8_ECLASS_COUNT), testing::Range (0, 6)));
/* *INDENT-ON* */
3 changes: 1 addition & 2 deletions test/t8_forest/t8_gtest_element_volume.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ along with t8code; if not, write to the Free Software Foundation, Inc.,

/* Construct a forest of a hypercube with volume 1. If the element are refined uniformly
* all elements have volume 1/global_num_elements. */
/* *INDENT-OFF* */

class t8_forest_volume: public testing::TestWithParam<std::tuple<t8_eclass_t, int>> {
protected:
void
Expand All @@ -59,7 +59,6 @@ class t8_forest_volume: public testing::TestWithParam<std::tuple<t8_eclass_t, in
int level;
};

/* *INDENT-ON* */
/**
* Compute the volume of a pyramid descending of a root-pyramid with volume 1/3
* Pyramids need a special handling of the control-volume computation, because
Expand Down
4 changes: 0 additions & 4 deletions test/t8_forest/t8_gtest_find_owner.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <t8_forest/t8_forest_partition.h>
#include <t8_forest/t8_forest_private.h>

/* *INDENT-OFF* */
class forest_find_owner: public testing::TestWithParam<t8_eclass> {
protected:
void
Expand All @@ -49,7 +48,6 @@ class forest_find_owner: public testing::TestWithParam<t8_eclass> {
t8_cmesh_t cmesh;
t8_scheme_cxx_t *default_scheme;
};
/* *INDENT-ON* */

#if 0
/* Depending on an integer i create a different cmesh.
Expand Down Expand Up @@ -171,6 +169,4 @@ TEST_P (forest_find_owner, find_multiple_owners)
sc_array_reset (&owners);
}

/* *INDENT-OFF* */
INSTANTIATE_TEST_SUITE_P (t8_gtest_find_owner, forest_find_owner, testing::Range (T8_ECLASS_VERTEX, T8_ECLASS_COUNT));
/* *INDENT-ON* */
4 changes: 0 additions & 4 deletions test/t8_forest/t8_gtest_forest_commit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
* After these two forests are created, we check for equality.
*/

/* *INDENT-OFF* */
class forest_commit: public testing::TestWithParam<int> {
protected:
void
Expand All @@ -56,7 +55,6 @@ class forest_commit: public testing::TestWithParam<int> {
int cmesh_id;
t8_cmesh_t cmesh;
};
/* *INDENT-ON* */

/* Adapt a forest such that always the first child of a
* tree is refined and no other elements. This results in a highly
Expand Down Expand Up @@ -172,6 +170,4 @@ TEST_P (forest_commit, test_forest_commit)
t8_debugf ("Done testing forest commit.");
}

/* *INDENT-OFF* */
INSTANTIATE_TEST_SUITE_P (t8_gtest_forest_commit, forest_commit, testing::Range (0, t8_get_number_of_all_testcases ()));
/* *INDENT-ON* */
4 changes: 0 additions & 4 deletions test/t8_forest/t8_gtest_ghost_and_owner.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
* element is in face the owner that is stored in the ghost layer.
*/

/* *INDENT-OFF* */
class forest_ghost_owner: public testing::TestWithParam<int> {
protected:
void
Expand All @@ -57,7 +56,6 @@ class forest_ghost_owner: public testing::TestWithParam<int> {
t8_cmesh_t cmesh;
t8_scheme_cxx_t *scheme;
};
/* *INDENT-ON* */

static int
t8_test_gao_adapt (t8_forest_t forest, t8_forest_t forest_from, t8_locidx_t which_tree, t8_locidx_t lelement_id,
Expand Down Expand Up @@ -143,7 +141,5 @@ TEST_P (forest_ghost_owner, test_ghost_owner)
}
}

/* *INDENT-OFF* */
INSTANTIATE_TEST_SUITE_P (t8_gtest_ghost_and_owner, forest_ghost_owner,
testing::Range (0, t8_get_number_of_all_testcases ()));
/* *INDENT-ON* */
4 changes: 0 additions & 4 deletions test/t8_forest/t8_gtest_ghost_exchange.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
* in a second test, we store the element's linear id in the data array.
*/

/* *INDENT-OFF* */
class forest_ghost_exchange: public testing::TestWithParam<int> {
protected:
void
Expand All @@ -64,7 +63,6 @@ class forest_ghost_exchange: public testing::TestWithParam<int> {
t8_scheme_cxx_t *scheme;
t8_cmesh_t cmesh;
};
/* *INDENT-ON* */

static int
t8_test_exchange_adapt (t8_forest_t forest, t8_forest_t forest_from, t8_locidx_t which_tree, t8_locidx_t lelement_id,
Expand Down Expand Up @@ -196,7 +194,5 @@ TEST_P (forest_ghost_exchange, test_ghost_exchange)
}
}

/* *INDENT-OFF* */
INSTANTIATE_TEST_SUITE_P (t8_gtest_ghost_exchange, forest_ghost_exchange,
testing::Range (0, t8_get_number_of_all_testcases ()));
/* *INDENT-ON* */
4 changes: 0 additions & 4 deletions test/t8_forest/t8_gtest_half_neighbors.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <t8_forest/t8_forest_partition.h>
#include <t8_forest/t8_forest_private.h>

/* *INDENT-OFF* */
class forest_half_neighbors: public testing::TestWithParam<std::tuple<t8_eclass, int>> {
protected:
void
Expand All @@ -52,7 +51,6 @@ class forest_half_neighbors: public testing::TestWithParam<std::tuple<t8_eclass,
t8_scheme_cxx_t *default_scheme;
t8_element_t *neighbor;
};
/* *INDENT-ON* */

#if 0
/* Depending on an integer i create a different cmesh.
Expand Down Expand Up @@ -136,7 +134,5 @@ TEST_P (forest_half_neighbors, test_half_neighbors)
sc_array_reset (&owners);
}

/* *INDENT-OFF* */
INSTANTIATE_TEST_SUITE_P (t8_gtest_half_neighbors, forest_half_neighbors,
testing::Combine (testing::Range (T8_ECLASS_VERTEX, T8_ECLASS_COUNT), testing::Range (0, 3)));
/* *INDENT-ON* */
4 changes: 0 additions & 4 deletions test/t8_forest/t8_gtest_search.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <t8_forest/t8_forest_iterate.h>
#include <t8_schemes/t8_default/t8_default_cxx.hxx>

/* *INDENT-OFF* */
class forest_search: public testing::TestWithParam<std::tuple<t8_eclass, int>> {
protected:
void
Expand All @@ -53,7 +52,6 @@ class forest_search: public testing::TestWithParam<std::tuple<t8_eclass, int>> {
t8_forest_t forest;
t8_scheme_cxx_t *default_scheme;
};
/* *INDENT-ON* */

/* A search function that matches all elements.
* This function assumes that the forest user pointer is an sc_array
Expand Down Expand Up @@ -153,7 +151,5 @@ TEST_P (forest_search, test_search_one_query_matches_all)
sc_array_reset (&queries);
}

/* *INDENT-OFF* */
INSTANTIATE_TEST_SUITE_P (t8_gtest_search, forest_search,
testing::Combine (testing::Range (T8_ECLASS_VERTEX, T8_ECLASS_COUNT), testing::Range (0, 6)));
/* *INDENT-ON* */
4 changes: 0 additions & 4 deletions test/t8_forest/t8_gtest_transform.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <t8_forest/t8_forest_partition.h>
#include <t8_forest/t8_forest_private.h>

/* *INDENT-OFF* */
class forest_transform: public testing::TestWithParam<std::tuple<t8_eclass, int>> {
protected:
void
Expand Down Expand Up @@ -70,7 +69,6 @@ class forest_transform: public testing::TestWithParam<std::tuple<t8_eclass, int>
t8_forest_t forest;
int level;
};
/* *INDENT-ON* */

static void
t8_test_transform_element (t8_eclass_scheme_c *ts, const t8_element_t *elem, t8_eclass_t eclass)
Expand Down Expand Up @@ -178,8 +176,6 @@ TEST_P (forest_transform, test_forest_transform_elements)
}
}

/* *INDENT-OFF* */
INSTANTIATE_TEST_SUITE_P (t8_gtest_forest_transform, forest_transform,
testing::Combine (testing::Range (T8_ECLASS_QUAD, T8_ECLASS_TRIANGLE),
testing::Range (0, 6)));
/* *INDENT-ON* */