diff --git a/benchmarks/t8_time_fractal.cxx b/benchmarks/t8_time_fractal.cxx index 739c376888..46619290fc 100644 --- a/benchmarks/t8_time_fractal.cxx +++ b/benchmarks/t8_time_fractal.cxx @@ -35,7 +35,7 @@ #include /* Refine a tree with quadrilateral elements. - * At every second adaptcall (level is even) remove the central elements + * At every second adaptcall (level is even) remove the central elements * of the mesh or leave them untouched. Refine the remaining elements. * * |x|x|x|x| |x|x|x|x| @@ -75,7 +75,7 @@ t8_adapt_menger_quad (t8_forest_t forest, [[maybe_unused]] t8_forest_t forest_fr } /* Refine a tree with triangular elements. - * At every adaptcall remove the central element with child id 2 + * At every adaptcall remove the central element with child id 2 * of the mesh or leave it untouched. Refine the remaining elements. */ static int @@ -102,7 +102,7 @@ t8_adapt_sierpinski_tri (t8_forest_t forest, [[maybe_unused]] t8_forest_t forest } /* Refine a tree with hexahedral elements. - * At every second adaptcall (level is even) remove the central elements + * At every second adaptcall (level is even) remove the central elements * of the mesh or leave them untouched. Refine the remaining elements. */ static int @@ -153,7 +153,7 @@ t8_adapt_menger_hex (t8_forest_t forest, [[maybe_unused]] t8_forest_t forest_fro } /* Refine a tree with tetrahedral elements. - * At every adaptcall remove the elements with child id 2, 3, 5 and 6 + * At every adaptcall remove the elements with child id 2, 3, 5 and 6 * of the mesh or leave it untouched. Refine the remaining elements. */ static int @@ -180,7 +180,7 @@ t8_adapt_sierpinski_tet (t8_forest_t forest, [[maybe_unused]] t8_forest_t forest } /* Refine a tree with prism elements. - * At every adaptcall remove the elements with child id 2 and 6 + * At every adaptcall remove the elements with child id 2 and 6 * of the mesh or leave it untouched. Refine the remaining elements. */ static int @@ -207,7 +207,7 @@ t8_adapt_sierpinski_prism (t8_forest_t forest, [[maybe_unused]] t8_forest_t fore } /* Refine a tree with pyramid elements. - * At every adaptcall remove the elements with child id 1, 3, 5, 6 and 8 + * At every adaptcall remove the elements with child id 1, 3, 5, 6 and 8 * of the mesh or leave it untouched. Refine the remaining elements. */ static int @@ -252,7 +252,7 @@ t8_adapt_coarse ([[maybe_unused]] t8_forest_t forest, [[maybe_unused]] t8_forest * \param [in] level_end Final level of the fractal. * \param [in] iterative 1 if fractal is constructed iterative * 0 if recursive - * \param [in] remove 1 if elements that will not get refined will be + * \param [in] remove 1 if elements that will not get refined will be * removed instead. * \param [in] trees Number of trees the forest will contain. * \param [in] eclass Element type for each tree. @@ -267,12 +267,12 @@ t8_construct_fractal (int level_initial, int level_end, const int iterative, con T8_ASSERT (eclass == T8_ECLASS_QUAD || eclass == T8_ECLASS_TRIANGLE || eclass == T8_ECLASS_HEX || eclass == T8_ECLASS_TET || eclass == T8_ECLASS_PRISM || eclass == T8_ECLASS_PYRAMID); - /* Quadrilateral and hexahedron elements must have an even initial level + /* Quadrilateral and hexahedron elements must have an even initial level * greater 0, such that the refinement pattern can be applied. */ T8_ASSERT ((eclass == T8_ECLASS_QUAD || eclass == T8_ECLASS_HEX) && level_initial > 1 && 0 == level_initial % 2 && 0 == level_end % 2); - /* Set up userdata to adapt forest. + /* Set up userdata to adapt forest. * user_data[0] -> level_end * user_data[1] -> {0, -2} -> return for adapt callback */ int user_data[2] = { level_end, (remove == 1) ? -2 : remove }; @@ -385,7 +385,7 @@ main (int argc, char **argv) if (sreturnA > BUFSIZ || sreturnB > BUFSIZ) { /* The usage string or help message was truncated */ - /* Note: gcc >= 7.1 prints a warning if we + /* Note: gcc >= 7.1 prints a warning if we * do not check the return value of snprintf. */ t8_debugf ("Warning: Truncated usage string and help message to '%s' and '%s'\n", usage, help); } @@ -439,7 +439,7 @@ main (int argc, char **argv) sc_options_add_int (opt, 'c', "coarse", &coarse, 0, "Number of times to coarse hole mesh."); sc_options_add_int (opt, 'r', "runs", &runs, 1, "Number of times the fractal gets constructed. The default is 1.\n" - "\t\t\t\t Note, the runntime summs up."); + "\t\t\t\t Note, the runtime summs up."); int parsed = sc_options_parse (t8_get_package_id (), SC_LP_ERROR, opt, argc, argv); if (helpme) { diff --git a/doc/author_lampert.txt b/doc/author_lampert.txt new file mode 100644 index 0000000000..a4d0ead5e9 --- /dev/null +++ b/doc/author_lampert.txt @@ -0,0 +1 @@ +I place my contributions to t8code under the FreeBSD license. Joshua Lampert (joshua.lampert@uni-hamburg.de) diff --git a/src/t8_cmesh/t8_cmesh_commit.cxx b/src/t8_cmesh/t8_cmesh_commit.cxx index 60f4168ce1..132b62755c 100644 --- a/src/t8_cmesh/t8_cmesh_commit.cxx +++ b/src/t8_cmesh/t8_cmesh_commit.cxx @@ -40,8 +40,8 @@ /** * A struct to hold the information about a ghost facejoin. - * - * It contains the global id of the ghost, the local id of the ghost, + * + * It contains the global id of the ghost, the local id of the ghost, * and the current number of inserted ghost attributes. */ typedef struct ghost_facejoins_struct @@ -514,7 +514,7 @@ t8_cmesh_commit_partitioned_new (t8_cmesh_t cmesh, sc_MPI_Comm comm) /** * Commit a cmesh from stash. - * + * * \param[in] cmesh The cmesh to commit. * \param[in] comm The MPI communicator to use. */ @@ -534,7 +534,7 @@ t8_cmesh_commit_from_stash (t8_cmesh_t cmesh, sc_MPI_Comm comm) } /* TODO: set boundary face connections here. - * not trivial if replicated and not level 3 face_knowledg + * not trivial if replicated and not level 3 face_knowledge * Edit: boundary face is default. If no face-connection is added then * we assume a boundary face. * TODO: Implement a debug check for mesh consistency between processes. diff --git a/src/t8_cmesh/t8_cmesh_trees.cxx b/src/t8_cmesh/t8_cmesh_trees.cxx index 40b4f2e886..7b382d0969 100644 --- a/src/t8_cmesh/t8_cmesh_trees.cxx +++ b/src/t8_cmesh/t8_cmesh_trees.cxx @@ -214,7 +214,7 @@ t8_cmesh_trees_start_part (const t8_cmesh_trees_t trees, const int proc, const t } /** - * + * * Helper struct for sorting the number of ghost attributes by global id. * In order to sort them, we need the part ghost id to access the global id. * Thus, we store both the part id and the number of attributes. @@ -262,7 +262,7 @@ t8_cmesh_allocate_ghost_num_atts_array (t8_locidx_t part_num_ghosts) * stored temporarily in the att_offset variable * we grow the part array by the needed amount of memory and set the * offsets appropriately */ -/* The workflow can be: call start_part, set tree and ghost classes maually, call +/* The workflow can be: call start_part, set tree and ghost classes manually, call * init_attributes, call finish_part, successively call add_attributes * and also set all face neighbors (TODO: write function)*/ void diff --git a/src/t8_cmesh_readmshfile.h b/src/t8_cmesh_readmshfile.h index a40c974406..2e62f10098 100644 --- a/src/t8_cmesh_readmshfile.h +++ b/src/t8_cmesh_readmshfile.h @@ -21,8 +21,8 @@ */ /** \file t8_cmesh_readmshfile.h - * We define function here that serve to open a mesh file generated by - * GMSH and consructing a cmesh from it. + * We define a function here that serves to open a mesh file generated by + * GMSH and constructing a cmesh from it. */ #ifndef T8_CMESH_READMSHFILE_H diff --git a/src/t8_cmesh_triangle.h b/src/t8_cmesh_triangle.h index 70854678cf..df32679795 100644 --- a/src/t8_cmesh_triangle.h +++ b/src/t8_cmesh_triangle.h @@ -21,8 +21,8 @@ */ /** \file t8_cmesh_triangle.h - * We define function here that serve to open a mesh file generated by - * TRIANGLE and consructing a cmesh from it. + * We define a function here that serves to open a mesh file generated by + * TRIANGLE and constructing a cmesh from it. */ #ifndef T8_CMESH_TRIANGLE_H diff --git a/src/t8_forest/t8_forest_balance.cxx b/src/t8_forest/t8_forest_balance.cxx index 296c12ccf2..7381628049 100644 --- a/src/t8_forest/t8_forest_balance.cxx +++ b/src/t8_forest/t8_forest_balance.cxx @@ -39,8 +39,8 @@ T8_EXTERN_C_BEGIN (); * TODO: We currently do not adapt recursively since some functions such * as half neighbor computation require the forest to be committed. Thus, * we pass forest_from as a parameter. But doing so is not valid anymore - * if we refine recursively. - * + * if we refine recursively. + * * \param[in, out] forest The forest to be adapted / balanced. * \param[in] forest_from The forest from which the current one is derived. * \param[in] ltree_id The local id of the tree the element is in. @@ -50,7 +50,7 @@ T8_EXTERN_C_BEGIN (); * \param[in] is_family A switch indicating whether the passed elements form a family. * \param[in] num_elements The number of elements passed as input. * \param[in] elements The elements array. - * + * * \return 1 if the element(s) has/have to be refined, 0 otherwise. */ static int @@ -113,8 +113,8 @@ t8_forest_balance_adapt (t8_forest_t forest, t8_forest_t forest_from, const t8_l } /** - * Collective function to compute the maximum occurring refinement level in a forest - * + * Collective function to compute the maximum occurring refinement level in a forest + * * \param[in,out] forest The forest which the maximum refinement level is computed for and stored in. */ static void @@ -206,7 +206,7 @@ t8_forest_balance (t8_forest_t forest, int repartition) t8_forest_set_ghost (forest_temp, 1, T8_GHOST_FACES); } forest_temp->t8code_data = &done; - /* If profiling is enabled, measure ghost/adapt rumtimes */ + /* If profiling is enabled, measure ghost/adapt runtimes */ if (forest->profile != NULL) { t8_forest_set_profiling (forest_temp, 1); } @@ -247,7 +247,7 @@ t8_forest_balance (t8_forest_t forest, int repartition) forest_partition->maxlevel_existing = forest_temp->maxlevel_existing; t8_forest_set_partition (forest_partition, forest_temp, 0); t8_forest_set_ghost (forest_partition, 1, T8_GHOST_FACES); - /* If profiling is enabled, measure partition rumtimes */ + /* If profiling is enabled, measure partition runtimes */ if (forest->profile != NULL) { t8_forest_set_profiling (forest_partition, 1); } diff --git a/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.cxx b/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.cxx index 1f2cb3d2bc..5484a8402a 100644 --- a/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.cxx +++ b/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.cxx @@ -562,7 +562,7 @@ t8_default_scheme_quad::element_get_first_descendant_face (const t8_element_t *e /* Get the first corner of q that belongs to face */ first_face_corner = p4est_face_corners[face][0]; - /* Construce the descendant in that corner */ + /* Construct the descendant in that corner */ p4est_quadrant_corner_descendant (q, desc, first_face_corner, level); } @@ -580,7 +580,7 @@ t8_default_scheme_quad::element_get_last_descendant_face (const t8_element_t *el /* Get the last corner of q that belongs to face */ last_face_corner = p4est_face_corners[face][1]; - /* Construce the descendant in that corner */ + /* Construct the descendant in that corner */ p4est_quadrant_corner_descendant (q, desc, last_face_corner, level); } diff --git a/src/t8_vtk/t8_vtk_writer.hxx b/src/t8_vtk/t8_vtk_writer.hxx index df5b32b70e..763ca192d3 100644 --- a/src/t8_vtk/t8_vtk_writer.hxx +++ b/src/t8_vtk/t8_vtk_writer.hxx @@ -57,23 +57,23 @@ #endif /* T8_ENABLE_VTK */ /** - * A class that controls the writing of vtk files for cmeshes or forests. - * - * \tparam grid_t can be a forest or a cmesh. + * A class that controls the writing of vtk files for cmeshes or forests. + * + * \tparam grid_t can be a forest or a cmesh. */ template class vtk_writer { public: /** * Construct a new vtk writer object. All parameters are set to false by default. By default no data is used and - * \a num_data is set to zero. A default \a fileprefix is NOT given. - * + * \a num_data is set to zero. A default \a fileprefix is NOT given. + * * \param write_treeid True, if we want to write the tree id of every element. * \param write_mpirank True, if we want to write the mpirankof every element. * \param write_level True, if we want to write the level of every element. Uses level 0 if used for a cmesh. * \param write_element_id True, if we want to write the element id of every element. Ignored if used for a cmesh. - * \param write_ghosts True, if we want to write the ghost elements, too. - * \param curved_flag True, if we want to use quadratic vtk cells. Uses the geometry of the grid to evaluate points between corners. + * \param write_ghosts True, if we want to write the ghost elements, too. + * \param curved_flag True, if we want to use quadratic vtk cells. Uses the geometry of the grid to evaluate points between corners. * \param fileprefix The prefix of the output-file. * \param num_data The number of data-fields to print. * \param data The data to use. @@ -90,9 +90,9 @@ class vtk_writer { /** * Construct a new vtk writer object. All parameters are set to false. - * - * \param[in] fileprefix - * \param[in] comm + * + * \param[in] fileprefix + * \param[in] comm */ vtk_writer (std::string fileprefix, sc_MPI_Comm comm): fileprefix (fileprefix), comm (comm) { @@ -114,10 +114,10 @@ class vtk_writer { /** * A vtk-writer function that uses the vtk API. - * + * * \param[in] grid The forest or cmesh that is translated. - * \return true, if writing was successful. - * \return false if writing was not successful. + * \return true, if writing was successful. + * \return false if writing was not successful. */ bool write_with_API (const grid_t grid) @@ -127,17 +127,17 @@ class vtk_writer { /** * A vtk-writer function that uses the vtk API - * + * * \param[in] grid The forest or cmesh that is translated - * \return true - * \return false + * \return true + * \return false */ bool write_ASCII (const grid_t grid); /** * Set the write treeid flag. Set to true, if you want to write the tree id of every element. - * + * * \param[in] write_treeid true or false */ inline void @@ -148,7 +148,7 @@ class vtk_writer { /** * Set the write mpirank flag. Set to true, if you want to write the mpirank of every element. - * + * * \param[in] write_mpirank true or false */ inline void @@ -159,7 +159,7 @@ class vtk_writer { /** * Set the write level flag. Set to true, if you want to write the level of every element. - * + * * \param[in] write_level true or false */ inline void @@ -170,7 +170,7 @@ class vtk_writer { /** * Set the write element id flag. Set to true, if you want to write the element id of every element. - * + * * \param[in] write_element_id true or false */ inline void @@ -181,7 +181,7 @@ class vtk_writer { /** * Set the write ghosts flag. Set to true, if you want to write the ghost elements, too. - * + * * \param[in] write_ghosts true or false */ inline void @@ -191,9 +191,9 @@ class vtk_writer { } /** - * Set the curved flag. Set to true, if you want to use quadratic vtk cells. + * Set the curved flag. Set to true, if you want to use quadratic vtk cells. * Uses the geometry of the grid to evaluate points between corners. - * + * * \param[in] curved_flag true or false */ inline void @@ -204,7 +204,7 @@ class vtk_writer { /** * Set the fileprefix for the output files. - * \param[in] fileprefix + * \param[in] fileprefix */ inline void set_fileprefix (std::string fileprefix) @@ -217,14 +217,14 @@ class vtk_writer { /** * Translate a single element from the forest into a vtkCell and fill the vtkArrays with * the data related to the element (not element_data). - * - * \tparam grid_t + * + * \tparam grid_t * \param[in] grid A forest or a cmesh. - * \param element A pointer to an element. Only necessary if a forest is used. Will be ignored if \a grid is a cmesh. + * \param element A pointer to an element. Only necessary if a forest is used. Will be ignored if \a grid is a cmesh. * \param[in] itree The local id of the current tree. * \param[in] offset offset the ids by the number of elements/trees of the previous processes. * \param[in] is_ghost Flag to decide whether we write a ghost element or not. - * \param elem_id The id for the element to use by vtk. + * \param elem_id The id for the element to use by vtk. * \param point_id The next id to use to identify vtkpoints. * \param[in, out] cellTypes An int array to fill with the type of each element/tree of \a grid * \param[in, out] points A vtkMergePoints structure to fill with points representing the points in the grid (avoid duplicates) @@ -234,7 +234,7 @@ class vtk_writer { * \param[in, out] vtk_level A vtk array to fill with the level of each element/tree of \a grid. * \param[in, out] vtk_element_id A vtk array to fill with the id of each element/tree of \a grid. * \param[in] mergePoints A bool flag if points in the output should be merged (default = true). - * + * */ void t8_grid_element_to_vtk_cell (const grid_t grid, const t8_element_t *element, const t8_locidx_t itree, @@ -311,8 +311,8 @@ class vtk_writer { /** * Iterate over all trees (and if desired ghost trees to) and call the function that translate the tree into. - * - * \tparam grid_t + * + * \tparam grid_t * \param[in] grid A forest or a cmesh. * \param[in, out] unstructuredGrid The unstructuredGrid to fill. * \param[in, out] vtk_treeid A vtk array to fill with the tree ids of \a grid. @@ -340,8 +340,8 @@ class vtk_writer { long int *point_id, const t8_gloidx_t offset, const bool ghosts, const t8_locidx_t itree); /** - * Construct an unstructuredGrid from either a forest or cmesh. The flags can be used to define what parameters we want to write. - * + * Construct an unstructuredGrid from either a forest or cmesh. The flags can be used to define what parameters we want to write. + * * \param[in] grid A forest or a cmesh. * \param[in, out] unstructuredGrid An unstructuredGrid that we want to fill with the data of \a grid. */ @@ -395,7 +395,7 @@ class vtk_writer { vtk_level->Allocate (num_cells); vtk_element_id->Allocate (num_cells); - /* Initialie vtkMergePoints for insertion. It needs the bounds to create the internal acceleration structure */ + /* Initialize vtkMergePoints for insertion. It needs the bounds to create the internal acceleration structure */ points->InitPointInsertion (points_store, bounds); /* Iterate over all trees and translate them. */ @@ -435,7 +435,7 @@ class vtk_writer { unstructuredGrid->GetCellData ()->AddArray (vtk_element_id); } - /* Write the user defined data fields. For that we iterate over the idata, set the name, the array and then give + /* Write the user defined data fields. For that we iterate over the idata, set the name, the array and then give * this data to the unstructured Grid Object.We differentiate between scalar and vector data. */ const t8_locidx_t num_elements = grid_local_num_elements (grid); @@ -465,7 +465,7 @@ class vtk_writer { /** * Write a vtk file given a forest or a cmesh. - * + * * \param[in] grid a forest or a cmesh that will be translated into a vtk-file. * \return true if writing was successful. * \return false if writing was not successful. @@ -476,9 +476,9 @@ class vtk_writer { #if T8_ENABLE_VTK T8_ASSERT (!fileprefix.empty ()); - /* - * Write file: First we construct the unstructured Grid that will store the points and elements. It requires - * information about the points(coordinates, stored in the points object) and the cells(cellTypes and which points + /* + * Write file: First we construct the unstructured Grid that will store the points and elements. It requires + * information about the points(coordinates, stored in the points object) and the cells(cellTypes and which points * belong to this cell). */ vtkSmartPointer unstructuredGrid = vtkSmartPointer::New (); @@ -488,10 +488,10 @@ class vtk_writer { vtkSmartPointer pwriterObj = vtkSmartPointer::New (); t8_grid_to_vtkUnstructuredGrid (grid, unstructuredGrid); /* - * Get/Set whether the appended data section is base64 encoded. - * If encoded, reading and writing will be slower, but the file - * will be fully valid XML and text-only. - * If not encoded, the XML specification will be violated, + * Get/Set whether the appended data section is base64 encoded. + * If encoded, reading and writing will be slower, but the file + * will be fully valid XML and text-only. + * If not encoded, the XML specification will be violated, * but reading and writing will be fast. The default is to do the encoding. * Documentation: https://vtk.org/doc/release/5.0/html/a02260.html#z3560_2 */ @@ -503,10 +503,10 @@ class vtk_writer { pwriterObj->SetFileName (mpifilename.c_str ()); /* - * Since we want to write multiple files, the processes + * Since we want to write multiple files, the processes * have to communicate. Therefore, we define the communicator - * vtk_comm and set it as the communicator. - * We have to set a controller for the pwriterObj, + * vtk_comm and set it as the communicator. + * We have to set a controller for the pwriterObj, * therefore we define the controller vtk_mpi_ctrl. */ #if T8_ENABLE_MPI @@ -526,7 +526,7 @@ class vtk_writer { * process. Then we can set the inputData for the writer: * We want to write the unstructured Grid, update the writer * and then write. - * + * * Note: We could write more than one file per process here, if desired. */ int mpisize; diff --git a/test/t8_cmesh/t8_gtest_cmesh_vertex_conn_tree_to_vertex.cxx b/test/t8_cmesh/t8_gtest_cmesh_vertex_conn_tree_to_vertex.cxx index e5ae977a35..a813539c2d 100644 --- a/test/t8_cmesh/t8_gtest_cmesh_vertex_conn_tree_to_vertex.cxx +++ b/test/t8_cmesh/t8_gtest_cmesh_vertex_conn_tree_to_vertex.cxx @@ -202,7 +202,7 @@ class cmesh_vertex_conn_ttv_with_core_classes_temp: // Reactive this line when we enable the tests with derived attributes TEST_P (cmesh_vertex_conn_ttv, get_global) #else -// Delete this line and the cmesh_vertex_conn_ttv_temp class wehen we enable the tests with derived attributes +// Delete this line and the cmesh_vertex_conn_ttv_temp class when we enable the tests with derived attributes TEST_P (cmesh_vertex_conn_ttv_with_core_classes_temp, get_global) #endif { @@ -232,7 +232,7 @@ TEST_P (cmesh_vertex_conn_ttv_with_core_classes_temp, get_global) // Reactive this line when we enable the tests with derived attributes TEST_P (cmesh_vertex_conn_ttv_with_core_classes, get_global) #else -// Delete this line and the cmesh_vertex_conn_ttv_temp class wehen we enable the tests with derived attributes +// Delete this line and the cmesh_vertex_conn_ttv_temp class when we enable the tests with derived attributes TEST_P (cmesh_vertex_conn_ttv_with_core_classes_temp, convert_to_vtt) #endif { @@ -388,7 +388,7 @@ class cmesh_vertex_conn_ttv_with_cmesh_functions_temp: // Reactive this line when we enable the tests with derived attributes TEST_P (cmesh_vertex_conn_ttv, get_global) #else -// Delete this line and the cmesh_vertex_conn_ttv_temp class wehen we enable the tests with derived attributes +// Delete this line and the cmesh_vertex_conn_ttv_temp class when we enable the tests with derived attributes TEST_P (cmesh_vertex_conn_ttv_with_cmesh_functions_temp, get_global) #endif { diff --git a/test/t8_forest/t8_gtest_partition_data.cxx b/test/t8_forest/t8_gtest_partition_data.cxx index 1e0fa96456..53005d74f7 100644 --- a/test/t8_forest/t8_gtest_partition_data.cxx +++ b/test/t8_forest/t8_gtest_partition_data.cxx @@ -196,7 +196,7 @@ TestPartitionData (const t8_forest_t initial_forest, const t8_forest_t partition } /** - * \brief An examplary adaptation function which refines only the the first global tree in the forest + * \brief An exemplary adaptation function which refines only the the first global tree in the forest * to a pre-set refinement level. */ static int @@ -244,7 +244,7 @@ TEST_P (t8_test_partition_data_test, test_partition_data) t8_cmesh_t cmesh = t8_cmesh_new_hypercube (eclass, sc_MPI_COMM_WORLD, 0, 0, 0); t8_forest_t base_forest = t8_forest_new_uniform (cmesh, scheme, 1, 0, sc_MPI_COMM_WORLD); - /* Adapt the forest examplary. */ + /* Adapt the forest exemplary. */ t8_forest_t initial_forest = t8_forest_new_adapt (base_forest, t8_test_partition_data_adapt, 1, 0, NULL); /* Reference the forest in order to keep it after the partition step. */ @@ -257,7 +257,7 @@ TEST_P (t8_test_partition_data_test, test_partition_data) t8_forest_set_partition (partitioned_forest, initial_forest, partition_for_coarsening); t8_forest_commit (partitioned_forest); - /* Test the examplary partition_data with some arithmetic data types as well as with a custom struct. */ + /* Test the exemplary partition_data with some arithmetic data types as well as with a custom struct. */ TestPartitionData (initial_forest, partitioned_forest); TestPartitionData (initial_forest, partitioned_forest); TestPartitionData (initial_forest, partitioned_forest); diff --git a/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_cad.cxx b/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_cad.cxx index f1b95766b6..f5b1a25909 100644 --- a/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_cad.cxx +++ b/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_cad.cxx @@ -54,18 +54,18 @@ /* In this file we collect tests for t8code's OpenCASCADE geometry module. * These tests are - * - linked_edges: Checks if the geometry mapping works. - * We define an OpenCASCADE curve and link it to an edge of a hexahedron. + * - linked_edges: Checks if the geometry mapping works. + * We define an OpenCASCADE curve and link it to an edge of a hexahedron. * After that we probe whether the correct coordinates inside the hexahedron are returned. * We repeat this check for all 12 edges. - * - linked_faces: Checks if the geometry mapping works. - * We define an OpenCASCADE surface and link it to a face of a hexahedron. + * - linked_faces: Checks if the geometry mapping works. + * We define an OpenCASCADE surface and link it to a face of a hexahedron. * After that we probe whether the correct coordinates inside the hexahedron are returned. * We repeat this check for all 6 faces. * - jacobian: Checks the resulting jacobian of an identity. */ -/** Euler rotation around intrinsic zxz. +/** Euler rotation around intrinsic zxz. * \param [in] pos_vec Position vector of three dimensional points to rotate. * \param [in] rot_vec Three dimensional rotation vector around z, x and z in rad. * \param [out] res_vec Vector for resulting points. @@ -225,7 +225,7 @@ t8_create_cad_hypercube ([[maybe_unused]] double *rot_vec, [[maybe_unused]] int parameters, 2 * sizeof (double), 0); } else { - /* Even if we do not want to link any geometry to the edges or faces, + /* Even if we do not want to link any geometry to the edges or faces, * we have to create a geometry. Hence a cad geometry can only be created * with an actual shape, we just create a geometry with a curve and do not * link the curve to any edge. */ @@ -273,21 +273,21 @@ t8_test_geometry_cad_hex (double *rot_vec, int face, int edge, double *parameter TEST (t8_gtest_geometry_cad_hex, linked_faces) { /* clang-format off */ - double test_ref_coords[24] = { 0.1, 0.1, 0.1, - 0.8, 0.1, 0.1, + double test_ref_coords[24] = { 0.1, 0.1, 0.1, + 0.8, 0.1, 0.1, 0.15, 0.9, 0.1, 0.9, 0.9, 0.3, - 0.3, 0.1, 0.7, - 0.9, 0.25, 0.95, - 0.1, 0.9, 0.9, + 0.3, 0.1, 0.7, + 0.9, 0.25, 0.95, + 0.1, 0.9, 0.9, 0.95, 0.85, 0.8 }; - const t8_vec<24> surface_test_return_coords ({ 0.0396282769, 0.1897542602, 0.0396282769, - 0.8553975402, 0.1510451803, -0.0012778561, - 0.1434278361, 0.9117760771, 0.0909403721, - 0.9149739120, 0.8893780561, 0.2953610950, + const t8_vec<24> surface_test_return_coords ({ 0.0396282769, 0.1897542602, 0.0396282769, + 0.8553975402, 0.1510451803, -0.0012778561, + 0.1434278361, 0.9117760771, 0.0909403721, + 0.9149739120, 0.8893780561, 0.2953610950, 0.2190065733, 0.1000000000, 0.7809934267, - 0.9318450385, 0.1898146343, 0.9989190836, - 0.0932920308, 0.9000000000, 0.9067079692, + 0.9318450385, 0.1898146343, 0.9989190836, + 0.0932920308, 0.9000000000, 0.9067079692, 0.9673042609, 0.8312979801, 0.8063743210 }); /* clang-format off */ @@ -316,21 +316,21 @@ TEST (t8_gtest_geometry_cad_hex, linked_faces) TEST (t8_gtest_geometry_cad_hex, linked_edges) { /* clang-format off */ - double test_ref_coords[24] = { 0.1, 0.1, 0.1, - 0.8, 0.1, 0.1, - 0.15, 0.9, 0.1, + double test_ref_coords[24] = { 0.1, 0.1, 0.1, + 0.8, 0.1, 0.1, + 0.15, 0.9, 0.1, 0.9, 0.9, 0.3, - 0.3, 0.1, 0.7, - 0.9, 0.25, 0.95, - 0.1, 0.9, 0.9, + 0.3, 0.1, 0.7, + 0.9, 0.25, 0.95, + 0.1, 0.9, 0.9, 0.95, 0.85, 0.8 }; - const t8_vec<24> curve_test_return_coords ({ 0.0955204602, 0.2235162028, 0.1217553783, - 0.7995278713, -0.0659838746, 0.2083328730, - 0.1494299582, 0.9170222805, 0.1069555502, - 0.8999105642, 0.8892289094, 0.3015732294, + const t8_vec<24> curve_test_return_coords ({ 0.0955204602, 0.2235162028, 0.1217553783, + 0.7995278713, -0.0659838746, 0.2083328730, + 0.1494299582, 0.9170222805, 0.1069555502, + 0.8999105642, 0.8892289094, 0.3015732294, 0.2987855815, 0.1481519479, 0.7726155646, - 0.8999520880, 0.2442297729, 0.9508428015, - 0.0999446970, 0.9015248914, 0.9002685849, + 0.8999520880, 0.2442297729, 0.9508428015, + 0.0999446970, 0.9015248914, 0.9002685849, 0.9499697383, 0.8472575225, 0.7998496263 }); /* clang-format on */ @@ -418,7 +418,7 @@ t8_create_cad_reference_tet ([[maybe_unused]] int face, [[maybe_unused]] int edg parameters, 2 * sizeof (double), 0); } else { - /* Even if we do not want to link any geometry to the edges or faces, + /* Even if we do not want to link any geometry to the edges or faces, * we have to create a geometry. Hence a cad geometry can only be created * with an actual shape, we just create a geometry with a curve and do not * link the curve to any edge. */ @@ -445,8 +445,8 @@ t8_test_geometry_cad_tet (const int face, const int edge, double *parameters, do const t8_vec &test_return_coords) { /* 4 coords for face --> 3 vertices of face & element centroid - * 2 coords for edge --> 2 vertices of edge - * muliplied by 3 it is equal to the dimension template parameter + * 2 coords for edge --> 2 vertices of edge + * multiplied by 3 it is equal to the dimension template parameter */ const int num_coords = (face >= 0 ? 4 : 2); t8_vec out_coords; @@ -530,8 +530,8 @@ TEST (t8_gtest_geometry_cad, jacobian) t8_cmesh_t cmesh; double jacobian[9], rot_vec[3] = { 0, 0, 0 }, ref_coords[3] = { 0.5, 0.5, 0.5 }; /* clang-format off */ - double jacobian_expect[9] = { 1, 0, 0, - 0, 1, 0, + double jacobian_expect[9] = { 1, 0, 0, + 0, 1, 0, 0, 0, 1 }; /* clang-format on */ cmesh = t8_create_cad_hypercube (rot_vec, -1, -1, NULL); @@ -550,27 +550,27 @@ class class_2d_element_cad_curve: public testing::TestWithParam (GetParam ()); - /* curvature prescibes if the linear of curved curve is used */ + /* curvature prescribes if the linear of curved curve is used */ curvature = std::get<1> (GetParam ()); T8_ASSERT (0 <= eclass && eclass < T8_ECLASS_COUNT); Handle_Geom_Curve cad_curve_linear, cad_curve_curved; TColgp_Array1OfPnt point_array_linear (1, 2); TColgp_Array1OfPnt point_array_curved (1, 3); - /* LINEAR + /* LINEAR * x--> u-parameter - * + * * curve * ---------------------------------- - * + * * 0 1 - * + * * CURVED * x--> u-parameter - * + * * ----____ curve ____---- * ----_________---- - * + * * 0 0.5 1 */ @@ -800,7 +800,7 @@ class class_2d_element_curved_cad_surface: public testing::TestWithParam u-parameter * | * v v-parameter - * + * * x -> shifted point to create curved surface * * point_array 1 2 3 @@ -952,7 +952,7 @@ t8_create_cad_reference_prism ([[maybe_unused]] int face, [[maybe_unused]] int e parameters, 2 * sizeof (double), 0); } else { - /* Even if we do not want to link any geometry to the edges or faces, + /* Even if we do not want to link any geometry to the edges or faces, * we have to create a geometry. Hence a cad geometry can only be created * with an actual shape, we just create a geometry with a curve and do not * link the curve to any edge. */ diff --git a/test/t8_geometry/t8_gtest_geometry_triangular_interpolation.cxx b/test/t8_geometry/t8_gtest_geometry_triangular_interpolation.cxx index d549c8ff0a..ea91fda765 100644 --- a/test/t8_geometry/t8_gtest_geometry_triangular_interpolation.cxx +++ b/test/t8_geometry/t8_gtest_geometry_triangular_interpolation.cxx @@ -28,19 +28,19 @@ /* In this file we test the functionality of t8_geom_triangular_interpolation. * The function maps reference coordinates inside the reference triangle or tetrahedron - * to the coordinate space of a triagle or tetrahedron given by its corner coordinates. + * to the coordinate space of a triangle or tetrahedron given by its corner coordinates. * We currently check that the reference coordinates of the corners are mapped correctly * to the corners of the interpolated triangle/tet. */ /* TODO: - * - Check corner_value_dim > 1 + * - Check corner_value_dim > 1 * - Check different coefficient coordinates (for example midpoint) * - Check different corner values * - The 2d and 3d example contain a lot of nearly duplicate code. * Can we simplify? */ -/* Check that the corner interpolation coordinates are +/* Check that the corner interpolation coordinates are * mapped to the corners of a triangle. */ TEST (triangular_interpolation, corners_map_to_corners_2d) { @@ -81,7 +81,7 @@ TEST (triangular_interpolation, corners_map_to_corners_2d) EXPECT_NEAR (cornerC[1], result[1], T8_PRECISION_EPS); } -/* Check that the corner interpolation coordinates are +/* Check that the corner interpolation coordinates are * mapped to the corners of a tetrahedron. */ TEST (triangular_interpolation, corners_map_to_corners_3d) {