Skip to content

Commit 1124119

Browse files
Merge pull request #1949 from DLR-AMR/fix-typos
Other: Fix typos and indent doxygen comments
2 parents 05d4d66 + 2ed2945 commit 1124119

File tree

21 files changed

+383
-384
lines changed

21 files changed

+383
-384
lines changed

example/IO/forest/netcdf/t8_write_forest_netcdf.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ T8_EXTERN_C_BEGIN ();
5454
*/
5555
struct t8_example_netcdf_adapt_data
5656
{
57-
t8_3D_point midpoint; /* Midpoint of a aphere */
57+
t8_3D_point midpoint; /* Midpoint of a sphere */
5858
double refine_if_inside_radius; /* refine all elements inside this radius from the sphere's midpoint */
5959
double coarsen_if_outside_radius; /* coarsen all element families outside of this radius from the sphere's midpoint */
6060
};
6161

6262
/** This functions describe an adapt_function, an adapt_function describes the refinement/coarsening rules for a forest
63-
* \note If an element is inside a given radius from the midpoint of the hypercube, this element is refined. If a family of elements is outiside a given radius from the midpoint of the hypercube, it is coarsened.
63+
* \note If an element is inside a given radius from the midpoint of the hypercube, this element is refined. If a family of elements is outside a given radius from the midpoint of the hypercube, it is coarsened.
6464
* \note A detailed description of the adaption process is found in step 3 of the tutorial located in 't8code/example/tutorials'.
6565
*/
6666
int
@@ -109,7 +109,7 @@ t8_example_netcdf_adapt (t8_forest_t forest)
109109
{
110110
t8_forest_t forest_adapt;
111111

112-
/* The adapt data which controls which elements will be refined or corsened based on the given radii */
112+
/* The adapt data which controls which elements will be refined or coarsened based on the given radii */
113113
struct t8_example_netcdf_adapt_data adapt_data = {
114114
t8_3D_point ({ 0.5, 0.5, 0.5 }), /* Midpoints of the sphere. */
115115
0.2, /* Refine if inside this radius. */
@@ -195,7 +195,7 @@ t8_example_compare_performance_netcdf_var_properties (sc_MPI_Comm comm, int fore
195195
/* Construct a 3D hybrid hypercube as a cmesh */
196196
cmesh = t8_cmesh_new_hypercube_hybrid (comm, 1, 0);
197197

198-
/* Build a (partioined) uniform forest */
198+
/* Build a (partitioned) uniform forest */
199199
forest = t8_forest_new_uniform (cmesh, default_scheme, forest_refinement_level, 0, comm);
200200

201201
/* If the adapt_forest flag is set, the forest will be adapted */
@@ -343,12 +343,12 @@ t8_example_netcdf_write_forest (sc_MPI_Comm comm, int forest_refinement_level, i
343343

344344
t8_global_productionf ("New cmesh was created\n");
345345

346-
/* Build a (partioined) uniform forest */
346+
/* Build a (partitioned) uniform forest */
347347
forest = t8_forest_new_uniform (cmesh, default_scheme, level, 0, comm);
348348

349349
t8_global_productionf ("New forest was created\n");
350350

351-
/* Eventually, adapt the forest (based on the flag aadapt_forest) */
351+
/* Eventually, adapt the forest (based on the flag adapt_forest) */
352352
if (adapt_forest) {
353353
/** \note The forest is not repartitioned after the adapt-step.
354354
* Therefore, the workload may not be evenly distributed among the processes.

example/advect/t8_advection.cxx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,9 @@ typedef struct
112112
*element_data_adapt; /**< element_data for the adapted forest, used during adaptation to interpolate values */
113113
/* We store the phi values in an extra array, since this data must exist for ghost
114114
* element as well and is communicated with other processes in ghost_exchange. */
115-
sc_array_t *phi_values; /**< For each element and ghost its phi value. */
116-
sc_array_t
117-
*phi_values_adapt; /**< phi values for the adapted forest, used during adaptaption to interpolate values. */
118-
sc_MPI_Comm comm; /**< MPI communicator used */
115+
sc_array_t *phi_values; /**< For each element and ghost its phi value. */
116+
sc_array_t *phi_values_adapt; /**< phi values for the adapted forest, used during adaptation to interpolate values. */
117+
sc_MPI_Comm comm; /**< MPI communicator used */
119118
sc_statinfo_t stats[ADVECT_NUM_STATS]; /**< Runtimes and other statistics. */
120119
double t; /**< Current simulation time */
121120
double T; /**< End time */
@@ -142,7 +141,7 @@ typedef struct
142141
t8_3D_point midpoint; /**< coordinates of element midpoint in R^3 */
143142
double vol; /**< Volume of this element */
144143
double phi_new; /**< Value of solution at midpoint in next time step */
145-
double *fluxes[MAX_FACES]; /**< The fluxes to each neeighbor at a given face */
144+
double *fluxes[MAX_FACES]; /**< The fluxes to each neighbor at a given face */
146145
int flux_valid[MAX_FACES]; /**< If > 0, this flux was computed, if 0 memory was allocated
147146
for this flux, but not computed. If < 0, no memory was allocated. */
148147
int level; /**< The refinement level of the element. */
@@ -343,7 +342,7 @@ t8_advect_flux_upwind_1d (const t8_advect_problem_t *problem, const t8_locidx_t
343342
}
344343
/* Compute u at the interval boundary. */
345344
problem->u (x_j_half, problem->t, u_at_x_j_half);
346-
/* In 1D we are only interested in the firs coordinate of u */
345+
/* In 1D we are only interested in the first coordinate of u */
347346

348347
sign = face == 0 ? -1 : 1;
349348
if (sign * u_at_x_j_half[0] >= 0) {
@@ -929,7 +928,7 @@ t8_advect_problem_init (t8_cmesh_t cmesh, t8_flow_function_3d_fn u, t8_example_l
929928
problem->num_time_steps = 0; /* current time step */
930929
problem->comm = comm; /* MPI communicator */
931930
problem->vtk_count = 0; /* number of pvtu files written */
932-
problem->band_width = band_width; /* width of the refinemen band around 0 level-set */
931+
problem->band_width = band_width; /* width of the refinement band around 0 level-set */
933932
problem->dim = dim; /* dimension of the mesh */
934933
problem->dummy_op = dummy_op; /* If true, emulate more computational load per element */
935934

src/t8_forest/t8_forest_general.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ t8_forest_leaf_face_orientation (t8_forest_t forest, const t8_locidx_t ltreeid,
571571
* \note Important! This routine allocates memory which must be freed. Do it like this:
572572
*
573573
* if (num_neighbors > 0) {
574-
* scheme->element_destroy (pneigh_eclass, num_neighbors, neighbors);
574+
* scheme->element_destroy (pneigh_eclass, num_neighbors, pneighbor_leaves);
575575
* T8_FREE (pneighbor_leaves);
576576
* T8_FREE (pelement_indices);
577577
* T8_FREE (dual_faces);
@@ -613,7 +613,7 @@ t8_forest_leaf_face_neighbors (t8_forest_t forest, t8_locidx_t ltreeid, const t8
613613
* \note Important! This routine allocates memory which must be freed. Do it like this:
614614
*
615615
* if (num_neighbors > 0) {
616-
* scheme->element_destroy (pneigh_eclass, num_neighbors, neighbors);
616+
* scheme->element_destroy (pneigh_eclass, num_neighbors, pneighbor_leaves);
617617
* T8_FREE (pneighbor_leaves);
618618
* T8_FREE (pelement_indices);
619619
* T8_FREE (dual_faces);
@@ -913,7 +913,7 @@ t8_forest_new_uniform (t8_cmesh_t cmesh, const t8_scheme_c *scheme, const int le
913913
/** Build a adapted forest from another forest.
914914
* \param [in] forest_from The forest to refine
915915
* \param [in] adapt_fn Adapt function to use
916-
* \param [in] recursive If true adptation is recursive
916+
* \param [in] recursive If true adaptation is recursive
917917
* \param [in] do_face_ghost If true, a layer of ghost elements is created for the forest.
918918
* \param [in] user_data If not NULL, the user data pointer of the forest is set to this value.
919919
* \return A new forest that is adapted from \a forest_from.

src/t8_forest/t8_forest_ghost.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ typedef struct
9090
} t8_ghost_remote_tree_t;
9191

9292
/**
93-
* This struct stores information about the data that the current process needds from a specific remote_process
93+
* This struct stores information about the data that the current process needs from a specific remote_process
9494
* as ghost data, such as the number of remote elements and the remote trees.
9595
*/
9696
typedef struct

src/t8_schemes/t8_default/t8_default_common/t8_default_common.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ class t8_default_scheme_common: public t8_scheme_helpers<TEclass, TUnderlyingEcl
235235
}
236236

237237
/** Count how many leaf descendants of a given uniform level an element would produce.
238-
* \param [in] element The element to be checked.
239-
* \param [in] level A refinement level.
238+
* \param [in] element The element to be checked.
239+
* \param [in] level A refinement level.
240240
* \return Suppose \a element is uniformly refined up to level \a level. The return value
241241
* is the resulting number of elements (of the given level).
242242
* Each default element (except pyramids) refines into 2^{dim * (level - level(t))}

src/t8_schemes/t8_default/t8_default_hex/t8_default_hex.hxx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class t8_default_scheme_hex: public t8_default_scheme_common<T8_ECLASS_HEX, t8_d
359359
* \see t8_cmesh_set_join
360360
* \param [in] sign Depending on the topological orientation of the two tree faces,
361361
* either 0 (both faces have opposite orientation)
362-
* or 1 (both faces have the same top. orientattion).
362+
* or 1 (both faces have the same top. orientation).
363363
* \ref t8_eclass_face_orientation
364364
* \param [in] is_smaller_face Flag to declare whether \a elem1 belongs to
365365
* the smaller face. A face f of tree T is smaller than
@@ -491,7 +491,7 @@ class t8_default_scheme_hex: public t8_default_scheme_common<T8_ECLASS_HEX, t8_d
491491
element_get_last_descendant (const t8_element_t *elem, t8_element_t *desc, int level) const;
492492

493493
/** Construct the successor in a uniform refinement of a given element.
494-
* \param [in] elem The element whose successor should be constructed.
494+
* \param [in] elem The element whose successor should be constructed.
495495
* \param [in,out] succ The successor element whose entries will be set.
496496
*/
497497
void
@@ -539,7 +539,7 @@ class t8_default_scheme_hex: public t8_default_scheme_common<T8_ECLASS_HEX, t8_d
539539
* reference space of the tree.
540540
*
541541
* \param [in] elem The element.
542-
* \param [in] ref_coords The coordinates \f$ [0,1]^\mathrm{dim} \f$ of the point
542+
* \param [in] ref_coords The coordinates \f$ [0,1]^\mathrm{dim} \f$ of the point
543543
* in the reference space of the element.
544544
* \param [in] num_coords Number of \f$ dim\f$-sized coordinates to evaluate.
545545
* \param [out] out_coords The coordinates of the points in the
@@ -559,7 +559,7 @@ class t8_default_scheme_hex: public t8_default_scheme_common<T8_ECLASS_HEX, t8_d
559559
#if T8_ENABLE_DEBUG
560560
/** Query whether a given element can be considered as 'valid' and it is
561561
* safe to perform any of the above algorithms on it.
562-
* \param [in] element The element to be checked.
562+
* \param [in] element The element to be checked.
563563
* \return True if \a element is safe to use. False otherwise.
564564
* \note An element that is constructed with \ref element_new
565565
* must pass this test.
@@ -579,9 +579,9 @@ class t8_default_scheme_hex: public t8_default_scheme_common<T8_ECLASS_HEX, t8_d
579579
* and the level of the triangle. This function is only available in the
580580
* debugging configuration.
581581
*
582-
* \param [in] elem The element to print
583-
* \param [in] debug_string String printed to debug
584-
* \param [in] string_size String size of \a debug_string.
582+
* \param [in] elem The element to print
583+
* \param [in] debug_string String printed to debug
584+
* \param [in] string_size String size of \a debug_string.
585585
*/
586586
void
587587
element_to_string (const t8_element_t *elem, char *debug_string, const int string_size) const;
@@ -594,12 +594,12 @@ class t8_default_scheme_hex: public t8_default_scheme_common<T8_ECLASS_HEX, t8_d
594594
set_to_root (t8_element_t *elem) const;
595595

596596
/** Pack multiple elements into contiguous memory, so they can be sent via MPI.
597-
* \param [in] elements Array of elements that are to be packed
598-
* \param [in] count Number of elements to pack
599-
* \param [in,out] send_buffer Buffer in which to pack the elements
600-
* \param [in] buffer_size size of the buffer (in order to check that we don't access out of range)
601-
* \param [in, out] position the position of the first byte that is not already packed
602-
* \param [in] comm MPI Communicator
597+
* \param [in] elements Array of elements that are to be packed
598+
* \param [in] count Number of elements to pack
599+
* \param [in,out] send_buffer Buffer in which to pack the elements
600+
* \param [in] buffer_size size of the buffer (in order to check that we don't access out of range)
601+
* \param [in, out] position the position of the first byte that is not already packed
602+
* \param [in] comm MPI Communicator
603603
*/
604604
void
605605
element_MPI_Pack (t8_element_t **const elements, const unsigned int count, void *send_buffer, int buffer_size,
@@ -614,12 +614,12 @@ class t8_default_scheme_hex: public t8_default_scheme_common<T8_ECLASS_HEX, t8_d
614614
element_MPI_Pack_size (const unsigned int count, sc_MPI_Comm comm, int *pack_size) const;
615615

616616
/** Unpack multiple elements from contiguous memory that was received via MPI.
617-
* \param [in] recvbuf Buffer from which to unpack the elements
618-
* \param [in] buffer_size size of the buffer (in order to check that we don't access out of range)
617+
* \param [in] recvbuf Buffer from which to unpack the elements
618+
* \param [in] buffer_size size of the buffer (in order to check that we don't access out of range)
619619
* \param [in, out] position the position of the first byte that is not already packed
620-
* \param [in] elements Array of initialised elements that is to be filled from the message
621-
* \param [in] count Number of elements to unpack
622-
* \param [in] comm MPI Communicator
620+
* \param [in] elements Array of initialised elements that is to be filled from the message
621+
* \param [in] count Number of elements to unpack
622+
* \param [in] comm MPI Communicator
623623
*/
624624
void
625625
element_MPI_Unpack (void *recvbuf, const int buffer_size, int *position, t8_element_t **elements,

src/t8_schemes/t8_default/t8_default_line/t8_default_line.hxx

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ class t8_default_scheme_line: public t8_default_scheme_common<T8_ECLASS_LINE, t8
371371
* \see t8_cmesh_set_join
372372
* \param [in] sign Depending on the topological orientation of the two tree faces,
373373
* either 0 (both faces have opposite orientation)
374-
* or 1 (both faces have the same top. orientattion).
374+
* or 1 (both faces have the same top. orientation).
375375
* \ref t8_eclass_face_orientation
376376
* \param [in] is_smaller_face Flag to declare whether \a elem1 belongs to
377377
* the smaller face. A face f of tree T is smaller than
@@ -550,7 +550,7 @@ class t8_default_scheme_line: public t8_default_scheme_common<T8_ECLASS_LINE, t8
550550
* reference space of the tree.
551551
*
552552
* \param [in] elem The element.
553-
* \param [in] ref_coords The coordinates \f$ [0,1]^\mathrm{dim} \f$ of the point
553+
* \param [in] ref_coords The coordinates \f$ [0,1]^\mathrm{dim} \f$ of the point
554554
* in the reference space of the element.
555555
* \param [in] num_coords Number of \f$ dim\f$-sized coordinates to evaluate.
556556
* \param [out] out_coords The coordinates of the points in the
@@ -590,9 +590,9 @@ class t8_default_scheme_line: public t8_default_scheme_common<T8_ECLASS_LINE, t8
590590
* and the level of the triangle. This function is only available in the
591591
* debugging configuration.
592592
*
593-
* \param [in] elem The element to print
594-
* \param [in] debug_string String printed to debug
595-
* \param [in] string_size String size of \a debug_string.
593+
* \param [in] elem The element to print
594+
* \param [in] debug_string String printed to debug
595+
* \param [in] string_size String size of \a debug_string.
596596
*/
597597
void
598598
element_to_string (const t8_element_t *elem, char *debug_string, const int string_size) const;
@@ -604,32 +604,32 @@ class t8_default_scheme_line: public t8_default_scheme_common<T8_ECLASS_LINE, t8
604604
set_to_root (t8_element_t *elem) const;
605605

606606
/** Pack multiple elements into contiguous memory, so they can be sent via MPI.
607-
* \param [in] elements Array of elements that are to be packed
608-
* \param [in] count Number of elements to pack
609-
* \param [in,out] send_buffer Buffer in which to pack the elements
610-
* \param [in] buffer_size size of the buffer (in order to check that we don't access out of range)
611-
* \param [in, out] position the position of the first byte that is not already packed
612-
* \param [in] comm MPI Communicator
607+
* \param [in] elements Array of elements that are to be packed
608+
* \param [in] count Number of elements to pack
609+
* \param [in,out] send_buffer Buffer in which to pack the elements
610+
* \param [in] buffer_size size of the buffer (in order to check that we don't access out of range)
611+
* \param [in, out] position the position of the first byte that is not already packed
612+
* \param [in] comm MPI Communicator
613613
*/
614614
void
615615
element_MPI_Pack (t8_element_t **const elements, const unsigned int count, void *send_buffer, int buffer_size,
616616
int *position, sc_MPI_Comm comm) const;
617617

618618
/** Determine an upper bound for the size of the packed message of \b count elements
619-
* \param [in] count Number of elements to pack
620-
* \param [in] comm MPI Communicator
619+
* \param [in] count Number of elements to pack
620+
* \param [in] comm MPI Communicator
621621
* \param [out] pack_size upper bound on the message size
622622
*/
623623
void
624624
element_MPI_Pack_size (const unsigned int count, sc_MPI_Comm comm, int *pack_size) const;
625625

626626
/** Unpack multiple elements from contiguous memory that was received via MPI.
627-
* \param [in] recvbuf Buffer from which to unpack the elements
628-
* \param [in] buffer_size size of the buffer (in order to check that we don't access out of range)
629-
* \param [in, out] position the position of the first byte that is not already packed
630-
* \param [in] elements Array of initialised elements that is to be filled from the message
631-
* \param [in] count Number of elements to unpack
632-
* \param [in] comm MPI Communicator
627+
* \param [in] recvbuf Buffer from which to unpack the elements
628+
* \param [in] buffer_size size of the buffer (in order to check that we don't access out of range)
629+
* \param [in, out] position the position of the first byte that is not already packed
630+
* \param [in] elements Array of initialised elements that is to be filled from the message
631+
* \param [in] count Number of elements to unpack
632+
* \param [in] comm MPI Communicator
633633
*/
634634
void
635635
element_MPI_Unpack (void *recvbuf, const int buffer_size, int *position, t8_element_t **elements,

0 commit comments

Comments
 (0)