Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions benchmarks/t8_time_fractal.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <sc_options.h>

/* 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|
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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 };
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions doc/author_lampert.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I place my contributions to t8code under the FreeBSD license. Joshua Lampert (joshua.lampert@uni-hamburg.de)
8 changes: 4 additions & 4 deletions src/t8_cmesh/t8_cmesh_commit.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
*/
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/t8_cmesh/t8_cmesh_trees.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/t8_cmesh_readmshfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/t8_cmesh_triangle.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions src/t8_forest/t8_forest_balance.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down
Loading
Loading