From 997797ab60d2d51f605dfb34bcf616b06876b829 Mon Sep 17 00:00:00 2001 From: Johannes Markert Date: Fri, 12 Apr 2024 16:24:08 +0200 Subject: [PATCH 1/4] Replace `bool` keyword with `int` in C header files. --- src/t8_cmesh.h | 4 ++-- src/t8_geometry/t8_geometry.h | 3 +-- .../t8_geometry_implementations/t8_geometry_analytic.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/t8_cmesh.h b/src/t8_cmesh.h index 41228d5b2a..53c9810707 100644 --- a/src/t8_cmesh.h +++ b/src/t8_cmesh.h @@ -96,7 +96,7 @@ t8_cmesh_is_committed (const t8_cmesh_t cmesh); * \param [in] cmesh This cmesh is examined. * \return True if the geometry of the cmesh is valid. */ -bool +int t8_cmesh_validate_geometry (const t8_cmesh_t cmesh); /** After a cmesh is committed, check whether all trees in a cmesh do have positive volume. @@ -107,7 +107,7 @@ t8_cmesh_validate_geometry (const t8_cmesh_t cmesh); * was called, do have positive geometric volume. * False otherwise. */ -bool +int t8_cmesh_no_negative_volume (t8_cmesh_t cmesh); #endif diff --git a/src/t8_geometry/t8_geometry.h b/src/t8_geometry/t8_geometry.h index bb10437ba7..0edc3e5a96 100644 --- a/src/t8_geometry/t8_geometry.h +++ b/src/t8_geometry/t8_geometry.h @@ -30,7 +30,6 @@ #include #include -#include /** This enumeration contains all possible geometries. */ typedef enum t8_geometry_type { @@ -109,7 +108,7 @@ t8_geometry_get_type (t8_cmesh_t cmesh, t8_gloidx_t gtreeid); * \param[in] gtreeid The global id of the tree * \return True if the tree with id \ref gtreeid has a negative volume. False otherwise. */ -bool +int t8_geometry_tree_negative_volume (const t8_cmesh_t cmesh, const t8_gloidx_t gtreeid); T8_EXTERN_C_END (); diff --git a/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h b/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h index c97ab843be..1be03e18ff 100644 --- a/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h +++ b/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h @@ -69,7 +69,7 @@ typedef void (*t8_geom_load_tree_data_fn) (t8_cmesh_t cmesh, t8_gloidx_t gtreeid /** * Definition for the negative volume function. */ -typedef bool (*t8_geom_tree_negative_volume_fn) (); +typedef int (*t8_geom_tree_negative_volume_fn) (); T8_EXTERN_C_BEGIN (); From 0ababded96821c6dc6a4a7ecd482193446ce219a Mon Sep 17 00:00:00 2001 From: Johannes Markert Date: Fri, 12 Apr 2024 16:36:52 +0200 Subject: [PATCH 2/4] Testing. --- .../t8_geometry_implementations/t8_geometry_analytic.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h b/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h index 1be03e18ff..629f74590a 100644 --- a/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h +++ b/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h @@ -66,11 +66,6 @@ typedef void (*t8_geom_analytic_jacobian_fn) (t8_cmesh_t cmesh, t8_gloidx_t gtre */ typedef void (*t8_geom_load_tree_data_fn) (t8_cmesh_t cmesh, t8_gloidx_t gtreeid, const void **tree_data); -/** - * Definition for the negative volume function. - */ -typedef int (*t8_geom_tree_negative_volume_fn) (); - T8_EXTERN_C_BEGIN (); /** Destroy a geometry analytic object. From 80e9c170ce1d9db5371bd02bdb637d328741ee73 Mon Sep 17 00:00:00 2001 From: Johannes Markert Date: Mon, 15 Apr 2024 10:35:14 +0200 Subject: [PATCH 3/4] Minor change. --- src/t8_geometry/t8_geometry.cxx | 2 +- .../t8_geometry_implementations/t8_geometry_analytic.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/t8_geometry/t8_geometry.cxx b/src/t8_geometry/t8_geometry.cxx index bdd4111a19..33396a962b 100644 --- a/src/t8_geometry/t8_geometry.cxx +++ b/src/t8_geometry/t8_geometry.cxx @@ -64,7 +64,7 @@ t8_geometry_get_type (t8_cmesh_t cmesh, t8_gloidx_t gtreeid) return cmesh->geometry_handler->get_tree_geometry_type (cmesh, gtreeid); } -bool +int t8_geometry_tree_negative_volume (const t8_cmesh_t cmesh, const t8_gloidx_t gtreeid) { return cmesh->geometry_handler->tree_negative_volume (cmesh, gtreeid); diff --git a/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h b/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h index 629f74590a..1be03e18ff 100644 --- a/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h +++ b/src/t8_geometry/t8_geometry_implementations/t8_geometry_analytic.h @@ -66,6 +66,11 @@ typedef void (*t8_geom_analytic_jacobian_fn) (t8_cmesh_t cmesh, t8_gloidx_t gtre */ typedef void (*t8_geom_load_tree_data_fn) (t8_cmesh_t cmesh, t8_gloidx_t gtreeid, const void **tree_data); +/** + * Definition for the negative volume function. + */ +typedef int (*t8_geom_tree_negative_volume_fn) (); + T8_EXTERN_C_BEGIN (); /** Destroy a geometry analytic object. From 96252e277dcbb9fc37cc3eb18d183b841798e717 Mon Sep 17 00:00:00 2001 From: Johannes Markert Date: Mon, 15 Apr 2024 12:37:13 +0200 Subject: [PATCH 4/4] Fixed ambigiuous function definitions. --- src/t8_cmesh/t8_cmesh.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/t8_cmesh/t8_cmesh.cxx b/src/t8_cmesh/t8_cmesh.cxx index c01ee35014..f3ab489374 100644 --- a/src/t8_cmesh/t8_cmesh.cxx +++ b/src/t8_cmesh/t8_cmesh.cxx @@ -123,7 +123,7 @@ t8_cmesh_is_committed (const t8_cmesh_t cmesh) } #ifdef T8_ENABLE_DEBUG -bool +int t8_cmesh_validate_geometry (const t8_cmesh_t cmesh) { /* Geometry handler is not constructed yet */ @@ -532,7 +532,7 @@ t8_cmesh_tree_vertices_negative_volume (const t8_eclass_t eclass, const double * * Returns true if all trees have positive volume. Returns also true if no geometries are * registered yet, since the volume computation depends on the used geometry. */ -bool +int t8_cmesh_no_negative_volume (t8_cmesh_t cmesh) { bool res = false;