[GRASS-CVS] carlos: grass6/raster/wildfire/r.ros main.c,2.9,2.10
grass at intevation.de
grass at intevation.de
Fri Nov 23 10:49:10 EST 2007
Author: carlos
Update of /grassrepository/grass6/raster/wildfire/r.ros
In directory doto:/tmp/cvs-serv18355/raster/wildfire/r.ros
Modified Files:
main.c
Log Message:
Message standardization
Index: main.c
===================================================================
RCS file: /grassrepository/grass6/raster/wildfire/r.ros/main.c,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- main.c 20 Nov 2007 20:24:28 -0000 2.9
+++ main.c 23 Nov 2007 15:49:07 -0000 2.10
@@ -312,7 +312,7 @@
G_fatal_error(_("Raster map <%s> not found"), parm.model->answer);
if (!(parm.mois_1h->answer || parm.mois_10h->answer || parm.mois_100h->answer)) {
- G_warning("No dead fuel moisture is given. At least one of the 1-h, 10-h, 100-h moisture layers is required.");
+ G_warning("no dead fuel moisture is given. At least one of the 1-h, 10-h, 100-h moisture layers is required.");
G_usage();
exit(EXIT_FAILURE);
}
@@ -334,12 +334,12 @@
G_fatal_error(_("Raster map <%s> not found"), parm.mois_live->answer);
if (parm.vel->answer && !(parm.dir->answer)) {
- G_warning("A wind direction layer should be given if the wind velocity layer--%s-- has been given\n", parm.vel->answer);
+ G_warning("a wind direction layer should be given if the wind velocity layer--%s-- has been given\n", parm.vel->answer);
G_usage();
exit(EXIT_FAILURE);
}
if (!(parm.vel->answer) && parm.dir->answer) {
- G_warning("A wind velocity layer should be given if the wind direction layer--%s-- has been given\n", parm.dir->answer);
+ G_warning("a wind velocity layer should be given if the wind direction layer--%s-- has been given\n", parm.dir->answer);
G_usage();
exit(EXIT_FAILURE);
}
@@ -353,12 +353,12 @@
}
if (parm.slope->answer && !(parm.aspect->answer)) {
- G_warning("An aspect layer should be given if the slope layer--%s-- has been given\n", parm.slope->answer);
+ G_warning("an aspect layer should be given if the slope layer--%s-- has been given\n", parm.slope->answer);
G_usage();
exit(EXIT_FAILURE);
}
if (!(parm.slope->answer) && parm.aspect->answer) {
- G_warning("A slope layer should be given if the aspect layer--%s-- has been given\n", parm.aspect->answer);
+ G_warning("a slope layer should be given if the aspect layer--%s-- has been given\n", parm.aspect->answer);
G_usage();
exit(EXIT_FAILURE);
}
@@ -373,7 +373,7 @@
if (spotting) {
if (!(parm.elev->answer)) {
- G_warning("An elevation layer should be given if considering spotting\n");
+ G_warning("an elevation layer should be given if considering spotting\n");
G_usage();
exit(EXIT_FAILURE);
} else {
@@ -384,7 +384,7 @@
/* Check if specified output layer name IS LEGAL */
if (G_legal_filename (parm.output->answer) < 0)
- G_fatal_error(_("<%s> is an illegal file name"), parm.output->answer);
+ G_fatal_error("%s - illegal name", parm.output->answer);
/*assign names of the three output ROS layers*/
sprintf(name_base, "%s.base", parm.output->answer);
@@ -393,24 +393,24 @@
/*check if the output layer names EXIST*/
if (G_find_cell2 (name_base, G_mapset()))
- G_fatal_error(_("<%s> already exists in mapset <%s>, select another name"),name_base, G_mapset());
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),name_base, G_mapset());
if (G_find_cell2 (name_max, G_mapset()))
- G_fatal_error(_("<%s> already exists in mapset <%s>, select another name"),name_max, G_mapset());
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),name_max, G_mapset());
if (G_find_cell2 (name_maxdir, G_mapset()))
- G_fatal_error(_("<%s> already exists in mapset <%s>, select another name"),name_maxdir, G_mapset());
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),name_maxdir, G_mapset());
/*assign a name to output SPOTTING distance layer*/
if (spotting) {
sprintf(name_spotdist, "%s.spotdist", parm.output->answer);
if (G_find_cell2 (name_spotdist, G_mapset()))
- G_fatal_error(_("<%s> already exists in mapset <%s>, select another name"),name_spotdist, G_mapset());
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),name_spotdist, G_mapset());
}
/* Get database window parameters */
if(G_get_window (&window) < 0)
- G_fatal_error(_("Unable to read current window parameters"));
+ G_fatal_error("can't read current window parameters");
/* find number of rows and columns in window */
nrows = G_window_rows();
@@ -558,41 +558,41 @@
if (spotting)
for (row=0; row<nrows; row++) {
if (G_get_map_row(elev_fd, elev, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), elev, row);
+ G_fatal_error("cannot get map row!");
for (col=0; col<ncols; col++)
DATA(map_elev, row, col) = elev[col];
}
/*major computation: compute ROSs one cell a time*/
- G_message (_("Percent completed... "));
+ G_message (_("Percent Completed ... "));
for ( row=0 ; row < nrows ; row++ ) {
G_percent (row, nrows, 2);
if (G_get_map_row(fuel_fd, fuel, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), fuel, row);
+ G_fatal_error("cannot get map row: %d!", row);
if (parm.mois_1h->answer)
if (G_get_map_row(mois_1h_fd, mois_1h, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), mois_1h, row);
+ G_fatal_error("cannot get map row: %d!", row);
if (parm.mois_10h->answer)
if (G_get_map_row(mois_10h_fd, mois_10h, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), mois_10h, row);
+ G_fatal_error("cannot get map row: %d!", row);
if (parm.mois_100h->answer)
if (G_get_map_row(mois_100h_fd, mois_100h, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), mois_100h, row);
+ G_fatal_error("cannot get map row: %d!", row);
if ( G_get_map_row(mois_live_fd, mois_live, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), mois_live, row);
+ G_fatal_error("cannot get map row: %d!", row);
if (parm.vel->answer)
if (G_get_map_row(vel_fd, vel, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), vel, row);
+ G_fatal_error("cannot get map row: %d!", row);
if (parm.dir->answer)
if (G_get_map_row(dir_fd, dir, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), dir, row);
+ G_fatal_error("cannot get map row: %d!", row);
if (parm.slope->answer)
if (G_get_map_row(slope_fd, slope, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), slope, row);
+ G_fatal_error("cannot get map row: %d!", row);
if (parm.aspect->answer)
if (G_get_map_row(aspect_fd, aspect, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), aspect, row);
+ G_fatal_error("cannot get map row: %d!", row);
/*initialize cell buffers for output map layers*/
for (col = 0; col < ncols; col++) {
More information about the grass-commit
mailing list