The -d flag can be used to force r.describe to respect the current region -extents when repoting raster map categories. The default behavior is to read the full +extents when reporting raster map categories. The default behavior is to read the full extent of the input raster map.
If the -1 flag is specified, the output appears with one category value/range per line. diff --git a/raster/r.describe/r.describe.md b/raster/r.describe/r.describe.md index 159a944aa35..1f71c42c64f 100644 --- a/raster/r.describe/r.describe.md +++ b/raster/r.describe/r.describe.md @@ -29,7 +29,7 @@ occurs, this will be indicated. The range report will generally run faster than the full list (the default output). The **-d** flag can be used to force *r.describe* to respect the current -region extents when repoting raster map categories. The default behavior +region extents when reporting raster map categories. The default behavior is to read the full extent of the input raster map. If the **-1** flag is specified, the output appears with one category diff --git a/raster/r.gwflow/main.c b/raster/r.gwflow/main.c index a3106563606..2e777dc37fa 100644 --- a/raster/r.gwflow/main.c +++ b/raster/r.gwflow/main.c @@ -377,7 +377,7 @@ int main(int argc, char *argv[]) N_convert_array_2d_null_to_zero(data->phead); /****************************************************/ - /*explicite calculation of free groundwater surface */ + /*explicit calculation of free groundwater surface */ /****************************************************/ if (data->gwtype == N_GW_UNCONFINED) { @@ -446,7 +446,7 @@ int main(int argc, char *argv[]) N_write_array_2d_to_rast(budget, param.budget->answer); } - /*Compute the the velocity field if required and write the result into two + /*Compute the velocity field if required and write the result into two * raster maps */ if (param.vector_x->answer && param.vector_y->answer) { field = N_compute_gradient_field_2d(data->phead, data->hc_x, data->hc_y, diff --git a/raster/r.gwflow/r.gwflow.html b/raster/r.gwflow/r.gwflow.html index 3edc76354eb..1486b8ee110 100644 --- a/raster/r.gwflow/r.gwflow.html +++ b/raster/r.gwflow/r.gwflow.html @@ -60,11 +60,11 @@
Two different boundary conditions are implemented, the Dirichlet and Neumann conditions. By default the calculation area is surrounded by homogeneous Neumann boundary conditions. The calculation and boundary status of single cells must be set with a status map, -the following states are supportet: +the following states are supported:
The data will be imported using the current region settings to set the new raster map's bounds and resolution. Any features falling outside -the current region will be cropped. The region settings are contolled +the current region will be cropped. The region settings are controlled with the g.region module.
diff --git a/raster/r.in.poly/r.in.poly.md b/raster/r.in.poly/r.in.poly.md index af3221415da..32c45304461 100644 --- a/raster/r.in.poly/r.in.poly.md +++ b/raster/r.in.poly/r.in.poly.md @@ -17,7 +17,7 @@ is fine. The data will be imported using the current region settings to set the new raster map's bounds and resolution. Any features falling outside the -current region will be cropped. The region settings are contolled with +current region will be cropped. The region settings are controlled with the *g.region* module. The format is a simplified version of the standard GRASS vector ASCII diff --git a/raster/r.li/r.li.daemon/daemon.h b/raster/r.li/r.li.daemon/daemon.h index 674cc62a2a1..08e85ec3b4e 100644 --- a/raster/r.li/r.li.daemon/daemon.h +++ b/raster/r.li/r.li.daemon/daemon.h @@ -113,7 +113,7 @@ struct area_entry { /** * \brief function prototype for index calculation - * \param fd file descripter of opened raster map + * \param fd file descriptor of opened raster map * \param par optional parameters * \param ad definition of the sample area * \param result pointer to store the result diff --git a/raster/r.mapcalc/map.c b/raster/r.mapcalc/map.c index 65bb85df170..2225940f0f2 100644 --- a/raster/r.mapcalc/map.c +++ b/raster/r.mapcalc/map.c @@ -293,7 +293,7 @@ static void translate_from_colors(struct map *m, DCELL *rast, CELL *cell, * category file. * * This requires performing sscanf() of the category label - * and only do it it for new categories. Must maintain + * and only do it for new categories. Must maintain * some kind of maps of already scanned values. * * This maps is a hybrid tree, where the data in each node diff --git a/raster/r.mapcalc/map3.c b/raster/r.mapcalc/map3.c index c9683148275..7bde2a58cce 100644 --- a/raster/r.mapcalc/map3.c +++ b/raster/r.mapcalc/map3.c @@ -242,7 +242,7 @@ static void translate_from_colors(map *m, DCELL *rast, CELL *cell, int ncols, * category file. * * This requires performing sscanf() of the category label - * and only do it it for new categories. Must maintain + * and only do it for new categories. Must maintain * some kind of maps of already scanned values. * * This maps is a hybrid tree, where the data in each node diff --git a/raster/r.mapcalc/testsuite/const_map_test.sh b/raster/r.mapcalc/testsuite/const_map_test.sh index bf138f4256b..375f6c0774a 100755 --- a/raster/r.mapcalc/testsuite/const_map_test.sh +++ b/raster/r.mapcalc/testsuite/const_map_test.sh @@ -97,7 +97,7 @@ compare_result() fi } -# Deactive the current mask, by using our own mask name, +# Deactivate the current mask, by using our own mask name, # but not creating any mask. MASKTMP=mask.$TMPNAME export GRASS_MASK=$MASKTMP diff --git a/raster/r.mask.status/r.mask.status.html b/raster/r.mask.status/r.mask.status.html index cb3897820f5..2e0a7525ee0 100644 --- a/raster/r.mask.status/r.mask.status.html +++ b/raster/r.mask.status/r.mask.status.html @@ -46,7 +46,7 @@
test -f gives return code 0 when the file exists.
-r.mask.status can be used in the same with the the -t flag:
+r.mask.status can be used in the same with the -t flag:
r.mask.status -t diff --git a/raster/r.mask.status/r.mask.status.md b/raster/r.mask.status/r.mask.status.md index bc9bb3d8cd0..f3f76622b42 100644 --- a/raster/r.mask.status/r.mask.status.md +++ b/raster/r.mask.status/r.mask.status.md @@ -43,7 +43,7 @@ This returns a dictionary with keys `present`, `full_name`, and The POSIX *test* utility uses return code 0 to indicate presence and 1 to indicate absence of a file, so testing existence of a file with `test -f` gives return code 0 when the file exists. *r.mask.status* can -be used in the same with the the **-t** flag: +be used in the same with the **-t** flag: ```sh r.mask.status -t diff --git a/raster/r.out.ppm3/r.out.ppm3.html b/raster/r.out.ppm3/r.out.ppm3.html index 80038ffe48e..467defbc53f 100644 --- a/raster/r.out.ppm3/r.out.ppm3.html +++ b/raster/r.out.ppm3/r.out.ppm3.html @@ -4,9 +4,9 @@DESCRIPTION
image file, using the current region.This program converts a GRASS raster map to a PPM image file -using the the current region settings. +using the current region settings. -
To get the full area and resolutin of the raster map, run: +
To get the full area and resolution of the raster map, run:
g.region raster=[mapname] diff --git a/raster/r.out.ppm3/r.out.ppm3.md b/raster/r.out.ppm3/r.out.ppm3.md index 5edc40b95f7..0a441908d1e 100644 --- a/raster/r.out.ppm3/r.out.ppm3.md +++ b/raster/r.out.ppm3/r.out.ppm3.md @@ -6,7 +6,7 @@ file, using the current region. This program converts a GRASS raster map to a PPM image file using the the current region settings. -To get the full area and resolutin of the raster map, run: +To get the full area and resolution of the raster map, run: ```sh g.region raster=[mapname] diff --git a/raster/r.out.vrml/put_grid.c b/raster/r.out.vrml/put_grid.c index fd0108bc3c9..6750ebf2330 100644 --- a/raster/r.out.vrml/put_grid.c +++ b/raster/r.out.vrml/put_grid.c @@ -3,7 +3,7 @@ #include "pv.h" /* - * Use centers of GRASS CELLS as vertexes for grid. + * Use centers of GRASS CELLS as vertices for grid. * Currently, grid space is "unitized" so that the * largest dimension of the current region in GRASS == 1.0 */ diff --git a/raster/r.param.scale/interface.c b/raster/r.param.scale/interface.c index fb818eda261..5eae8dae093 100644 --- a/raster/r.param.scale/interface.c +++ b/raster/r.param.scale/interface.c @@ -72,7 +72,7 @@ void interface(int argc, char **argv) /* Each option has a 'key' (short descriptn), a 'description` (longer one) */ - /* a 'type' (eg int, or string), and an indication whether manditory or not + /* a 'type' (eg int, or string), and an indication whether mandatory or not */ rast_out->description = diff --git a/raster/r.param.scale/main.c b/raster/r.param.scale/main.c index 095344ac999..8bb76b3ec67 100644 --- a/raster/r.param.scale/main.c +++ b/raster/r.param.scale/main.c @@ -27,7 +27,7 @@ int fd_in, /* File descriptor for input and */ double resoln, /* Planimetric resolution. */ exponent, /* Distance weighting exponent. */ zscale, /* Vertical scaling factor. */ - slope_tol, /* Vertical tolerences for surface */ + slope_tol, /* Vertical tolerances for surface */ curve_tol; /* feature identification. */ int main(int argc, char **argv) diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h index ab377dfa62f..f9f6d5e80f5 100644 --- a/raster/r.param.scale/param.h +++ b/raster/r.param.scale/param.h @@ -93,5 +93,5 @@ extern int fd_in, /* File descriptor for input and */ extern double resoln, /* Planimetric resolution. */ exponent, /* Distance weighting exponent. */ zscale, /* Vertical scaling factor. */ - slope_tol, /* Vertical tolerences for surface */ + slope_tol, /* Vertical tolerances for surface */ curve_tol; /* feature identification. */ diff --git a/raster/r.profile/r.profile.html b/raster/r.profile/r.profile.html index fa7eb9a1375..c1c149a3a2a 100644 --- a/raster/r.profile/r.profile.html +++ b/raster/r.profile/r.profile.html @@ -68,7 +68,7 @@EXAMPLES
Extraction of values along profile defined by coordinates (variant 1)
-Extract a profile with coordinates (wayoints) provided on the command line +Extract a profile with coordinates (waypoints) provided on the command line (North Carolina data set):diff --git a/raster/r.profile/r.profile.md b/raster/r.profile/r.profile.md index 074cff6ca9f..ec94361a6cb 100644 --- a/raster/r.profile/r.profile.md +++ b/raster/r.profile/r.profile.md @@ -65,7 +65,7 @@ This filters out everything except the numbers. ### Extraction of values along profile defined by coordinates (variant 1) -Extract a profile with coordinates (wayoints) provided on the command +Extract a profile with coordinates (waypoints) provided on the command line (North Carolina data set): ```sh diff --git a/raster/r.resamp.bspline/r.resamp.bspline.html b/raster/r.resamp.bspline/r.resamp.bspline.html index 46bc352db56..68229f0b8bb 100644 --- a/raster/r.resamp.bspline/r.resamp.bspline.html +++ b/raster/r.resamp.bspline/r.resamp.bspline.html @@ -39,7 +39,7 @@DESCRIPTION
spline step values should be no less than the east-west and north-south resolutions of the input map. Each non-NULL cell observation is modeled as a linear function of the non-zero splines in the area around the observation. -The least squares regression predicts the the coefficients of these linear functions. +The least squares regression predicts the coefficients of these linear functions. Regularization avoids the need to have one one observation and one coefficient for each spline (in order to avoid instability). diff --git a/raster/r.resamp.bspline/r.resamp.bspline.md b/raster/r.resamp.bspline/r.resamp.bspline.md index 983671a808a..cf48462051a 100644 --- a/raster/r.resamp.bspline/r.resamp.bspline.md +++ b/raster/r.resamp.bspline/r.resamp.bspline.md @@ -41,7 +41,7 @@ north-south direction. For optimal performance, the spline step values should be no less than the east-west and north-south resolutions of the input map. Each non-NULL cell observation is modeled as a linear function of the non-zero splines in the area around the observation. The -least squares regression predicts the the coefficients of these linear +least squares regression predicts the coefficients of these linear functions. Regularization avoids the need to have one one observation and one coefficient for each spline (in order to avoid instability). diff --git a/raster/r.resamp.rst/DESCRIPTION b/raster/r.resamp.rst/DESCRIPTION index 39360b88406..8e2a4a8deb5 100644 --- a/raster/r.resamp.rst/DESCRIPTION +++ b/raster/r.resamp.rst/DESCRIPTION @@ -150,7 +150,7 @@ IL_write_temp_2d(ngstc,nszc,offset2,Tmp_fd_z,Tmp_fd_dx,Tmp_fd_dy,Tmp_fd_xx, FILE *Tmp_fd_z,*Tmp_fd_dx,*Tmp_fd_dy, /* Temp files */ *Tmp_fd_xx,*Tmp_fd_yy,*Tmp_fd_xy; double *az,*adx,*ady,*adxx,*adyy,*adxy; /* interpolated values */ - int scik1,scik2,scik3; /* mutipliers for interp. values */ + int scik1,scik2,scik3; /* multipliers for interp. values */ Writes az,adx,...,adxy into appropriate place (depending on ngstc, nszc and offset) in corresponding temp file */ diff --git a/raster/r.resamp.rst/main.c b/raster/r.resamp.rst/main.c index 31bce0cdd3b..69e64b22d29 100644 --- a/raster/r.resamp.rst/main.c +++ b/raster/r.resamp.rst/main.c @@ -79,7 +79,7 @@ static int fdinp, fdsmooth = -1; * for output grid xmin ... - coordinates of corners of output grid * * subroutines input_data - input of data x,y,z (test function or measured - * data) iterpolate - interpolation of z-values and derivatives to grid + * data) interpolate - interpolation of z-values and derivatives to grid * secpar_loop- computation of secondary(morphometric) parameters output - * output of gridded data and derivatives/sec.parameters check_at_points - * interpolation of z-values to given point x,y diff --git a/raster/r.ros/main.c b/raster/r.ros/main.c index b8e6dc79655..db81de7e67b 100644 --- a/raster/r.ros/main.c +++ b/raster/r.ros/main.c @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) etaM_dead, /*dead fuel misture damping coefficient */ etaM_live, /*live fuel misture damping coefficient */ xmext, /*live fuel moisture of extinction */ - phi_ws, /*wind and slope conbined coefficient */ + phi_ws, /*wind and slope combined coefficient */ wmfd, fdmois, fined, finel; /*other local variables */ diff --git a/raster/r.sim/simlib/input.c b/raster/r.sim/simlib/input.c index 0787e7ae64a..422c10ec378 100644 --- a/raster/r.sim/simlib/input.c +++ b/raster/r.sim/simlib/input.c @@ -452,7 +452,7 @@ float **create_float_matrix(int rows, int cols, float fill_value) G_verbose_message("Creating float matrix with value %g", fill_value); - /* Allocate the float marix */ + /* Allocate the float matrix */ matrix = G_alloc_fmatrix(rows, cols); for (row = 0; row < rows; row++) { @@ -473,7 +473,7 @@ double **create_double_matrix(int rows, int cols, double fill_value) G_verbose_message("Creating double matrix with value %g", fill_value); - /* Allocate the float marix */ + /* Allocate the float matrix */ matrix = G_alloc_matrix(rows, cols); for (row = 0; row < rows; row++) { @@ -502,7 +502,7 @@ float **read_float_raster_map(int rows, int cols, char *name, float unitconv) /* Allocate the row buffer */ row_buff = Rast_allocate_f_buf(); - /* Allocate the float marix */ + /* Allocate the float matrix */ matrix = G_alloc_fmatrix(rows, cols); for (row = 0; row < rows; row++) { @@ -545,7 +545,7 @@ double **read_double_raster_map(int rows, int cols, char *name, double unitconv) /* Allocate the row buffer */ row_buff = Rast_allocate_d_buf(); - /* Allocate the double marix */ + /* Allocate the double matrix */ matrix = G_alloc_matrix(rows, cols); for (row = 0; row < rows; row++) { diff --git a/raster/r.solute.transport/main.c b/raster/r.solute.transport/main.c index 322b108910a..679c7ea3527 100644 --- a/raster/r.solute.transport/main.c +++ b/raster/r.solute.transport/main.c @@ -423,7 +423,7 @@ int main(int argc, char *argv[]) /*write the result to the output file */ N_write_array_2d_to_rast(data->c, param.output->answer); - /*Compute the the velocity field if required and write the result into three + /*Compute the velocity field if required and write the result into three * rast maps */ if (param.vector_x->answer || param.vector_y->answer) { xcomp = N_alloc_array_2d(geom->cols, geom->rows, 1, DCELL_TYPE); diff --git a/raster/r.spread/main.c b/raster/r.spread/main.c index e1b5e7ff31e..404266505e6 100644 --- a/raster/r.spread/main.c +++ b/raster/r.spread/main.c @@ -426,7 +426,7 @@ int main(int argc, char *argv[]) ncols = Rast_window_cols(); /*transfor measurement unit from meters to centimeters due to ROS unit - *if the input ROSs are in m/min units, cancell the following*/ + *if the input ROSs are in m/min units, cancel the following*/ window.ns_res = 100 * window.ns_res; window.ew_res = 100 * window.ew_res; diff --git a/raster/r.spread/replaceHa.c b/raster/r.spread/replaceHa.c index abbb7b182ad..2868d50d36f 100644 --- a/raster/r.spread/replaceHa.c +++ b/raster/r.spread/replaceHa.c @@ -4,7 +4,7 @@ * This routine is to delete a cell in a heap. * It 1) searches the cell backward and sequentially from * the heap (if not found, returns a error message), - * 2) repalce that cell with the new min_cost and + * 2) replace that cell with the new min_cost and * restore a heap order. * ************************************************************/ diff --git a/raster/r.spread/spread.c b/raster/r.spread/spread.c index f3b570a0045..3ec6c0cee7c 100644 --- a/raster/r.spread/spread.c +++ b/raster/r.spread/spread.c @@ -97,7 +97,7 @@ void spread(void) to_cell = to_cell->next; } #endif - /*Get a cell in the list each time, and compute culmulative costs + /*Get a cell in the list each time, and compute cumulative costs *via the current spread cell*/ to_cell = front_cell; while (to_cell != NULL) { @@ -206,7 +206,7 @@ int cumulative(struct costHa *pres_cell, struct cell_ptrHa *to_cell, cost = 0.0; count = 1; while (count <= xsteps) { - /*Can't go through a barrer in a path */ + /*Can't go through a barrier in a path */ if (DATA(map_base, xrow, xcol) <= 0) return -1; diff --git a/raster/r.stats/cell_stats.c b/raster/r.stats/cell_stats.c index 51e46b6acc3..76fdcaaf9e6 100644 --- a/raster/r.stats/cell_stats.c +++ b/raster/r.stats/cell_stats.c @@ -54,7 +54,7 @@ int cell_stats(int fd[], int with_percents, int with_counts, int with_areas, /* we can't compute hash on null values, so we change all nulls to max+1, set NULL_CELL to max+1, and later compare - with NULL_CELL to chack for nulls */ + with NULL_CELL to check for nulls */ reset_null_vals(cell[i], ncols); } diff --git a/raster/r.stats/stats.c b/raster/r.stats/stats.c index 7cc5552da71..9c946abf161 100644 --- a/raster/r.stats/stats.c +++ b/raster/r.stats/stats.c @@ -105,7 +105,7 @@ void fix_max_fp_val(CELL *cell, int ncols) /* we can't compute hash on null values, so we change all * nulls to max+1, set NULL_CELL to max+1, and later compare - * with NULL_CELL to chack for nulls */ + * with NULL_CELL to check for nulls */ void reset_null_vals(CELL *cell, int ncols) { while (ncols-- > 0) { diff --git a/raster/r.stream.extract/dseg.c b/raster/r.stream.extract/dseg.c index 14f81ca44ef..ff439eea2f9 100644 --- a/raster/r.stream.extract/dseg.c +++ b/raster/r.stream.extract/dseg.c @@ -106,7 +106,7 @@ int dseg_read_raster(DSEG *dseg, char *map_name, char *mapset) if (Segment_put_row(&(dseg->seg), (DCELL *)dbuffer, row) < 0) { G_free(dbuffer); Rast_close(map_fd); - G_warning(_("Inable to segment put row %d for raster <%s>"), row, + G_warning(_("Unable to segment put row %d for raster <%s>"), row, map_name); return -1; } diff --git a/raster/r.stream.extract/main.c b/raster/r.stream.extract/main.c index 1dbc64ab39d..486605430f0 100644 --- a/raster/r.stream.extract/main.c +++ b/raster/r.stream.extract/main.c @@ -266,7 +266,7 @@ int main(int argc, char *argv[]) ncols = Rast_window_cols(); sides = 8; /* not a user option */ c_fac = - 5; /* not a user option, MFD covergence factor 5 gives best results */ + 5; /* not a user option, MFD convergence factor 5 gives best results */ /* segment structures */ seg_rows = seg_cols = 64; diff --git a/raster/r.sun/main.c b/raster/r.sun/main.c index 4ddd6fa6ff8..c782411201b 100644 --- a/raster/r.sun/main.c +++ b/raster/r.sun/main.c @@ -198,7 +198,7 @@ int ll_correction = FALSE; double coslatsq; /* why not use G_distance() here which switches to geodesic/great - circle distace as needed? */ + circle distance as needed? */ double distance(double x1, double x2, double y1, double y2) { if (ll_correction) { diff --git a/raster/r.surf.contour/r.surf.contour.html b/raster/r.surf.contour/r.surf.contour.html index 482f12c3f0f..a43a6eb344d 100644 --- a/raster/r.surf.contour/r.surf.contour.html +++ b/raster/r.surf.contour/r.surf.contour.html @@ -45,7 +45,7 @@Parameters:
NOTES
r.surf.contour works well under the following circumstances: -1) the contour lines extend to the the edge of the current region, +1) the contour lines extend to the edge of the current region, 2) the program is run at the same resolution as that of the input map, 3) there are no disjointed contour lines, and 4) no spot elevation data BETWEEN contour lines exist. Spot elevations at diff --git a/raster/r.surf.contour/r.surf.contour.md b/raster/r.surf.contour/r.surf.contour.md index 11898b7d6d8..5dc0d33f92f 100644 --- a/raster/r.surf.contour/r.surf.contour.md +++ b/raster/r.surf.contour/r.surf.contour.md @@ -37,7 +37,7 @@ writing *output*. ## NOTES *r.surf.contour* works well under the following circumstances: 1) the -contour lines extend to the the edge of the current region, 2) the +contour lines extend to the edge of the current region, 2) the program is run at the same resolution as that of the input map, 3) there are no disjointed contour lines, and 4) no spot elevation data BETWEEN contour lines exist. Spot elevations at the tops of hills and the diff --git a/raster/r.texture/r.texture.html b/raster/r.texture/r.texture.html index 59b6b44ec6b..7d5d58987ea 100644 --- a/raster/r.texture/r.texture.html +++ b/raster/r.texture/r.texture.html @@ -42,7 +42,7 @@NOTES
resolution of satellite imagery and on the scale of the human intervention or the phenomenon that created the texture (also see the discussion of scale dependency below). The user should observe the phenomenon visually in order to -determine an adequat setting of the size parameter. +determine an adequate setting of the size parameter.The output of r.texture can constitute very useful additional variables diff --git a/raster/r.texture/r.texture.md b/raster/r.texture/r.texture.md index a33fead8827..ff1105c4f90 100644 --- a/raster/r.texture/r.texture.md +++ b/raster/r.texture/r.texture.md @@ -39,7 +39,7 @@ species. The usefulness and use of texture is highly dependent on the resolution of satellite imagery and on the scale of the human intervention or the phenomenon that created the texture (also see the discussion of scale dependency below). The user should observe the -phenomenon visually in order to determine an adequat setting of the +phenomenon visually in order to determine an adequate setting of the *size* parameter. The output of *r.texture* can constitute very useful additional diff --git a/raster/r.thin/io.c b/raster/r.thin/io.c index 3b2d0bd8aa3..5aacbe21653 100644 --- a/raster/r.thin/io.c +++ b/raster/r.thin/io.c @@ -59,7 +59,7 @@ CELL *get_a_row(int row) int put_a_row(int row, CELL *buf) { - /* rowio.h defines this withe 2nd argument as char * */ + /* rowio.h defines this with the 2nd argument as char * */ Rowio_put(&row_io, (char *)buf, row); return 0; diff --git a/raster/r.thin/r.thin.html b/raster/r.thin/r.thin.html index d62a5308a91..54a828851e2 100644 --- a/raster/r.thin/r.thin.html +++ b/raster/r.thin/r.thin.html @@ -46,15 +46,15 @@
NOTES
definition Jang and Chin give of the thinning process is "successive removal of outer layers of pixels from an object while retaining any pixels whose removal would alter -the connectivity or shorten the legs of the sceleton." +the connectivity or shorten the legs of the skeleton."-The sceleton is finally thinned when the thinning process +The skeleton is finally thinned when the thinning process converges; i.e., "no further pixels can be removed without -altering the connectivity or shortening the sceleton legs" +altering the connectivity or shortening the skeleton legs" (p. 541). The authors prove that the thinning process described always converges and produces one-pixel thick -sceletons. The number of iterations depends on the +skeletons. The number of iterations depends on the original thickness of the object. Each iteration peels off the outside pixels from the object. Therefore, if the object is <= n pixels thick, the algorithm should diff --git a/raster/r.thin/r.thin.md b/raster/r.thin/r.thin.md index c7b32e0f9f8..d6e9e8a00ba 100644 --- a/raster/r.thin/r.thin.md +++ b/raster/r.thin/r.thin.md @@ -33,13 +33,13 @@ Ronlad T. Chin in *Transactions on Pattern Analysis and Machine Intelligence*, vol. 12, No. 6, June 1990. The definition Jang and Chin give of the thinning process is "successive removal of outer layers of pixels from an object while retaining any pixels whose removal would -alter the connectivity or shorten the legs of the sceleton." +alter the connectivity or shorten the legs of the skeleton." -The sceleton is finally thinned when the thinning process converges; +The skeleton is finally thinned when the thinning process converges; i.e., "no further pixels can be removed without altering the -connectivity or shortening the sceleton legs" (p. 541). The authors +connectivity or shortening the skeleton legs" (p. 541). The authors prove that the thinning process described always converges and produces -one-pixel thick sceletons. The number of iterations depends on the +one-pixel thick skeletons. The number of iterations depends on the original thickness of the object. Each iteration peels off the outside pixels from the object. Therefore, if the object is \<= n pixels thick, the algorithm should converge in \<= iterations. diff --git a/raster/r.timestamp/test_suite/test.r.timestamp.sh b/raster/r.timestamp/test_suite/test.r.timestamp.sh index da187f7b5ef..3650901a50e 100755 --- a/raster/r.timestamp/test_suite/test.r.timestamp.sh +++ b/raster/r.timestamp/test_suite/test.r.timestamp.sh @@ -6,7 +6,7 @@ # The region setting should work for UTM and LL test locations g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3 -# Lets gerenate a test map +# Lets generate a test map r.mapcalc --o expr="map = 1" # The first @test uses several different absolute datum formats diff --git a/raster/r.uslek/prct2tex.c b/raster/r.uslek/prct2tex.c index a73ed62685c..20d52a7fff4 100644 --- a/raster/r.uslek/prct2tex.c +++ b/raster/r.uslek/prct2tex.c @@ -22,7 +22,7 @@ double point_in_triangle(double point_x, double point_y, double point_z, double answer2_x, answer2_y, answer2_z; double answer3_x, answer3_y, answer3_z; - /* Consider three points forming a trinagle from a given soil class boundary + /* Consider three points forming a triangle from a given soil class boundary * ABC */ /* Consider F an additional point in space */ double af1, af2, af3; /*Points for vector AF */ diff --git a/raster/r.viewshed/distribute.cpp b/raster/r.viewshed/distribute.cpp index c72ab1c66b1..0ddb176cfdd 100644 --- a/raster/r.viewshed/distribute.cpp +++ b/raster/r.viewshed/distribute.cpp @@ -1089,7 +1089,7 @@ int is_center_gradient_occluded(AEvent *e, double gradient, Viewpoint *vp) } /*********************************************************************** -called when dropping an event e, high is the highest gradiant value +called when dropping an event e, high is the highest gradient value //in its sector*/ void print_dropped(AEvent *e, Viewpoint *vp, double high) { diff --git a/raster/r.viewshed/distribute.h b/raster/r.viewshed/distribute.h index c38fe8a864a..1ef7c9e7ac0 100644 --- a/raster/r.viewshed/distribute.h +++ b/raster/r.viewshed/distribute.h @@ -127,8 +127,7 @@ void insert_event_in_sector_no_drop(AEvent *e, int s, AMI_STREAM
*str, /* returns 1 if the center of event is occluded by the gradient, which is assumed to be in line with the event */ int is_center_gradient_occluded(AEvent *e, double gradient, Viewpoint *vp); - -/* called when dropping an event e, high is the highest gradiant value +/* called when dropping an event e, high is the highest gradient value in its sector */ void print_dropped(AEvent *e, Viewpoint *vp, double high); diff --git a/raster/r.viewshed/grass.cpp b/raster/r.viewshed/grass.cpp index 6ab70e4d9e2..4fc5fac614c 100644 --- a/raster/r.viewshed/grass.cpp +++ b/raster/r.viewshed/grass.cpp @@ -116,7 +116,7 @@ GridHeader *read_header(char *rastName, Cell_head *region) G_warning( _("East-west resolution does not equal north-south resolution. " "The viewshed computation assumes the cells are square, so in " - "this case this may result in innacuracies.")); + "this case this may result in inaccuracies.")); // exit(EXIT_FAILURE); } hd->ew_res = region->ew_res; diff --git a/raster/r.viewshed/main.cpp b/raster/r.viewshed/main.cpp index 3221d999662..7c244936584 100644 --- a/raster/r.viewshed/main.cpp +++ b/raster/r.viewshed/main.cpp @@ -300,8 +300,8 @@ int main(int argc, char *argv[]) BASE_CASE = 1; /*if the user set the FORCE_DISTRIBUTION flag, then the - algorithm runs in the fuly recursive mode (even if this is - not necessary). This is used solely for debugging purpses */ + algorithm runs in the fully recursive mode (even if this is + not necessary). This is used solely for debugging purposes */ #ifdef FORCE_DISTRIBUTION BASE_CASE = 0; #endif diff --git a/raster/r.viewshed/visibility.cpp b/raster/r.viewshed/visibility.cpp index 2955e471722..3144f92a3ef 100644 --- a/raster/r.viewshed/visibility.cpp +++ b/raster/r.viewshed/visibility.cpp @@ -238,7 +238,7 @@ float angleVisibilityOutput(float x) /* ------------------------------------------------------------ */ /* visgrid is the structure that records the visibility information after the sweep is done. Use it to write the visibility output - grid and then distroy it. + grid and then destroy it. */ void save_inmem_visibilitygrid(MemoryVisibilityGrid *visgrid, ViewOptions viewOptions, Viewpoint vp) diff --git a/raster/r.walk/TODO b/raster/r.walk/TODO index 15599165b13..2d9dc1b36b6 100644 --- a/raster/r.walk/TODO +++ b/raster/r.walk/TODO @@ -11,7 +11,7 @@ path, because "cost" right now is ("time travel in seconds" + Lamba * it would be interesting to model all the aspects that influence the speed movement "inside" the a,b,c,d (see the r.walk documentation) -parameters going back to a phisical meaning (speed in a specific +parameters going back to a physical meaning (speed in a specific condition) of the formula (the real time in second that the subject need to move between two points). diff --git a/raster/r.watershed/shed/com_line.c b/raster/r.watershed/shed/com_line.c index 8629b1dd4c5..287ed7d800e 100644 --- a/raster/r.watershed/shed/com_line.c +++ b/raster/r.watershed/shed/com_line.c @@ -274,8 +274,8 @@ int com_line_Gwater(INPUT *input, OUTPUT *output) r.stats), but the format is supposed to be "user-friendly" to hydrologists. For the stats to be created, the armsed file output needs to exist. For the stats to be an option in this program: 1) it should be - querried before the armsed file query, and 2) make the armsed file query - manditory if this option is invoked. + queried before the armsed file query, and 2) make the armsed file query + mandatory if this option is invoked. */ G_message(_("\n%s will generate a lot of output. Indicate a file"), diff --git a/raster/r.watershed/testsuite/r_watershed_test.py b/raster/r.watershed/testsuite/r_watershed_test.py index 47be3c01313..da5939aa022 100644 --- a/raster/r.watershed/testsuite/r_watershed_test.py +++ b/raster/r.watershed/testsuite/r_watershed_test.py @@ -124,7 +124,7 @@ def test_fourFlag(self): stream=self.stream_2, length_slope=self.lengthslope_2, ) - # Use the assertRastersNoDifference with precsion 100 to see if close + # Use the assertRastersNoDifference with precision 100 to see if close # Compare stream output self.assertRastersNoDifference(self.stream_2, self.stream, 100) # Compare length_slope output diff --git a/raster/rasterintro.html b/raster/rasterintro.html index e1df2d22e11..48f79c76fa4 100644 --- a/raster/rasterintro.html +++ b/raster/rasterintro.html @@ -89,7 +89,7 @@ Metadata
Metadata such as map title, units, vertical datum etc. can be updated with r.support. Timestamps are managed with r.timestamp. Region extent and -resolution are mangaged with r.region. +resolution are managed with r.region.Raster map operations
diff --git a/raster/rasterintro.md b/raster/rasterintro.md index 47fdfc2a7a2..ca6bd019d5b 100644 --- a/raster/rasterintro.md +++ b/raster/rasterintro.md @@ -87,7 +87,7 @@ such as region extent, data range, data type, creation history, and other metadata. Metadata such as map title, units, vertical datum etc. can be updated with [r.support](r.support.md). Timestamps are managed with [r.timestamp](r.timestamp.md). Region extent and resolution are -mangaged with [r.region](r.region.md). +managed with [r.region](r.region.md). ## Raster map operations diff --git a/raster3d/r3.gwflow/main.c b/raster3d/r3.gwflow/main.c index 6063b865c4f..cd98b56e0dd 100644 --- a/raster3d/r3.gwflow/main.c +++ b/raster3d/r3.gwflow/main.c @@ -301,7 +301,7 @@ int main(int argc, char *argv[]) N_write_array_3d_to_rast3d(budget, param.budget->answer, 1); } - /*Compute the the velocity field if required and write the result into three + /*Compute the velocity field if required and write the result into three * rast3d maps */ if (param.vector_x->answer || param.vector_y->answer || param.vector_z->answer) { diff --git a/raster3d/r3.in.lidar/main.c b/raster3d/r3.in.lidar/main.c index 3cf91189d24..0f2c27faaec 100644 --- a/raster3d/r3.in.lidar/main.c +++ b/raster3d/r3.in.lidar/main.c @@ -7,7 +7,7 @@ * PURPOSE: Imports LAS LiDAR point clouds to a 3D raster map using * aggregate statistics. * - * COPYRIGHT: (C) 2016 Vaclav Petras and the The GRASS Development Team + * COPYRIGHT: (C) 2016 Vaclav Petras and The GRASS Development Team * * This program is free software under the GNU General Public * License (>=v2). Read the file COPYING that comes with GRASS diff --git a/raster3d/r3.in.v5d/r3.in.v5d.html b/raster3d/r3.in.v5d/r3.in.v5d.html index 36644159fa5..ea35fcca589 100644 --- a/raster3d/r3.in.v5d/r3.in.v5d.html +++ b/raster3d/r3.in.v5d/r3.in.v5d.html @@ -9,7 +9,7 @@DESCRIPTION
produced by numerical weather models. The user can make isosurfaces, contour line slices, colored slices, volume renderings, etc. of data in a 3D raster map, then rotate and animate the images in real time. There's also a feature -for wind trajectory tracing, a way to make text anotations for publications, +for wind trajectory tracing, a way to make text annotations for publications, support for interactive data analysis, etc.SEE ALSO
diff --git a/raster3d/r3.in.v5d/r3.in.v5d.md b/raster3d/r3.in.v5d/r3.in.v5d.md index bf2266f8119..08fcc67a4fd 100644 --- a/raster3d/r3.in.v5d/r3.in.v5d.md +++ b/raster3d/r3.in.v5d/r3.in.v5d.md @@ -9,7 +9,7 @@ visualization of large 5D gridded data sets such as those produced by numerical weather models. The user can make isosurfaces, contour line slices, colored slices, volume renderings, etc. of data in a 3D raster map, then rotate and animate the images in real time. There's also a -feature for wind trajectory tracing, a way to make text anotations for +feature for wind trajectory tracing, a way to make text annotations for publications, support for interactive data analysis, etc. ## SEE ALSO diff --git a/raster3d/r3.in.v5d/v5d.c b/raster3d/r3.in.v5d/v5d.c index ef9f7487ae3..87411fc237f 100644 --- a/raster3d/r3.in.v5d/v5d.c +++ b/raster3d/r3.in.v5d/v5d.c @@ -408,7 +408,7 @@ void v5dPrintStruct(const v5dstruct *v) printf("Rotated equidistant projection:\n"); printf("\tLatitude of grid(0,0): %f\n", v->ProjArgs[0]); printf("\tLongitude of grid(0,0): %f\n", v->ProjArgs[1]); - printf("\tRow Increment: %f degress\n", v->ProjArgs[2]); + printf("\tRow Increment: %f degrees\n", v->ProjArgs[2]); printf("\tColumn Increment: %f degrees\n", v->ProjArgs[3]); printf("\tCenter Latitude: %f\n", v->ProjArgs[4]); printf("\tCenter Longitude: %f\n", v->ProjArgs[5]); diff --git a/raster3d/r3.info/main.c b/raster3d/r3.info/main.c index 1a12cfcc126..020d5b36eb7 100644 --- a/raster3d/r3.info/main.c +++ b/raster3d/r3.info/main.c @@ -18,7 +18,7 @@ /* \todo * History support still not full implemented. - * Only parts of the timestep functionality are implemented, the timzone is + * Only parts of the timestep functionality are implemented, the timezone is * missed ;). */ diff --git a/raster3d/r3.out.ascii/main.c b/raster3d/r3.out.ascii/main.c index a72029f900a..f15db799d04 100644 --- a/raster3d/r3.out.ascii/main.c +++ b/raster3d/r3.out.ascii/main.c @@ -164,7 +164,7 @@ void writeHeaderString3(FILE *fp, char *valueString, const char *value) /*---------------------------------------------------------------------------*/ -/* Opens the output acsii file and writes the header. +/* Opens the output ascii file and writes the header. * Returns the file handle for the output file. */ FILE *openAscii(char *asciiFile, RASTER3D_Region region) diff --git a/raster3d/r3.out.v5d/main.c b/raster3d/r3.out.v5d/main.c index 681a24a2e65..347279964b1 100644 --- a/raster3d/r3.out.v5d/main.c +++ b/raster3d/r3.out.v5d/main.c @@ -212,8 +212,8 @@ void convert(char *fileout, int rows, int cols, int depths, int trueCoords) for loops are different to r3.out.ascii and r3.to.sites - hmpf */ /*AV*/ - /* IT WORKS WHIT A PARTICULAR FOR LOOP PROBABLY BECAUSE THE DATA - ARE NOT STORED IN A 3D MATRIX [z,y,x] BUT IN A POINTER + /* IT WORKS WITH A PARTICULAR FOR LOOP PROBABLY BECAUSE THE DATA + IS NOT STORED IN A 3D MATRIX [z,y,x] BUT IN A POINTER MANAGED AS (z,x,y) */ for (z = 0; z < depths; z++) { G_percent(z, depths, 1); diff --git a/raster3d/r3.out.v5d/r3.out.v5d.html b/raster3d/r3.out.v5d/r3.out.v5d.html index f541cb86225..d5096313fc0 100644 --- a/raster3d/r3.out.v5d/r3.out.v5d.html +++ b/raster3d/r3.out.v5d/r3.out.v5d.html @@ -10,7 +10,7 @@DESCRIPTION
produced by numerical weather models. The user can make isosurfaces, contour line slices, colored slices, volume renderings, etc. of data in a 3D raster map, then rotate and animate the images in real time. There's also a feature -for wind trajectory tracing, a way to make text anotations for publications, +for wind trajectory tracing, a way to make text annotations for publications, support for interactive data analysis, etc.SEE ALSO
diff --git a/raster3d/r3.out.v5d/r3.out.v5d.md b/raster3d/r3.out.v5d/r3.out.v5d.md index 2e93930cd38..b100ce08e9e 100644 --- a/raster3d/r3.out.v5d/r3.out.v5d.md +++ b/raster3d/r3.out.v5d/r3.out.v5d.md @@ -10,7 +10,7 @@ visualization of large 5D gridded data sets such as those produced by numerical weather models. The user can make isosurfaces, contour line slices, colored slices, volume renderings, etc. of data in a 3D raster map, then rotate and animate the images in real time. There's also a -feature for wind trajectory tracing, a way to make text anotations for +feature for wind trajectory tracing, a way to make text annotations for publications, support for interactive data analysis, etc. ## SEE ALSO diff --git a/raster3d/r3.out.v5d/v5d.c b/raster3d/r3.out.v5d/v5d.c index f44bbc1a86a..67cbbc3a924 100644 --- a/raster3d/r3.out.v5d/v5d.c +++ b/raster3d/r3.out.v5d/v5d.c @@ -405,7 +405,7 @@ void v5dPrintStruct(const v5dstruct *v) printf("Rotated equidistant projection:\n"); printf("\tLatitude of grid(0,0): %f\n", v->ProjArgs[0]); printf("\tLongitude of grid(0,0): %f\n", v->ProjArgs[1]); - printf("\tRow Increment: %f degress\n", v->ProjArgs[2]); + printf("\tRow Increment: %f degrees\n", v->ProjArgs[2]); printf("\tColumn Increment: %f degrees\n", v->ProjArgs[3]); printf("\tCenter Latitude: %f\n", v->ProjArgs[4]); printf("\tCenter Longitude: %f\n", v->ProjArgs[5]); diff --git a/raster3d/r3.out.vtk/testsuite/test_r3_out_vtk.sh b/raster3d/r3.out.vtk/testsuite/test_r3_out_vtk.sh index 5c2564feac1..ac49b298a5c 100755 --- a/raster3d/r3.out.vtk/testsuite/test_r3_out_vtk.sh +++ b/raster3d/r3.out.vtk/testsuite/test_r3_out_vtk.sh @@ -27,7 +27,7 @@ r3.out.vtk --o input=volume_null output=test_volume_null_1_cells.vtk precision=3 r3.out.vtk -p --o input=volume_null output=test_volume_null_1_points.vtk precision=3 null=0 # The second @test adds rgb and vector maps. We re-use the created volume map -# for vector creation. The rgb value must range fom 0 - 255. The generated @files +# for vector creation. The rgb value must range from 0 - 255. The generated @files # should be compared with the reference data. r3.out.vtk --o rgbmaps=volume_rgb,volume_rgb,volume_rgb vectormaps=volume_null,volume_null,volume_null input=volume_null output=test_volume_null_1_cells_rgb_vect.vtk precision=3 null=-1.0 r3.out.vtk -p --o rgbmaps=volume_rgb,volume_rgb,volume_rgb vectormaps=volume_null,volume_null,volume_null input=volume_null output=test_volume_null_1_points_rgb_vect.vtk precision=3 null=-1.0 diff --git a/raster3d/r3.timestamp/test_suite/test.r3.timestamp.sh b/raster3d/r3.timestamp/test_suite/test.r3.timestamp.sh index f5ea172a62d..068ae23cbd6 100755 --- a/raster3d/r3.timestamp/test_suite/test.r3.timestamp.sh +++ b/raster3d/r3.timestamp/test_suite/test.r3.timestamp.sh @@ -6,7 +6,7 @@ # The region setting should work for UTM and LL test locations g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3 -# Lets gerenate a test map +# Lets generate a test map r3.mapcalc --o expr="map3d = 1" # The first @test uses several different absolute datum formats