gislib: G_find_cell renamed to G_find_raster

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38612 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.colors/main.c

@@ -60,7 +60,7 @@ int main(int argc, char **argv)
     /* Make sure map is available */
     if (map->answer == NULL)
 	exit(0);
-    mapset = G_find_cell2(map->answer, "");
+    mapset = G_find_raster2(map->answer, "");
     if (mapset == NULL) {
 	char msg[256];
 

display/d.nviz/main.c

@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
     name = parm.opt1->answer;
 
     /* Open Raster File */
-    if (NULL == (mapset = G_find_cell2(name, "")))
+    if (NULL == (mapset = G_find_raster2(name, "")))
 	G_fatal_error(_("Raster map <%s> not found"), name);
     if (0 > (fd = Rast_open_old(name, mapset)))
 	G_fatal_error(_("Unable to open raster map <%s>"), name);

display/d.what.rast/opencell.c

@@ -8,7 +8,7 @@ int opencell(char *fullname, char *name, char *mapset)
     int fd;
 
     strcpy(name, fullname);
-    m = G_find_cell2(name, "");
+    m = G_find_raster2(name, "");
     if (m == NULL) {
 	G_warning(_("Raster map <%s> not found"), name);
 	return -1;

doc/raster/r.example/main.c

@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 
     /* returns NULL if the map was not found in any mapset, 
      * mapset name otherwise */
-    mapset = (char *) G_find_cell2(name, "");
+    mapset = (char *) G_find_raster2(name, "");
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 

general/g.region/main.c

@@ -450,7 +450,7 @@ int main(int argc, char *argv[])
 	    char rast_name[GNAME_MAX];
 
 	    strcpy(rast_name, *rast_ptr);
-	    mapset = G_find_cell2(rast_name, "");
+	    mapset = G_find_raster2(rast_name, "");
 	    if (!mapset)
 		G_fatal_error(_("Raster map <%s> not found"), rast_name);
 	    if (Rast_get_cellhd(rast_name, mapset, &temp_window) < 0)
@@ -776,7 +776,7 @@ int main(int argc, char *argv[])
 
     /* zoom= */
     if ((name = parm.zoom->answer)) {
-	mapset = G_find_cell2(name, "");
+	mapset = G_find_raster2(name, "");
 	if (!mapset)
 	    G_fatal_error(_("Raster map <%s> not found"), name);
 	zoom(&window, name, mapset);
@@ -784,7 +784,7 @@ int main(int argc, char *argv[])
 
     /* align= */
     if ((name = parm.align->answer)) {
-	mapset = G_find_cell2(name, "");
+	mapset = G_find_raster2(name, "");
 	if (!mapset)
 	    G_fatal_error(_("Raster map <%s> not found"), name);
 	if (Rast_get_cellhd(name, mapset, &temp_window) < 0)

gui/wxpython/nviz/load.cpp

@@ -34,7 +34,7 @@ int Nviz::LoadSurface(const char* name, const char *color_name, const char *colo
     const char *mapset;
     int id;
 
-    mapset = G_find_cell2 (name, "");
+    mapset = G_find_raster2 (name, "");
     if (mapset == NULL) {
 	G_warning(_("Raster map <%s> not found"),
 		  name);
@@ -47,7 +47,7 @@ int Nviz::LoadSurface(const char* name, const char *color_name, const char *colo
 			  data);
 
     if (color_name) { /* check for color map */
-	mapset = G_find_cell2 (color_name, "");
+	mapset = G_find_raster2 (color_name, "");
 	if (mapset == NULL) {
 	    G_warning(_("Raster map <%s> not found"),
 		      color_name);

imagery/i.atcorr/main.cpp

@@ -588,7 +588,7 @@ int main(int argc, char* argv[])
 	exit (EXIT_FAILURE);
 
     /* open input raster */
-    if ( (iimg_mapset = G_find_cell2 ( opts.iimg->answer, "") ) == NULL )
+    if ( (iimg_mapset = G_find_raster2 ( opts.iimg->answer, "") ) == NULL )
 	G_fatal_error ( _("Raster map <%s> not found"), opts.iimg->answer);
     if((iimg_fd = Rast_open_old(opts.iimg->answer, iimg_mapset)) < 0)
 	G_fatal_error (_("Unable to open raster map <%s>"),
@@ -597,7 +597,7 @@ int main(int argc, char* argv[])
     adjust_region(opts.iimg->answer, iimg_mapset);
         
     if(opts.ialt->answer) {
-	if ( (ialt_mapset = G_find_cell2 ( opts.ialt->answer, "") ) == NULL )
+	if ( (ialt_mapset = G_find_raster2 ( opts.ialt->answer, "") ) == NULL )
 	    G_fatal_error ( _("Raster map <%s> not found"), opts.ialt->answer);
 	if((ialt_fd = Rast_open_old(opts.ialt->answer, ialt_mapset)) < 0)
             G_fatal_error (_("Unable to open raster map <%s>"),
@@ -605,7 +605,7 @@ int main(int argc, char* argv[])
     }
 
     if(opts.ivis->answer) {
-	if ( (iviz_mapset = G_find_cell2 ( opts.ivis->answer, "") ) == NULL )
+	if ( (iviz_mapset = G_find_raster2 ( opts.ivis->answer, "") ) == NULL )
 	    G_fatal_error ( _("Raster map <%s> not found"), opts.ivis->answer);
 	if((ivis_fd = Rast_open_old(opts.ivis->answer, iviz_mapset)) < 0)
             G_fatal_error (_("Unable to open raster map <%s>"),

imagery/i.class/main.c

@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
     /* put out a title */
     display_title(VIEW_MAP1);
 
-    mapset = G_find_cell(bg_map->answer, "");
+    mapset = G_find_raster(bg_map->answer, "");
     if (Rast_get_cellhd(bg_map->answer, mapset, &cellhd) != 0)
 	G_fatal_error(_("Raster map <%s> not found"), bg_map->answer);
 
@@ -246,7 +246,7 @@ static int check_files(char *img_group, char *img_subgroup,
 
     any = 0;
     for (n = 0; n < Refer.nfiles; n++) {
-	if (G_find_cell(Refer.file[n].name, Refer.file[n].mapset) == NULL) {
+	if (G_find_raster(Refer.file[n].name, Refer.file[n].mapset) == NULL) {
 	    if (!any)
 		G_warning(_("** The following raster maps in subgroup "
 			    "[%s] do not exist:"), img_subgroup);

imagery/i.cluster/open_files.c

@@ -29,7 +29,7 @@ int open_files(void)
     for (n = 0; n < ref.nfiles; n++) {
 	name = ref.file[n].name;
 	mapset = ref.file[n].mapset;
-	if (G_find_cell(name, mapset) == NULL) {
+	if (G_find_raster(name, mapset) == NULL) {
 	    missing = 1;
 	    G_warning(_("Raster map <%s> do not exists in subgroup <%s>"),
 		      G_fully_qualified_name(name, mapset), subgroup);

imagery/i.evapo.time_integration/main.c

@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
 			  MAXFILES);
 	name = *ptr;
 	/* find map in mapset */
-	mapset = (char *) G_find_cell2(name, "");
+	mapset = (char *) G_find_raster2(name, "");
 	if (mapset == NULL) {
 	    G_fatal_error(_("Raster map <%s> not found"), name);
 	    ok = 0;
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
 			  MAXFILES);
 	name1 = *ptr1;
 	/* find map in mapset */
-	mapset = (char *) G_find_cell2(name1, "");
+	mapset = (char *) G_find_raster2(name1, "");
 	if (mapset == NULL) {
 	    G_fatal_error(_("Raster map <%s> not found"), name1);
 	    ok = 0;
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
 			  MAXFILES);
 	name2 = *ptr2;
 	/* find map in mapset */
-	mapset = (char *) G_find_cell2(name2, "");
+	mapset = (char *) G_find_raster2(name2, "");
 	if (mapset == NULL) {
 	    G_fatal_error(_("Raster map <%s> not found"), name2);
 	    ok = 0;

imagery/i.gensig/labels.c

@@ -9,7 +9,7 @@ void read_training_labels(struct parms *parms, struct files *files)
     const char *map;
 
     map = parms->training_map;
-    mapset = G_find_cell2(map, "");
+    mapset = G_find_raster2(map, "");
     if (Rast_read_cats(map, mapset, &files->training_labels) < 0)
 	Rast_init_cats("", &files->training_labels);
 }

imagery/i.gensig/openfiles.c

@@ -29,7 +29,7 @@ int openfiles(struct parms *parms, struct files *files)
     files->band_cell = (DCELL **) G_calloc(Ref.nfiles, sizeof(DCELL *));
 
     /* open training map for reading */
-    mapset = G_find_cell2(parms->training_map, "");
+    mapset = G_find_raster2(parms->training_map, "");
     files->train_fd = Rast_open_old(parms->training_map, mapset);
     if (files->train_fd < 0)
 	G_fatal_error(_("Unable to open training map <%s>"),

imagery/i.gensig/parse.c

@@ -32,7 +32,7 @@ int parse(int argc, char *argv[], struct parms *parms)
     parms->sigfile = sigfile->answer;
 
     /* check all the inputs */
-    if (G_find_cell(parms->training_map, "") == NULL)
+    if (G_find_raster(parms->training_map, "") == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), parms->training_map);
 
     if (!I_find_group(parms->group))

imagery/i.gensigset/labels.c

@@ -10,7 +10,7 @@ void read_training_labels(struct parms *parms, struct files *files)
     const char *map;
 
     map = parms->training_map;
-    mapset = G_find_cell2(map, "");
+    mapset = G_find_raster2(map, "");
     if (Rast_read_cats(map, mapset, &files->training_labels) < 0)
 	Rast_init_cats("", &files->training_labels);
 }

imagery/i.gensigset/openfiles.c

@@ -29,7 +29,7 @@ int openfiles(struct parms *parms, struct files *files)
     files->band_cell = (DCELL **) G_calloc(Ref.nfiles, sizeof(DCELL *));
 
     /* open training map for reading */
-    mapset = G_find_cell2(parms->training_map, "");
+    mapset = G_find_raster2(parms->training_map, "");
     files->train_fd = Rast_open_old(parms->training_map, mapset);
     if (files->train_fd < 0)
 	G_fatal_error(_("Unable to open training map <%s>"),

imagery/i.gensigset/parse.c

@@ -38,7 +38,7 @@ int parse(int argc, char *argv[], struct parms *parms)
     parms->sigfile = sigfile->answer;
 
     /* check all the inputs */
-    if (G_find_cell(parms->training_map, "") == NULL) {
+    if (G_find_raster(parms->training_map, "") == NULL) {
 	G_fatal_error(_("Raster map <%s> not found"), parms->training_map);
     }
     if (!I_find_group(parms->group)) {

imagery/i.group/main.c

@@ -201,7 +201,7 @@ static int add_or_update_group(char group[INAME_LEN], char **rasters, int k)
 
     for (m = 0; m < k; m++) {
 	skip = 0;
-	if ((mapset = G_find_cell(rasters[m], "")) == NULL)
+	if ((mapset = G_find_raster(rasters[m], "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), rasters[m]);
 
 	G_message(_("Adding raster map <%s> to group"),
@@ -240,7 +240,7 @@ static int add_or_update_subgroup(char group[INAME_LEN],
 
     for (m = 0; m < k; m++) {
 	skip = 0;
-	if ((mapset = G_find_cell(rasters[m], "")) == NULL)
+	if ((mapset = G_find_raster(rasters[m], "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"),
 			  G_fully_qualified_name(rasters[m], mapset));
 

imagery/i.smap/opencell.c

@@ -9,7 +9,7 @@ int open_cell_old(const char *name, const char *mapset)
     int fd;
 
     if (mapset == NULL)
-	mapset = G_find_cell2(name, "");
+	mapset = G_find_raster2(name, "");
     fd = Rast_open_old(name, mapset);
     if (fd >= 0)
 	return fd;

include/gisdefs.h

@@ -212,8 +212,8 @@ char *G__file_name_misc(char *, const char *, const char *, const char *,
 			const char *);
 
 /* find_cell.c */
-const char *G_find_cell(char *, const char *);
-const char *G_find_cell2(const char *, const char *);
+const char *G_find_raster(char *, const char *);
+const char *G_find_raster2(const char *, const char *);
 
 /* find_file.c */
 const char *G_find_file(const char *, char *, const char *);

lib/gis/find_cell.c

@@ -27,14 +27,14 @@
  * returned. If not found, the NULL pointer is returned.
  *
  * Note: If the user specifies a fully qualified raster map which
- * exists, then G_find_cell() modifies <i>name</i> by removing
+ * exists, then G_find_raster() modifies <i>name</i> by removing
  * the "@<i>mapset</i>".
  *
  * For example, to find a raster map anywhere in the database:
  \code
  char name[GNAME_MAX];
  char *mapset;
- if ((mapset = G_find_cell(name,"")) == NULL)
+ if ((mapset = G_find_raster(name,"")) == NULL)
  // not found
  \endcode
  *
@@ -42,7 +42,7 @@
  *
  \code
  char name[GNAME_MAX];
- if (G_find_cell(name, G_mapset()) == NULL)
+ if (G_find_raster(name, G_mapset()) == NULL)
  // not found
  \endcode
  *
@@ -52,7 +52,7 @@
  * \return mapset where raster map was found
  * \return NULL if not found
  */
-const char *G_find_cell(char *name, const char *mapset)
+const char *G_find_raster(char *name, const char *mapset)
 {
     return G_find_file("cell", name, mapset);
 }
@@ -60,7 +60,7 @@ const char *G_find_cell(char *name, const char *mapset)
 /*!
  * \brief Find a raster map (look but don't touch)
  *
- * The same as G_find_cell() but doesn't remove the "@<i>mapset</i>"
+ * The same as G_find_raster() but doesn't remove the "@<i>mapset</i>"
  * qualification from <i>name</i>, if present.
  *
  * Returns NULL if the map wasn't found, or the mapset the raster was
@@ -72,7 +72,7 @@ const char *G_find_cell(char *name, const char *mapset)
  * \return mapset where raster map was found
  * \return NULL if not found
  */
-const char *G_find_cell2(const char *name, const char *mapset)
+const char *G_find_raster2(const char *name, const char *mapset)
 {
     return G_find_file2("cell", name, mapset);
 }

lib/gis/legal_name.c

@@ -84,7 +84,7 @@ int G_check_input_output_name(const char *input, const char *output,
 	}
     }
 
-    mapset = G_find_cell2(input, "");
+    mapset = G_find_raster2(input, "");
 
     if (mapset == NULL) {
 	if (error == GR_FATAL_EXIT) {

lib/gpde/N_arrays_io.c

@@ -53,7 +53,7 @@ N_array_2d *N_read_rast_to_array_2d(char *name, N_array_2d * array)
     struct Cell_head region;
     N_array_2d *data = array;
 
-    if (NULL == G_find_cell2(name, ""))
+    if (NULL == G_find_raster2(name, ""))
 	G_fatal_error(_("Raster map <%s> not found"), name);
 
     /* Get the active region */
@@ -64,7 +64,7 @@ N_array_2d *N_read_rast_to_array_2d(char *name, N_array_2d * array)
     cols = region.cols;
 
     /*open the raster map */
-    map = Rast_open_old(name, G_find_cell2(name, ""));
+    map = Rast_open_old(name, G_find_raster2(name, ""));
     if (map < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), name);
 

lib/manage/do_remove.c

@@ -49,7 +49,7 @@ int do_remove(int n, const char *old)
     }
     else {
 	if (G_strcasecmp(list[n].alias, "rast") == 0) {
-	    if ((mapset = G_find_cell2(old, "")) == NULL)
+	    if ((mapset = G_find_raster2(old, "")) == NULL)
 		G_warning(_("Raster map <%s> not found"), old);
 	}
 

lib/manage/do_rename.c

@@ -49,7 +49,7 @@ int do_rename(int n, const char *old, const char *new)
     }
     else {
 	if (G_strcasecmp(list[n].alias, "rast") == 0) {
-	    if ((mapset = G_find_cell2(old, "")) == NULL)
+	    if ((mapset = G_find_raster2(old, "")) == NULL)
 		G_warning(_("Raster map <%s> not found"), old);
 	}
 

lib/ogsf/GS2.c

@@ -1623,7 +1623,7 @@ int GS_load_att_map(int id, const char *filename, int att)
     begin = hdata = 1;
 
     /* Get MAPSET to ensure names are fully qualified */
-    mapset = G_find_cell2(filename, "");
+    mapset = G_find_raster2(filename, "");
     if (mapset == NULL) {
 	/* Check for valid filename */
 	G_warning("Raster map <%s> not found", filename);

lib/ogsf/Gp3.c

@@ -50,7 +50,7 @@ int Gp_set_color(const char *grassname, geopoint * gp)
     /* TODO: handle error messages */
 
     if (grassname) {
-	col_map = G_find_cell2(grassname, "");
+	col_map = G_find_raster2(grassname, "");
 	if (!col_map) {
 	    G_warning(_("Raster map <%s> not found"), grassname);
 	    return 0;

lib/ogsf/Gs3.c

@@ -122,7 +122,7 @@ int Gs_loadmap_as_float(struct Cell_head *wind, const char *map_name,
 
     G_debug(3, "Gs_loadmap_as_float(): name=%s", map_name);
 
-    map_set = G_find_cell2(map_name, "");
+    map_set = G_find_raster2(map_name, "");
     if (!map_set) {
 	G_warning(_("Raster map <%s> not found"), map_name);
 	return 0;
@@ -197,7 +197,7 @@ int Gs_loadmap_as_int(struct Cell_head *wind, const char *map_name, int *buff,
 
     G_debug(3, "Gs_loadmap_as_int");
 
-    map_set = G_find_cell2(map_name, "");
+    map_set = G_find_raster2(map_name, "");
     if (!map_set) {
 	G_warning(_("Raster map <%s> not found"), map_name);
 	return 0;
@@ -282,7 +282,7 @@ int Gs_numtype(const char *filename, int *negflag)
 	first = 0;
     }
 
-    mapset = G_find_cell2(filename, "");
+    mapset = G_find_raster2(filename, "");
     if (!mapset) {
 	G_warning(_("Raster map <%s> not found"), filename);
 	return -1;
@@ -355,7 +355,7 @@ int Gs_loadmap_as_short(struct Cell_head *wind, const char *map_name,
 
     max_short -= 1;
 
-    map_set = G_find_cell2(map_name, "");
+    map_set = G_find_raster2(map_name, "");
     if (!map_set) {
 	G_warning(_("Raster map <%s> not found"), map_name);
 	return -1;
@@ -471,7 +471,7 @@ int Gs_loadmap_as_char(struct Cell_head *wind, const char *map_name,
 
     max_char -= 1;
 
-    map_set = G_find_cell2(map_name, "");
+    map_set = G_find_raster2(map_name, "");
     if (!map_set) {
 	G_warning(_("Raster map <%s> not found"), map_name);
 	return -1;
@@ -568,7 +568,7 @@ int Gs_loadmap_as_bitmap(struct Cell_head *wind, const char *map_name,
 
     G_debug(3, "Gs_loadmap_as_bitmap");
 
-    map_set = G_find_cell2(map_name, "");
+    map_set = G_find_raster2(map_name, "");
     if (!map_set) {
 	G_warning(_("Raster map <%s> not found"), map_name);
 	return -1;
@@ -635,7 +635,7 @@ int Gs_build_256lookup(const char *filename, int *buff)
 
     G_debug(3, "building color table");
 
-    mapset = G_find_cell2(filename, "");
+    mapset = G_find_raster2(filename, "");
     if (!mapset) {
 	G_warning(_("Raster map <%s> not found"), filename);
 	return 0;
@@ -692,7 +692,7 @@ void Gs_pack_colors(const char *filename, int *buff, int rows, int cols)
     unsigned char *r, *g, *b, *set;
     int *cur, i, j;
 
-    mapset = G_find_cell2(filename, "");
+    mapset = G_find_raster2(filename, "");
     if (!mapset) {
 	G_warning(_("Raster map <%s> not found"), filename);
 	return;
@@ -762,7 +762,7 @@ void Gs_pack_colors_float(const char *filename, float *fbuf, int *ibuf,
     int i, j, *icur;
     FCELL *fcur;
 
-    mapset = G_find_cell2(filename, "");
+    mapset = G_find_raster2(filename, "");
     if (!mapset) {
 	G_warning(_("Raster map <%s> not found"), filename);
 	return;
@@ -832,7 +832,7 @@ int Gs_get_cat_label(const char *filename, int drow, int dcol, char *catstr)
     RASTER_MAP_TYPE map_type;
     int fd;
 
-    if ((mapset = G_find_cell2(filename, "")) == NULL) {
+    if ((mapset = G_find_raster2(filename, "")) == NULL) {
 	G_warning(_("Raster map <%s> not found"), filename);
 	return 0;
     }

lib/ogsf/gsd_legend.c

@@ -234,7 +234,7 @@ GLuint gsd_put_legend(const char *name, GLuint fontbase, int size, int *flags,
     if (flags[2])
 	do_invert = 1;
 
-    mapset = G_find_cell2(name, "");
+    mapset = G_find_raster2(name, "");
     if (mapset == NULL) {
 	G_warning(_("Raster map <%s> not found"), name);
 	return (-1);

lib/raster/auto_mask.c

@@ -49,7 +49,7 @@ int Rast__check_for_auto_masking(void)
     /* if(R__.mask_fd > 0) G_free (R__.mask_buf); */
 
     /* look for the existence of the MASK file */
-    R__.auto_mask = (G_find_cell("MASK", G_mapset()) != 0);
+    R__.auto_mask = (G_find_raster("MASK", G_mapset()) != 0);
 
     if (R__.auto_mask <= 0)
 	return 0;

lib/raster/color_read.c

@@ -70,7 +70,7 @@ int Rast_read_colors(const char *name, const char *mapset,
     Rast_init_colors(colors);
 
     strcpy(xname, name);
-    mapset = G_find_cell(xname, mapset);
+    mapset = G_find_raster(xname, mapset);
     name = xname;
 
     if (fp)

lib/raster/gdal.c

@@ -193,7 +193,7 @@ struct GDAL_link *Rast_get_gdal_link(const char *name, const char *mapset)
     DCELL null_val;
     int hflip, vflip;
 
-    if (!G_find_cell2(name, mapset))
+    if (!G_find_raster2(name, mapset))
 	return NULL;
 
     map_type = Rast_map_type(name, mapset);

lib/raster/get_cellhd.c

@@ -73,7 +73,7 @@ int Rast_get_cellhd(const char *name, const char *mapset,
 	    sprintf(tail, _(" It is a reclass of raster map <%s@%s> "),
 		    real_name, real_mapset);
 	    tail = buf + strlen(buf);
-	    if (!G_find_cell(real_name, real_mapset))
+	    if (!G_find_raster(real_name, real_mapset))
 		sprintf(tail, _("which is missing."));
 	    else
 		sprintf(tail, _("whose header file can't be opened."));

lib/raster/mask_info.c

@@ -60,7 +60,7 @@ int Rast__mask_info(char *name, char *mapset)
     strcpy(name, "MASK");
     strcpy(mapset, G_mapset());
 
-    if (!G_find_cell(name, mapset))
+    if (!G_find_raster(name, mapset))
 	return -1;
 
     if (Rast_is_reclass(name, mapset, rname, rmapset) > 0) {

lib/raster/opencell.c

@@ -175,7 +175,7 @@ int Rast__open_old(const char *name, const char *mapset)
     name = xname;
     mapset = xmapset;
 
-    if (!G_find_cell2(name, mapset)) {
+    if (!G_find_raster2(name, mapset)) {
 	G_warning(_("Unable to find <%s@%s>"), name, mapset);
 	return -1;
     }
@@ -191,7 +191,7 @@ int Rast__open_old(const char *name, const char *mapset)
     case 1:
 	r_name = reclass.name;
 	r_mapset = reclass.mapset;
-	if (G_find_cell2(r_name, r_mapset) == NULL) {
+	if (G_find_raster2(r_name, r_mapset) == NULL) {
 	    G_warning(_("Unable to open raster map <%s@%s> since it is a reclass "
 		       "of raster map <%s@%s> which does not exist"), name,
 		      mapset, r_name, r_mapset);
@@ -758,7 +758,7 @@ int Rast_map_is_fp(const char *name, const char *mapset)
     char path[GPATH_MAX];
     const char *xmapset;
 
-    xmapset = G_find_cell2(name, mapset);
+    xmapset = G_find_raster2(name, mapset);
     if (!xmapset) {
 	G_warning(_("Unable to find <%s@%s>"), name, mapset);
 	return -1;
@@ -790,7 +790,7 @@ RASTER_MAP_TYPE Rast_map_type(const char *name, const char *mapset)
     char path[GPATH_MAX];
     const char *xmapset;
 
-    xmapset = G_find_cell2(name, mapset);
+    xmapset = G_find_raster2(name, mapset);
     if (!xmapset) {
 	if (mapset && *mapset)
 	    G_warning(_("Raster map <%s> not found in mapset <%s>"), name,
@@ -847,7 +847,7 @@ RASTER_MAP_TYPE Rast__check_fp_type(const char *name, const char *mapset)
     RASTER_MAP_TYPE map_type;
     const char *xmapset;
 
-    xmapset = G_find_cell2(name, mapset);
+    xmapset = G_find_raster2(name, mapset);
     if (!xmapset) {
 	G_warning(_("Unable to find <%s@%s>"), name, mapset);
 	return -1;

lib/raster/rasterlib.dox

@@ -38,12 +38,12 @@ with <tt>g.mapsets</tt> command).
 
 The following routines search the database for raster map files:
 
- - G_find_cell()
+ - G_find_raster()
 
 Looks for the raster file in the database. If found, the mapset where
 the raster file lives is returned. If not found, the NULL pointer is
 returned. If the user specifies a fully qualified raster map name which
-exists, then G_find_cell() modifies <i>name</i> by removing
+exists, then G_find_raster() modifies <i>name</i> by removing
 the "@<I>mapset</I>".
 
 For example, to find a raster map in all mapsets listed the mapset search
@@ -53,7 +53,7 @@ path:
 char name[GNAME_MAX];
 char *mapset;
 
-if ((mapset = G_find_cell(name,"")) == NULL)
+if ((mapset = G_find_raster(name,"")) == NULL)
   /* not found */
 \endcode
 
@@ -62,7 +62,7 @@ To check that the raster map exists in the current mapset:
 \code
 char name[GNAME_MAX];
 
-if (G_find_cell(name, G_mapset()) == NULL)
+if (G_find_raster(name, G_mapset()) == NULL)
   /* not found */
 \endcode
 
@@ -91,7 +91,7 @@ called first to make sure that raster map name is a valid name.
 <b>Note:</b> It is not an error for raster map to already exist. New
 raster maps are actually created as temporary files and moved into
 the cell or fcell directory when closed. This allows an existing raster map
-to be read at the same time that it is being rewritten. G_find_cell()
+to be read at the same time that it is being rewritten. G_find_raster()
 could be used to see if raster map already exists.
 
 <b>Warning:</b> However, there is a subtle trap. The temporary file,

lib/rst/interp_float/input2d.c

@@ -44,7 +44,7 @@ struct BM *IL_create_bitmask(struct interp_params *params)
 	bitmask = BM_create(params->nsizc, params->nsizr);
 
 	if (params->maskmap != NULL) {
-	    mapsetm = G_find_cell2(params->maskmap, "");
+	    mapsetm = G_find_raster2(params->maskmap, "");
 	    if (!mapsetm)
 		G_fatal_error(_("Mask raster map <%s> not found"),
 			      params->maskmap);

raster/r.buffer/main.c

@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
     ZEROFLAG = 0;		/* default: use NULL for non-data cells */
     ZEROFLAG = (flag2->answer);
 
-    mapset = G_find_cell2(input, "");
+    mapset = G_find_raster2(input, "");
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), input);
 

raster/r.category/main.c

@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
 	    fs = parm.fs->answer[0];
     }
 
-    mapset = G_find_cell2(name, "");
+    mapset = G_find_raster2(name, "");
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
 	    int fd;
 	    const char *cmapset;
 
-	    cmapset = G_find_cell2(parm.raster->answer, "");
+	    cmapset = G_find_raster2(parm.raster->answer, "");
 	    if (cmapset == NULL)
 		G_fatal_error(_("Raster map <%s> not found"),
 			      parm.raster->answer);

raster/r.coin/main.c

@@ -122,9 +122,9 @@ int main(int argc, char *argv[])
     map1name = parm.map1->answer;
     map2name = parm.map2->answer;
 
-    if (!G_find_cell2(map1name, ""))
+    if (!G_find_raster2(map1name, ""))
 	G_fatal_error(_("Raster map <%s> not found"), map1name);
-    if (!G_find_cell2(map2name, ""))
+    if (!G_find_raster2(map2name, ""))
 	G_fatal_error(_("Raster map <%s> not found"), map2name);
 
     make_coin();

raster/r.colors/main.c

@@ -262,7 +262,7 @@ int main(int argc, char **argv)
     if (is_from_stdin)
 	rules = NULL;
 
-    mapset = G_find_cell2(name, "");
+    mapset = G_find_raster2(name, "");
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 
@@ -337,7 +337,7 @@ int main(int argc, char **argv)
     }
     else {
 	/* use color from another map (cmap) */
-	cmapset = G_find_cell2(cmap, "");
+	cmapset = G_find_raster2(cmap, "");
 	if (cmapset == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), cmap);
 

raster/r.compress/main.c

@@ -99,7 +99,7 @@ static int process(char *name, int uncompress)
     RASTER_MAP_TYPE map_type;
     char rname[GNAME_MAX], rmapset[GMAPSET_MAX];
 
-    if (G_find_cell(name, G_mapset()) == NULL) {
+    if (G_find_raster(name, G_mapset()) == NULL) {
 	G_warning(_("[%s] not found"), name);
 	return 1;
     }

raster/r.cost/main.c

@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
     /*  Check if cost layer exists in data base  */
 
     strcpy(cost_layer, opt2->answer);
-    cost_mapset = G_find_cell2(cost_layer, "");
+    cost_mapset = G_find_raster2(cost_layer, "");
 
     if (cost_mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), cost_layer);
@@ -340,7 +340,7 @@ int main(int argc, char *argv[])
     if (dir == 1) {
 	strcpy(move_dir_layer, opt11->answer);
 	search_mapset = "";
-	move_dir_mapset = G_find_cell2(move_dir_layer, search_mapset);
+	move_dir_mapset = G_find_raster2(move_dir_layer, search_mapset);
     }
     /*  Find number of rows and columns in window    */
 

raster/r.cross/main.c

@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
     for (nfiles = 0; (name = parm.input->answers[nfiles]); nfiles++) {
 	if (nfiles >= NFILES)
 	    G_fatal_error(_("More than %d files not allowed"), NFILES);
-	mapset = G_find_cell2(name, "");
+	mapset = G_find_raster2(name, "");
 	if (!mapset)
 	    G_fatal_error(_("Raster map <%s> not found"), name);
 	names[nfiles] = name;
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
     qsort(reclass, result + 1, sizeof(RECLASS), cmp);
     table = (CELL *) G_calloc(result + 1, sizeof(CELL));
     for (i = 0; i < nfiles; i++) {
-	mapset = G_find_cell2(names[i], "");
+	mapset = G_find_raster2(names[i], "");
 	Rast_read_cats(names[i], mapset, &labels[i]);
     }
 

raster/r.distance/distance.c

@@ -88,12 +88,12 @@ int null_distance(const char *name1, const char *name2, int *zerro_row, int *zer
     void *cell1, *cell2;
 
     /* NOTE: no need to controll, if the map exists. it should be checked in edge.c */
-    mapset = G_find_cell2(name1, "");
+    mapset = G_find_raster2(name1, "");
     maptype1 = Rast_map_type(name1, mapset);
     mapd1 = Rast_open_old(name1, mapset);
     inrast1 = Rast_allocate_buf(maptype1);
 
-    mapset = G_find_cell2(name2, "");
+    mapset = G_find_raster2(name2, "");
     maptype2 = Rast_map_type(name2, mapset);
     mapd2 = Rast_open_old(name2, mapset);
     inrast2 = Rast_allocate_buf(maptype2);

raster/r.distance/parse.c

@@ -59,14 +59,14 @@ void parse(int argc, char *argv[], struct Parms *parms)
 	exit(EXIT_FAILURE);
 
     name = parms->map1.name = maps->answers[0];
-    mapset = parms->map1.mapset = G_find_cell2(name, "");
+    mapset = parms->map1.mapset = G_find_raster2(name, "");
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 
     parms->map1.fullname = G_fully_qualified_name(name, mapset);
 
     name = parms->map2.name = maps->answers[1];
-    mapset = parms->map2.mapset = G_find_cell2(name, "");
+    mapset = parms->map2.mapset = G_find_raster2(name, "");
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 

raster/r.fill.dir/main.c

@@ -169,7 +169,7 @@ int main(int argc, char **argv)
 	G_warning("Direction map is D8 resolution, i.e. 45 degrees.");
 
     /* get the name of the elevation map layer for filling */
-    map_mapset = G_find_cell(map_name, "");
+    map_mapset = G_find_raster(map_name, "");
     if (!map_mapset)
 	G_fatal_error(_("Raster map <%s> not found"), map_name);
 

raster/r.flow/io.c

@@ -58,7 +58,7 @@ static const char *tmp_name(const char *fullname)
 
 static int open_existing_cell_file(char *fname, struct Cell_head *chd)
 {
-    const char *mapset = G_find_cell(fname, "");
+    const char *mapset = G_find_raster(fname, "");
 
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), fname);

raster/r.horizon/main.c

@@ -550,7 +550,7 @@ int INPUT(void)
     }
     /*read Z raster */
 
-    if ((mapset = G_find_cell2(elevin, "")) == NULL)
+    if ((mapset = G_find_raster2(elevin, "")) == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), elevin);
 
     fd1 = Rast_open_old(elevin, mapset);

raster/r.in.gdal/main.c

@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("Name for output raster map not specified"));
 
     if (!parm.outloc->answer) {	/* Check if the map exists */
-	if (G_find_cell2(output, G_mapset())) {
+	if (G_find_raster2(output, G_mapset())) {
 	    if (overwrite)
 		G_warning(_("Raster map <%s> already exists and will be overwritten"),
 			  output);

raster/r.info/main.c

@@ -116,7 +116,7 @@ int main(int argc, char **argv)
 	exit(EXIT_FAILURE);
 
     name = G_store(opt1->answer);
-    if ((mapset = G_find_cell2(name, "")) == NULL)
+    if ((mapset = G_find_raster2(name, "")) == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 
     head_ok = Rast_get_cellhd(name, "", &cellhd) >= 0;

raster/r.kappa/main.c

@@ -139,7 +139,7 @@ static void layer(const char *s)
     int n;
 
     strcpy(name, s);
-    if ((mapset = G_find_cell2(name, "")) == NULL)
+    if ((mapset = G_find_raster2(name, "")) == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), s);
 
     n = nlayers++;

raster/r.kappa/mask.c

@@ -18,7 +18,7 @@ char *maskinfo(void)
     int first, next;
 
     results = NULL;
-    if (G_find_cell("MASK", G_mapset()) == NULL)
+    if (G_find_raster("MASK", G_mapset()) == NULL)
 	return "none";
     if (Rast_get_reclass("MASK", G_mapset(), &reclass) <= 0) {
 	sprintf(text, "MASK in %s", G_mapset());

raster/r.kappa/stats.c

@@ -25,12 +25,12 @@ int stats(void)
     char **tokens;
 
     strcpy(mname, maps[0]);
-    mmapset = G_find_cell2(mname, "");
+    mmapset = G_find_raster2(mname, "");
     if (mmapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), maps[0]);
 
     strcpy(rname, maps[1]);
-    rmapset = G_find_cell2(rname, "");
+    rmapset = G_find_raster2(rname, "");
     if (rmapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), maps[1]);
 

raster/r.le/r.le.patch/driver.c

@@ -547,49 +547,49 @@ void mv_driver()
        maps. All maps currently are double,
        rather than floating point or int */
     if (choice->att[1]) {
-	if (G_find_cell("a1", G_mapset()) != NULL) {
+	if (G_find_raster("a1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a1,a1bak");
 	    system(cmdbuf);
 	}
 	a1 = Rast_open_new("a1", DCELL_TYPE);
     }
     if (choice->att[2]) {
-	if (G_find_cell("a2", G_mapset()) != NULL) {
+	if (G_find_raster("a2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a2,a2bak");
 	    system(cmdbuf);
 	}
 	a2 = Rast_open_new("a2", DCELL_TYPE);
     }
     if (choice->att[3]) {
-	if (G_find_cell("a3", G_mapset()) != NULL) {
+	if (G_find_raster("a3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a3,a3bak");
 	    system(cmdbuf);
 	}
 	a3 = Rast_open_new("a3", DCELL_TYPE);
     }
     if (choice->att[4]) {
-	if (G_find_cell("a4", G_mapset()) != NULL) {
+	if (G_find_raster("a4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a4,a4bak");
 	    system(cmdbuf);
 	}
 	a4 = Rast_open_new("a4", DCELL_TYPE);
     }
     if (choice->att[5]) {
-	if (G_find_cell("a5", G_mapset()) != NULL) {
+	if (G_find_raster("a5", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a5,a5bak");
 	    system(cmdbuf);
 	}
 	a5 = Rast_open_new("a5", DCELL_TYPE);
     }
     if (choice->att[6]) {
-	if (G_find_cell("a6", G_mapset()) != NULL) {
+	if (G_find_raster("a6", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a6,a6bak");
 	    system(cmdbuf);
 	}
 	a6 = Rast_open_new("a6", DCELL_TYPE);
     }
     if (choice->att[7]) {
-	if (G_find_cell("a7", G_mapset()) != NULL) {
+	if (G_find_raster("a7", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a7,a7bak");
 	    system(cmdbuf);
 	}
@@ -597,7 +597,7 @@ void mv_driver()
     }
 
     if (choice->att[8]) {
-	if (G_find_cell("a8", G_mapset()) != NULL) {
+	if (G_find_raster("a8", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a8,a8bak");
 	    system(cmdbuf);
 	}
@@ -605,42 +605,42 @@ void mv_driver()
     }
 
     if (choice->size[1]) {
-	if (G_find_cell("s1", G_mapset()) != NULL) {
+	if (G_find_raster("s1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s1,s1bak");
 	    system(cmdbuf);
 	}
 	s1 = Rast_open_new("s1", DCELL_TYPE);
     }
     if (choice->size[2]) {
-	if (G_find_cell("s2", G_mapset()) != NULL) {
+	if (G_find_raster("s2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s2,s2bak");
 	    system(cmdbuf);
 	}
 	s2 = Rast_open_new("s2", DCELL_TYPE);
     }
     if (choice->size[3]) {
-	if (G_find_cell("s3", G_mapset()) != NULL) {
+	if (G_find_raster("s3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s3,s3bak");
 	    system(cmdbuf);
 	}
 	s3 = Rast_open_new("s3", DCELL_TYPE);
     }
     if (choice->size[4]) {
-	if (G_find_cell("s4", G_mapset()) != NULL) {
+	if (G_find_raster("s4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s4,s4bak");
 	    system(cmdbuf);
 	}
 	s4 = Rast_open_new("s4", DCELL_TYPE);
     }
     if (choice->size[5]) {
-	if (G_find_cell("s5", G_mapset()) != NULL) {
+	if (G_find_raster("s5", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s5,s5bak");
 	    system(cmdbuf);
 	}
 	s5 = Rast_open_new("s5", DCELL_TYPE);
     }
     if (choice->size[6]) {
-	if (G_find_cell("s6", G_mapset()) != NULL) {
+	if (G_find_raster("s6", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s6,s6bak");
 	    system(cmdbuf);
 	}
@@ -648,7 +648,7 @@ void mv_driver()
     }
 
     if (choice->size[7]) {
-	if (G_find_cell("s7", G_mapset()) != NULL) {
+	if (G_find_raster("s7", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s7,s7bak");
 	    system(cmdbuf);
 	}
@@ -656,7 +656,7 @@ void mv_driver()
     }
 
     if (choice->size[8]) {
-	if (G_find_cell("s8", G_mapset()) != NULL) {
+	if (G_find_raster("s8", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s8,s8bak");
 	    system(cmdbuf);
 	}
@@ -664,70 +664,70 @@ void mv_driver()
     }
 
     if (choice->core[1]) {
-	if (G_find_cell("c1", G_mapset()) != NULL) {
+	if (G_find_raster("c1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c1,c1bak");
 	    system(cmdbuf);
 	}
 	c1 = Rast_open_new("c1", DCELL_TYPE);
     }
     if (choice->core[2]) {
-	if (G_find_cell("c2", G_mapset()) != NULL) {
+	if (G_find_raster("c2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c2,c2bak");
 	    system(cmdbuf);
 	}
 	c2 = Rast_open_new("c2", DCELL_TYPE);
     }
     if (choice->core[3]) {
-	if (G_find_cell("c3", G_mapset()) != NULL) {
+	if (G_find_raster("c3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c3,c3bak");
 	    system(cmdbuf);
 	}
 	c3 = Rast_open_new("c3", DCELL_TYPE);
     }
     if (choice->core[4]) {
-	if (G_find_cell("c4", G_mapset()) != NULL) {
+	if (G_find_raster("c4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c4,c4bak");
 	    system(cmdbuf);
 	}
 	c4 = Rast_open_new("c4", DCELL_TYPE);
     }
     if (choice->core[5]) {
-	if (G_find_cell("c5", G_mapset()) != NULL) {
+	if (G_find_raster("c5", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c5,c5bak");
 	    system(cmdbuf);
 	}
 	c5 = Rast_open_new("c5", DCELL_TYPE);
     }
     if (choice->core[6]) {
-	if (G_find_cell("c6", G_mapset()) != NULL) {
+	if (G_find_raster("c6", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c6,c6bak");
 	    system(cmdbuf);
 	}
 	c6 = Rast_open_new("c6", DCELL_TYPE);
     }
     if (choice->core[7]) {
-	if (G_find_cell("c7", G_mapset()) != NULL) {
+	if (G_find_raster("c7", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c7,c7bak");
 	    system(cmdbuf);
 	}
 	c7 = Rast_open_new("c7", DCELL_TYPE);
     }
     if (choice->core[8]) {
-	if (G_find_cell("c8", G_mapset()) != NULL) {
+	if (G_find_raster("c8", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c8,c8bak");
 	    system(cmdbuf);
 	}
 	c8 = Rast_open_new("c8", DCELL_TYPE);
     }
     if (choice->core[9]) {
-	if (G_find_cell("c9", G_mapset()) != NULL) {
+	if (G_find_raster("c9", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c9,c9bak");
 	    system(cmdbuf);
 	}
 	c9 = Rast_open_new("c9", DCELL_TYPE);
     }
     if (choice->core[10]) {
-	if (G_find_cell("c10", G_mapset()) != NULL) {
+	if (G_find_raster("c10", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c10,c10bak");
 	    system(cmdbuf);
 	}
@@ -735,42 +735,42 @@ void mv_driver()
     }
 
     if (choice->shape[1]) {
-	if (G_find_cell("h1", G_mapset()) != NULL) {
+	if (G_find_raster("h1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h1,h1bak");
 	    system(cmdbuf);
 	}
 	h1 = Rast_open_new("h1", DCELL_TYPE);
     }
     if (choice->shape[2]) {
-	if (G_find_cell("h2", G_mapset()) != NULL) {
+	if (G_find_raster("h2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h2,h2bak");
 	    system(cmdbuf);
 	}
 	h2 = Rast_open_new("h2", DCELL_TYPE);
     }
     if (choice->shape[3]) {
-	if (G_find_cell("h3", G_mapset()) != NULL) {
+	if (G_find_raster("h3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h3,h3bak");
 	    system(cmdbuf);
 	}
 	h3 = Rast_open_new("h3", DCELL_TYPE);
     }
     if (choice->shape[4]) {
-	if (G_find_cell("h4", G_mapset()) != NULL) {
+	if (G_find_raster("h4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h4,h4bak");
 	    system(cmdbuf);
 	}
 	h4 = Rast_open_new("h4", DCELL_TYPE);
     }
     if (choice->shape[5]) {
-	if (G_find_cell("h5", G_mapset()) != NULL) {
+	if (G_find_raster("h5", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h5,h5bak");
 	    system(cmdbuf);
 	}
 	h5 = Rast_open_new("h5", DCELL_TYPE);
     }
     if (choice->shape[6]) {
-	if (G_find_cell("h6", G_mapset()) != NULL) {
+	if (G_find_raster("h6", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h6,h6bak");
 	    system(cmdbuf);
 	}
@@ -778,7 +778,7 @@ void mv_driver()
     }
 
     if (choice->boundary[1]) {
-	if (G_find_cell("n1", G_mapset()) != NULL) {
+	if (G_find_raster("n1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n1,n1bak");
 	    system(cmdbuf);
 	}
@@ -786,7 +786,7 @@ void mv_driver()
     }
 
     if (choice->boundary[2]) {
-	if (G_find_cell("n2", G_mapset()) != NULL) {
+	if (G_find_raster("n2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n2,n2bak");
 	    system(cmdbuf);
 	}
@@ -794,7 +794,7 @@ void mv_driver()
     }
 
     if (choice->boundary[3]) {
-	if (G_find_cell("n3", G_mapset()) != NULL) {
+	if (G_find_raster("n3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n3,n3bak");
 	    system(cmdbuf);
 	}
@@ -802,7 +802,7 @@ void mv_driver()
     }
 
     if (choice->boundary[4]) {
-	if (G_find_cell("n4", G_mapset()) != NULL) {
+	if (G_find_raster("n4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n4,n4bak");
 	    system(cmdbuf);
 	}
@@ -810,42 +810,42 @@ void mv_driver()
     }
 
     if (choice->perim[1]) {
-	if (G_find_cell("p1", G_mapset()) != NULL) {
+	if (G_find_raster("p1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p1,p1bak");
 	    system(cmdbuf);
 	}
 	p1 = Rast_open_new("p1", DCELL_TYPE);
     }
     if (choice->perim[2]) {
-	if (G_find_cell("p2", G_mapset()) != NULL) {
+	if (G_find_raster("p2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p2,p2bak");
 	    system(cmdbuf);
 	}
 	p2 = Rast_open_new("p2", DCELL_TYPE);
     }
     if (choice->perim[3]) {
-	if (G_find_cell("p3", G_mapset()) != NULL) {
+	if (G_find_raster("p3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p3,p3bak");
 	    system(cmdbuf);
 	}
 	p3 = Rast_open_new("p3", DCELL_TYPE);
     }
     if (choice->perim[4]) {
-	if (G_find_cell("p4", G_mapset()) != NULL) {
+	if (G_find_raster("p4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p4,p4bak");
 	    system(cmdbuf);
 	}
 	p4 = Rast_open_new("p4", DCELL_TYPE);
     }
     if (choice->perim[5]) {
-	if (G_find_cell("p5", G_mapset()) != NULL) {
+	if (G_find_raster("p5", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p5,p5bak");
 	    system(cmdbuf);
 	}
 	p5 = Rast_open_new("p5", DCELL_TYPE);
     }
     if (choice->perim[6]) {
-	if (G_find_cell("p6", G_mapset()) != NULL) {
+	if (G_find_raster("p6", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p6,p6bak");
 	    system(cmdbuf);
 	}

raster/r.le/r.le.pixel/driver.c

@@ -194,28 +194,28 @@ void mv_driver()
        maps */
 
     if (choice->att[1]) {
-	if (G_find_cell("b1", G_mapset()) != NULL) {
+	if (G_find_raster("b1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b1,b1bak");
 	    system(cmdbuf);
 	}
 	b1 = Rast_open_new("b1", DCELL_TYPE);
     }
     if (choice->att[2]) {
-	if (G_find_cell("b2", G_mapset()) != NULL) {
+	if (G_find_raster("b2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b2,b2bak");
 	    system(cmdbuf);
 	}
 	b2 = Rast_open_new("b2", DCELL_TYPE);
     }
     if (choice->att[3]) {
-	if (G_find_cell("b3", G_mapset()) != NULL) {
+	if (G_find_raster("b3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b3,b3bak");
 	    system(cmdbuf);
 	}
 	b3 = Rast_open_new("b3", DCELL_TYPE);
     }
     if (choice->att[4]) {
-	if (G_find_cell("b4", G_mapset()) != NULL) {
+	if (G_find_raster("b4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b4,b4bak");
 	    system(cmdbuf);
 	}
@@ -223,28 +223,28 @@ void mv_driver()
     }
 
     if (choice->div[1]) {
-	if (G_find_cell("d1", G_mapset()) != NULL) {
+	if (G_find_raster("d1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d1,d1bak");
 	    system(cmdbuf);
 	}
 	d1 = Rast_open_new("d1", DCELL_TYPE);
     }
     if (choice->div[2]) {
-	if (G_find_cell("d2", G_mapset()) != NULL) {
+	if (G_find_raster("d2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d2,d2bak");
 	    system(cmdbuf);
 	}
 	d2 = Rast_open_new("d2", DCELL_TYPE);
     }
     if (choice->div[3]) {
-	if (G_find_cell("d3", G_mapset()) != NULL) {
+	if (G_find_raster("d3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d3,d3bak");
 	    system(cmdbuf);
 	}
 	d3 = Rast_open_new("d3", DCELL_TYPE);
     }
     if (choice->div[4]) {
-	if (G_find_cell("d4", G_mapset()) != NULL) {
+	if (G_find_raster("d4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d4,d4bak");
 	    system(cmdbuf);
 	}
@@ -252,35 +252,35 @@ void mv_driver()
     }
 
     if (choice->te2[1]) {
-	if (G_find_cell("t1", G_mapset()) != NULL) {
+	if (G_find_raster("t1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t1,t1bak");
 	    system(cmdbuf);
 	}
 	t1 = Rast_open_new("t1", DCELL_TYPE);
     }
     if (choice->te2[2]) {
-	if (G_find_cell("t2", G_mapset()) != NULL) {
+	if (G_find_raster("t2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t2,t2bak");
 	    system(cmdbuf);
 	}
 	t2 = Rast_open_new("t2", DCELL_TYPE);
     }
     if (choice->te2[3]) {
-	if (G_find_cell("t3", G_mapset()) != NULL) {
+	if (G_find_raster("t3", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t3,t3bak");
 	    system(cmdbuf);
 	}
 	t3 = Rast_open_new("t3", DCELL_TYPE);
     }
     if (choice->te2[4]) {
-	if (G_find_cell("t4", G_mapset()) != NULL) {
+	if (G_find_raster("t4", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t4,t4bak");
 	    system(cmdbuf);
 	}
 	t4 = Rast_open_new("t4", DCELL_TYPE);
     }
     if (choice->te2[5]) {
-	if (G_find_cell("t5", G_mapset()) != NULL) {
+	if (G_find_raster("t5", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t5,t5bak");
 	    system(cmdbuf);
 	}
@@ -288,28 +288,28 @@ void mv_driver()
     }
 
     if (choice->jux[1]) {
-	if (G_find_cell("j1", G_mapset()) != NULL) {
+	if (G_find_raster("j1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=j1,j1bak");
 	    system(cmdbuf);
 	}
 	j1 = Rast_open_new("j1", DCELL_TYPE);
     }
     if (choice->jux[2]) {
-	if (G_find_cell("j2", G_mapset()) != NULL) {
+	if (G_find_raster("j2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=j2,j2bak");
 	    system(cmdbuf);
 	}
 	j2 = Rast_open_new("j2", DCELL_TYPE);
     }
     if (choice->edg[1]) {
-	if (G_find_cell("e1", G_mapset()) != NULL) {
+	if (G_find_raster("e1", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=e1,e1bak");
 	    system(cmdbuf);
 	}
 	e1 = Rast_open_new("e1", DCELL_TYPE);
     }
     if (choice->edg[2]) {
-	if (G_find_cell("e2", G_mapset()) != NULL) {
+	if (G_find_raster("e2", G_mapset()) != NULL) {
 	    sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=e2,e2bak");
 	    system(cmdbuf);
 	}

raster/r.los/main.c

@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("Specified observer coordinate is outside current region bounds."));
 
     search_mapset = "";
-    old_mapset = G_find_cell2(elev_layer, search_mapset);
+    old_mapset = G_find_raster2(elev_layer, search_mapset);
 
     /*  check if elevation layer present in database    */
     if (old_mapset == NULL)
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
 
     /* if pattern layer used, check if present in database  */
     if (patt_flag == TRUE) {
-	patt_mapset = G_find_cell(patt_layer, search_mapset);
+	patt_mapset = G_find_raster(patt_layer, search_mapset);
 	if (patt_mapset == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), patt_layer);
     }

raster/r.mapcalc/map.c

@@ -467,7 +467,7 @@ int map_type(const char *name, int mod)
     switch (mod) {
     case 'M':
 	tmpname = G_store((char *)name);
-	mapset = G_find_cell2(tmpname, "");
+	mapset = G_find_raster2(tmpname, "");
 	result = mapset ? Rast_map_type(tmpname, mapset) : -1;
 	G_free(tmpname);
 	return result;
@@ -504,7 +504,7 @@ int open_map(const char *name, int mod, int row, int col)
     if (col > max_col)
 	max_col = col;
 
-    mapset = G_find_cell2(name, "");
+    mapset = G_find_raster2(name, "");
     if (!mapset)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 
@@ -653,7 +653,7 @@ void close_maps(void)
 
 int check_output_map(const char *name)
 {
-    return !!G_find_cell2(name, G_mapset());
+    return !!G_find_raster2(name, G_mapset());
 }
 
 int open_output_map(const char *name, int res_type)

raster/r.null/main.c

@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
     remove = flags.r->answer;
 
     name = parms.map->answer;
-    mapset = G_find_cell2(name, "");
+    mapset = G_find_raster2(name, "");
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 

raster/r.out.gdal/main.c

@@ -232,7 +232,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("Required parameter <%s> not set"), input->key);
 
     /* Try to open input GRASS raster.. */
-    mapset = G_find_cell2(input->answer, "");
+    mapset = G_find_raster2(input->answer, "");
 
     if (mapset != NULL) {
 	/* Add input to "group". "Group" whith 1 raster (band) will exist only in memory. */

raster/r.proj/main.c

@@ -216,7 +216,7 @@ int main(int argc, char **argv)
 
     mapname = outmap->answer ? outmap->answer : inmap->answer;
     if (mapname && !list->answer && !overwrite &&
-	G_find_cell(mapname, G_mapset()))
+	G_find_raster(mapname, G_mapset()))
 	G_fatal_error(_("option <%s>: <%s> exists."), "output", mapname);
 
     setname = imapset->answer ? imapset->answer : G_store(G_mapset());
@@ -261,7 +261,7 @@ int main(int argc, char **argv)
     if (!inmap->answer)
 	G_fatal_error(_("Required parameter <%s> not set"), inmap->key);
 
-    if (!G_find_cell(inmap->answer, setname))
+    if (!G_find_raster(inmap->answer, setname))
 	G_fatal_error(_("Raster map <%s> in location <%s> in mapset <%s> not found"),
 		      inmap->answer, inlocation->answer, setname);
 

raster/r.reclass/main.c

@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    old_mapset = G_find_cell2(parm.input->answer, "");
+    old_mapset = G_find_raster2(parm.input->answer, "");
     if (old_mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), parm.input->answer);
 

raster/r.report/maskinfo.c

@@ -15,7 +15,7 @@ char *maskinfo(void)
     int first;
 
     results = NULL;
-    if (G_find_cell("MASK", G_mapset()) == NULL)
+    if (G_find_raster("MASK", G_mapset()) == NULL)
 	return "none";
     if (Rast_get_reclass("MASK", G_mapset(), &reclass) <= 0) {
 	sprintf(text, "MASK in %s", G_mapset());

raster/r.report/parse.c

@@ -238,7 +238,7 @@ int parse_layer(char *s)
     int n;
 
     strcpy(name, s);
-    mapset = G_find_cell2(name, "");
+    mapset = G_find_raster2(name, "");
 
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), s);

raster/r.ros/main.c

@@ -287,7 +287,7 @@ int main(int argc, char *argv[])
     spotting = flag_s->answer;
 
     /*  Check if input layers exists in data base  */
-    if (G_find_cell2(parm.model->answer, "") == NULL)
+    if (G_find_raster2(parm.model->answer, "") == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), parm.model->answer);
 
     if (!
@@ -298,22 +298,22 @@ int main(int argc, char *argv[])
     }
 
     if (parm.mois_1h->answer) {
-	if (G_find_cell2(parm.mois_1h->answer, "") == NULL)
+	if (G_find_raster2(parm.mois_1h->answer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"),
 			  parm.mois_1h->answer);
     }
     if (parm.mois_10h->answer) {
-	if (G_find_cell2(parm.mois_10h->answer, "") == NULL)
+	if (G_find_raster2(parm.mois_10h->answer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"),
 			  parm.mois_10h->answer);
     }
     if (parm.mois_100h->answer) {
-	if (G_find_cell2(parm.mois_100h->answer, "") == NULL)
+	if (G_find_raster2(parm.mois_100h->answer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"),
 			  parm.mois_100h->answer);
     }
 
-    if (G_find_cell2(parm.mois_live->answer, "") == NULL)
+    if (G_find_raster2(parm.mois_live->answer, "") == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), parm.mois_live->answer);
 
     if (parm.vel->answer && !(parm.dir->answer)) {
@@ -327,11 +327,11 @@ int main(int argc, char *argv[])
 		      parm.dir->answer);
     }
     if (parm.vel->answer) {
-	if (G_find_cell2(parm.vel->answer, "") == NULL)
+	if (G_find_raster2(parm.vel->answer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), parm.vel->answer);
     }
     if (parm.dir->answer) {
-	if (G_find_cell2(parm.dir->answer, "") == NULL)
+	if (G_find_raster2(parm.dir->answer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), parm.dir->answer);
     }
 
@@ -346,11 +346,11 @@ int main(int argc, char *argv[])
 		      parm.aspect->answer);
     }
     if (parm.slope->answer) {
-	if (G_find_cell2(parm.slope->answer, "") == NULL)
+	if (G_find_raster2(parm.slope->answer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), parm.slope->answer);
     }
     if (parm.aspect->answer) {
-	if (G_find_cell2(parm.aspect->answer, "") == NULL)
+	if (G_find_raster2(parm.aspect->answer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"),
 			  parm.aspect->answer);
     }
@@ -361,7 +361,7 @@ int main(int argc, char *argv[])
 			    "if considering spotting"));
 	}
 	else {
-	    if (G_find_cell2(parm.elev->answer, "") == NULL)
+	    if (G_find_raster2(parm.elev->answer, "") == NULL)
 		G_fatal_error(_("Raster map <%s> not found"),
 			      parm.elev->answer);
 	}
@@ -374,22 +374,22 @@ int main(int argc, char *argv[])
 
     /*check if the output layer names EXIST */
     if (G_check_overwrite(argc, argv) == 0) {
-	if (G_find_cell2(name_base, G_mapset()))
+	if (G_find_raster2(name_base, G_mapset()))
 	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
 			  name_base, G_mapset());
 	
-	if (G_find_cell2(name_max, G_mapset()))
+	if (G_find_raster2(name_max, G_mapset()))
 	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
 			  name_max, G_mapset());
 	
-	if (G_find_cell2(name_maxdir, G_mapset()))
+	if (G_find_raster2(name_maxdir, G_mapset()))
 	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
 			  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()))
+	    if (G_find_raster2(name_spotdist, G_mapset()))
 		G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
 			      name_spotdist, G_mapset());
 	}
@@ -424,7 +424,7 @@ int main(int argc, char *argv[])
 
     fuel_fd =
 	Rast_open_old(parm.model->answer,
-			G_find_cell2(parm.model->answer, ""));
+			G_find_raster2(parm.model->answer, ""));
     if (fuel_fd < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"),
 		      parm.model->answer);
@@ -432,7 +432,7 @@ int main(int argc, char *argv[])
     if (parm.mois_1h->answer) {
 	mois_1h_fd =
 	    Rast_open_old(parm.mois_1h->answer,
-			    G_find_cell2(parm.mois_1h->answer, ""));
+			    G_find_raster2(parm.mois_1h->answer, ""));
 	if (mois_1h_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  parm.mois_1h->answer);
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
     if (parm.mois_10h->answer) {
 	mois_10h_fd =
 	    Rast_open_old(parm.mois_10h->answer,
-			    G_find_cell2(parm.mois_10h->answer, ""));
+			    G_find_raster2(parm.mois_10h->answer, ""));
 	if (mois_10h_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  parm.mois_10h->answer);
@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
     if (parm.mois_100h->answer) {
 	mois_100h_fd =
 	    Rast_open_old(parm.mois_100h->answer,
-			    G_find_cell2(parm.mois_100h->answer, ""));
+			    G_find_raster2(parm.mois_100h->answer, ""));
 	if (mois_100h_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  parm.mois_100h->answer);
@@ -456,7 +456,7 @@ int main(int argc, char *argv[])
 
     mois_live_fd =
 	Rast_open_old(parm.mois_live->answer,
-			G_find_cell2(parm.mois_live->answer, ""));
+			G_find_raster2(parm.mois_live->answer, ""));
     if (mois_live_fd < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"),
 		      parm.mois_live->answer);
@@ -464,7 +464,7 @@ int main(int argc, char *argv[])
     if (parm.vel->answer) {
 	vel_fd =
 	    Rast_open_old(parm.vel->answer,
-			    G_find_cell2(parm.vel->answer, ""));
+			    G_find_raster2(parm.vel->answer, ""));
 	if (vel_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  parm.vel->answer);
@@ -472,7 +472,7 @@ int main(int argc, char *argv[])
     if (parm.dir->answer) {
 	dir_fd =
 	    Rast_open_old(parm.dir->answer,
-			    G_find_cell2(parm.dir->answer, ""));
+			    G_find_raster2(parm.dir->answer, ""));
 	if (dir_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  parm.dir->answer);
@@ -481,7 +481,7 @@ int main(int argc, char *argv[])
     if (parm.slope->answer) {
 	slope_fd =
 	    Rast_open_old(parm.slope->answer,
-			    G_find_cell2(parm.slope->answer, ""));
+			    G_find_raster2(parm.slope->answer, ""));
 	if (slope_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  parm.slope->answer);
@@ -489,7 +489,7 @@ int main(int argc, char *argv[])
     if (parm.aspect->answer) {
 	aspect_fd =
 	    Rast_open_old(parm.aspect->answer,
-			    G_find_cell2(parm.aspect->answer, ""));
+			    G_find_raster2(parm.aspect->answer, ""));
 	if (aspect_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  parm.aspect->answer);
@@ -498,7 +498,7 @@ int main(int argc, char *argv[])
     if (spotting) {
 	elev_fd =
 	    Rast_open_old(parm.elev->answer,
-			    G_find_cell2(parm.elev->answer, ""));
+			    G_find_raster2(parm.elev->answer, ""));
 	if (elev_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  parm.elev->answer);

raster/r.spread/main.c

@@ -350,55 +350,55 @@ int main(int argc, char *argv[])
 
     /*  Check if input layers exists in data base  */
 
-    if (G_find_cell2(max_layer, "") == NULL)
+    if (G_find_raster2(max_layer, "") == NULL)
 	G_fatal_error("Raster map <%s> not found", max_layer);
 
-    if (G_find_cell2(dir_layer, "") == NULL)
+    if (G_find_raster2(dir_layer, "") == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), dir_layer);
 
-    if (G_find_cell2(base_layer, "") == NULL)
+    if (G_find_raster2(base_layer, "") == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), base_layer);
 
-    if (G_find_cell2(start_layer, "") == NULL)
+    if (G_find_raster2(start_layer, "") == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), start_layer);
 
     if (spotting) {
-	if (G_find_cell2(spotdist_layer, "") == NULL)
+	if (G_find_raster2(spotdist_layer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), spotdist_layer);
 
-	if (G_find_cell2(velocity_layer, "") == NULL)
+	if (G_find_raster2(velocity_layer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), velocity_layer);
 
-	if (G_find_cell2(mois_layer, "") == NULL)
+	if (G_find_raster2(mois_layer, "") == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), mois_layer);
     }
 
     /*  Open input cell layers for reading  */
 
-    max_fd = Rast_open_old(max_layer, G_find_cell2(max_layer, ""));
+    max_fd = Rast_open_old(max_layer, G_find_raster2(max_layer, ""));
     if (max_fd < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), max_layer);
 
-    dir_fd = Rast_open_old(dir_layer, G_find_cell2(dir_layer, ""));
+    dir_fd = Rast_open_old(dir_layer, G_find_raster2(dir_layer, ""));
     if (dir_fd < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), dir_layer);
 
-    base_fd = Rast_open_old(base_layer, G_find_cell2(base_layer, ""));
+    base_fd = Rast_open_old(base_layer, G_find_raster2(base_layer, ""));
     if (base_fd < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), base_layer);
 
     if (spotting) {
 	spotdist_fd =
-	    Rast_open_old(spotdist_layer, G_find_cell2(spotdist_layer, ""));
+	    Rast_open_old(spotdist_layer, G_find_raster2(spotdist_layer, ""));
 	if (spotdist_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"), spotdist_layer);
 
 	velocity_fd =
-	    Rast_open_old(velocity_layer, G_find_cell2(velocity_layer, ""));
+	    Rast_open_old(velocity_layer, G_find_raster2(velocity_layer, ""));
 	if (velocity_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"), velocity_layer);
 
-	mois_fd = Rast_open_old(mois_layer, G_find_cell2(mois_layer, ""));
+	mois_fd = Rast_open_old(mois_layer, G_find_raster2(mois_layer, ""));
 	if (mois_fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"), mois_layer);
     }
@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
      *   Create an array of starting points (min_heap) ordered by costs.
      */
 
-    start_fd = Rast_open_old(start_layer, G_find_cell2(start_layer, ""));
+    start_fd = Rast_open_old(start_layer, G_find_raster2(start_layer, ""));
     if (start_fd < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), start_layer);
 

raster/r.spreadpath/main.c

@@ -146,8 +146,8 @@ int main(int argc, char **argv)
     strcpy(backrow_layer, opt2->answer);
     strcpy(backcol_layer, opt1->answer);
 
-    backrow_mapset = G_find_cell(backrow_layer, search_mapset);
-    backcol_mapset = G_find_cell(backcol_layer, search_mapset);
+    backrow_mapset = G_find_raster(backrow_layer, search_mapset);
+    backcol_mapset = G_find_raster(backcol_layer, search_mapset);
 
     if (backrow_mapset == NULL)
 	G_fatal_error("%s - not found", backrow_layer);
@@ -159,7 +159,7 @@ int main(int argc, char **argv)
 
     strcpy(path_layer, opt4->answer);
 
-    path_mapset = G_find_cell(path_layer, search_mapset);
+    path_mapset = G_find_raster(path_layer, search_mapset);
 
     /*  find number of rows and cols in window    */
     nrows = G_window_rows();

raster/r.sun/main.c

@@ -809,7 +809,7 @@ int INPUT_part(int offset, double *zmax)
     }
 
 
-    if ((mapset = G_find_cell2(elevin, "")) == NULL)
+    if ((mapset = G_find_raster2(elevin, "")) == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), elevin);
 
 
@@ -824,7 +824,7 @@ int INPUT_part(int offset, double *zmax)
 		s[l] = (float *)G_malloc(sizeof(float) * (n));
 	    }
 	}
-	if ((mapset = G_find_cell2(slopein, "")) == NULL)
+	if ((mapset = G_find_raster2(slopein, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), slopein);
 	fd3 = Rast_open_old(slopein, mapset);
 
@@ -841,7 +841,7 @@ int INPUT_part(int offset, double *zmax)
 	    }
 	}
 
-	if ((mapset = G_find_cell2(aspin, "")) == NULL)
+	if ((mapset = G_find_raster2(aspin, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), aspin);
 	fd2 = Rast_open_old(aspin, mapset);
 
@@ -855,7 +855,7 @@ int INPUT_part(int offset, double *zmax)
 		li[l] = (float *)G_malloc(sizeof(float) * (n));
 
 	}
-	if ((mapset = G_find_cell2(linkein, "")) == NULL)
+	if ((mapset = G_find_raster2(linkein, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), linkein);
 	fd4 = Rast_open_old(linkein, mapset);
     }
@@ -867,7 +867,7 @@ int INPUT_part(int offset, double *zmax)
 	    for (l = 0; l < numRows; l++)
 		a[l] = (float *)G_malloc(sizeof(float) * (n));
 	}
-	if ((mapset = G_find_cell2(albedo, "")) == NULL)
+	if ((mapset = G_find_raster2(albedo, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), albedo);
 	fd5 = Rast_open_old(albedo, mapset);
     }
@@ -879,7 +879,7 @@ int INPUT_part(int offset, double *zmax)
 	    for (l = 0; l < numRows; l++)
 		la[l] = (float *)G_malloc(sizeof(float) * (n));
 	}
-	if ((mapset = G_find_cell2(latin, "")) == NULL)
+	if ((mapset = G_find_raster2(latin, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), latin);
 	fd6 = Rast_open_old(latin, mapset);
     }
@@ -890,7 +890,7 @@ int INPUT_part(int offset, double *zmax)
 	for (l = 0; l < numRows; l++)
 	    longitArray[l] = (float *)G_malloc(sizeof(float) * (n));
 
-	if ((mapset = G_find_cell2(longin, "")) == NULL)
+	if ((mapset = G_find_raster2(longin, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), longin);
 	fd7 = Rast_open_old(longin, mapset);
     }
@@ -902,7 +902,7 @@ int INPUT_part(int offset, double *zmax)
 	    for (l = 0; l < numRows; l++)
 		cbhr[l] = (float *)G_malloc(sizeof(float) * (n));
 	}
-	if ((mapset = G_find_cell2(coefbh, "")) == NULL)
+	if ((mapset = G_find_raster2(coefbh, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), coefbh);
 	fr1 = Rast_open_old(coefbh, mapset);
     }
@@ -914,7 +914,7 @@ int INPUT_part(int offset, double *zmax)
 	    for (l = 0; l < numRows; l++)
 		cdhr[l] = (float *)G_malloc(sizeof(float) * (n));
 	}
-	if ((mapset = G_find_cell2(coefdh, "")) == NULL)
+	if ((mapset = G_find_raster2(coefdh, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), coefdh);
 	fr2 = Rast_open_old(coefdh, mapset);
     }
@@ -934,7 +934,7 @@ int INPUT_part(int offset, double *zmax)
 	 * 
 	 * horizonbuf[0]=Rast_allocate_f_buf();
 	 * sprintf(shad_filename, "%s_%02d", horizon, arrayNumInt);
-	 * if((mapset=G_find_cell2(shad_filename,""))==NULL)
+	 * if((mapset=G_find_raster2(shad_filename,""))==NULL)
 	 * G_message("Horizon file no. %d not found\n", arrayNumInt);
 	 * 
 	 * fd_shad[0] = Rast_open_old(shad_filename,mapset);
@@ -947,7 +947,7 @@ int INPUT_part(int offset, double *zmax)
 	for (i = 0; i < arrayNumInt; i++) {
 	    horizonbuf[i] = Rast_allocate_f_buf();
 	    sprintf(shad_filename, formatString, horizon, i);
-	    if ((mapset = G_find_cell2(shad_filename, "")) == NULL)
+	    if ((mapset = G_find_raster2(shad_filename, "")) == NULL)
 		G_fatal_error(_("Horizon file no. %d <%s> not found"), i,
 			      shad_filename);
 	    fd_shad[i] = Rast_open_old(shad_filename, mapset);

raster/r.support/main.c

@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
 
     /* Make sure raster exists and set mapset */
     infile = raster->answer;
-    mapset = G_find_cell2(infile, G_mapset());	/* current mapset only for editing */
+    mapset = G_find_raster2(infile, G_mapset());	/* current mapset only for editing */
     if (!mapset || strcmp(mapset, G_mapset()) != 0)
 	G_fatal_error(_("Raster map <%s> not found in current mapset"), infile);
 

raster/r.surf.contour/main.c

@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
     con_name = opt1->answer;
     alt_name = opt2->answer;
 
-    con_mapset = G_find_cell2(con_name, "");
+    con_mapset = G_find_raster2(con_name, "");
     if (!con_mapset)
 	G_fatal_error("Contour raster map [%s] not found", con_name);
 

raster/r.terraflow/grass2str.h

@@ -55,7 +55,7 @@ cell2stream(char* cellname, elevation_type T_max_value, long* nodata_count) {
   }
   
   const char *mapset;
-  mapset = G_find_cell (cellname, "");
+  mapset = G_find_raster (cellname, "");
   if (mapset == NULL)
     G_fatal_error (_("Raster map <%s> not found"), cellname);
   

raster/r.terraflow/main.cc

@@ -187,7 +187,7 @@ parse_args(int argc, char *argv[]) {
 void check_header(char* cellname) {
 
   const char *mapset;
-  mapset = G_find_cell(cellname, "");
+  mapset = G_find_raster(cellname, "");
   if (mapset == NULL) {
     G_fatal_error(_("Raster map <%s> not found"), cellname);
   }
@@ -336,7 +336,7 @@ setFlowAccuColorTable(char* cellname) {
   const char *mapset;
   struct Range r;
 
-  mapset = G_find_cell(cellname, "");
+  mapset = G_find_raster(cellname, "");
   if (mapset == NULL) {
     G_fatal_error (_("Raster map <%s> not found"), cellname);
   }
@@ -376,7 +376,7 @@ setSinkWatershedColorTable(char* cellname) {
   const char *mapset;
   struct Range r;
 
-  mapset = G_find_cell(cellname, "");
+  mapset = G_find_raster(cellname, "");
   if (mapset == NULL) {
     G_fatal_error (_("Raster map <%s> not found"), cellname);
   }

raster/r.topmodel/check_ready.c

@@ -246,17 +246,17 @@ int check_io(void)
     retval = 0;
 
     if (!flg.input) {
-	if (map.elev && !G_find_cell(map.elev, mapset)) {
+	if (map.elev && !G_find_raster(map.elev, mapset)) {
 	    G_warning("%s - not exists", map.elev);
 	    retval = 1;
 	}
 
-	if (map.basin && !G_find_cell(map.basin, mapset)) {
+	if (map.basin && !G_find_raster(map.basin, mapset)) {
 	    G_warning("%s - not exists", map.basin);
 	    retval = 1;
 	}
 
-	if (map.fill && G_find_cell(map.fill, mapset)) {
+	if (map.fill && G_find_raster(map.fill, mapset)) {
 	    if (flg.overwr) {
 		flg.overwrlist |= FILL;
 	    }
@@ -266,7 +266,7 @@ int check_io(void)
 	    }
 	}
 
-	if (map.dir && G_find_cell(map.dir, mapset)) {
+	if (map.dir && G_find_raster(map.dir, mapset)) {
 	    if (flg.overwr) {
 		flg.overwrlist |= DIR;
 	    }
@@ -276,7 +276,7 @@ int check_io(void)
 	    }
 	}
 
-	if (map.belev && G_find_cell(map.belev, mapset)) {
+	if (map.belev && G_find_raster(map.belev, mapset)) {
 	    if (flg.overwr) {
 		flg.overwrlist |= BELEV;
 	    }
@@ -286,7 +286,7 @@ int check_io(void)
 	    }
 	}
 
-	if (map.topidx && G_find_cell(map.topidx, mapset)) {
+	if (map.topidx && G_find_raster(map.topidx, mapset)) {
 	    if (flg.overwr) {
 		flg.overwrlist |= TOPIDX;
 	    }
@@ -309,12 +309,12 @@ int check_io(void)
     }
     else {
 	if (map.belev) {
-	    if (!G_find_cell(map.belev, mapset)) {
+	    if (!G_find_raster(map.belev, mapset)) {
 		G_warning("%s - not exists", map.belev);
 		retval = 1;
 	    }
 	    else {
-		if (map.topidx && G_find_cell(map.topidx, mapset)) {
+		if (map.topidx && G_find_raster(map.topidx, mapset)) {
 		    if (flg.overwr) {
 			flg.overwrlist |= TOPIDX;
 		    }
@@ -338,7 +338,7 @@ int check_io(void)
 	    }
 	}
 	else if (map.topidx) {
-	    if (!G_find_cell(map.topidx, mapset)) {
+	    if (!G_find_raster(map.topidx, mapset)) {
 		G_warning("%s - not exists", map.topidx);
 		retval = 1;
 	    }

raster/r.watershed/shed/read.c

@@ -18,7 +18,7 @@ int read_basins(char *haf_name, OUTPUT * output)
     ncols = G_window_cols();
     buf = Rast_allocate_c_buf();
     bas_buf = Rast_allocate_c_buf();
-    mapset = G_find_cell(haf_name, "");
+    mapset = G_find_raster(haf_name, "");
     if (!mapset) {
 	G_fatal_error(_("unable to open basin/half basin map"));
     }

raster/r.watershed/shed/valid.c

@@ -19,7 +19,7 @@ int valid_basins(char *accum_name, OUTPUT * output)
        nrows = G_window_rows ();
        ncols = G_window_cols ();
      */
-    if (NULL == (mapset = G_find_cell(accum_name, ""))) {
+    if (NULL == (mapset = G_find_raster(accum_name, ""))) {
 	free_output(output);
 	G_fatal_error(_("accum file missing in valid_basins()"));
     }

raster/simwe/simlib/input.c

@@ -174,18 +174,18 @@ int input_data(void)
 
     /* Check if data available in mapsets
      * if found, then open the files */
-    if ((mapset = G_find_cell(elevin, "")) == NULL)
+    if ((mapset = G_find_raster(elevin, "")) == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), elevin);
 
     fd1 = Rast_open_old(elevin, mapset);
 
     /* TO REPLACE BY INTERNAL PROCESSING of dx, dy from Elevin */
-    if ((mapset = G_find_cell(dxin, "")) == NULL)
+    if ((mapset = G_find_raster(dxin, "")) == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), dxin);
 
     fd2 = Rast_open_old(dxin, mapset);
 
-    if ((mapset = G_find_cell(dyin, "")) == NULL)
+    if ((mapset = G_find_raster(dyin, "")) == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), dyin);
 
     fd3 = Rast_open_old(dyin, mapset);
@@ -194,7 +194,7 @@ int input_data(void)
     /* Rendered Mannings n input map optional to run! */
     /* Careful!                     (Yann, 20080212) */
     if (manin != NULL) {
-	if ((mapset = G_find_cell(manin, "")) == NULL)
+	if ((mapset = G_find_raster(manin, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), manin);
 	fd5 = Rast_open_old(manin, mapset);
     }
@@ -202,47 +202,47 @@ int input_data(void)
     /* Rendered Rainfall input map optional to run! */
     /* Careful!                     (Yann, 20080212) */
     if (rain != NULL) {
-	if ((mapset = G_find_cell(rain, "")) == NULL)
+	if ((mapset = G_find_raster(rain, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), rain);
 	fd4 = Rast_open_old(rain, mapset);
     }
 
     if (infil != NULL) {
-	if ((mapset = G_find_cell(infil, "")) == NULL)
+	if ((mapset = G_find_raster(infil, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), infil);
 	fd4a = Rast_open_old(infil, mapset);
     }
 
     if (traps != NULL) {
-	if ((mapset = G_find_cell(traps, "")) == NULL)
+	if ((mapset = G_find_raster(traps, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), traps);
 
 	fd4b = Rast_open_old(traps, mapset);
     }
 
     if (detin != NULL) {
-	if ((mapset = G_find_cell(detin, "")) == NULL)
+	if ((mapset = G_find_raster(detin, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), detin);
 
 	fd9 = Rast_open_old(detin, mapset);
     }
 
     if (tranin != NULL) {
-	if ((mapset = G_find_cell(tranin, "")) == NULL)
+	if ((mapset = G_find_raster(tranin, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), tranin);
 
 	fd10 = Rast_open_old(tranin, mapset);
     }
 
     if (tauin != NULL) {
-	if ((mapset = G_find_cell(tauin, "")) == NULL)
+	if ((mapset = G_find_raster(tauin, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), tauin);
 
 	fd11 = Rast_open_old(tauin, mapset);
     }
 
     if (wdepth != NULL) {
-	if ((mapset = G_find_cell(wdepth, "")) == NULL)
+	if ((mapset = G_find_raster(wdepth, "")) == NULL)
 	    G_fatal_error(_("Raster map <%s> not found"), wdepth);
 
 	fd12 = Rast_open_old(wdepth, mapset);

raster3d/r3.cross.rast/main.c

@@ -340,7 +340,7 @@ int main(int argc, char *argv[])
 
 	/**********************/
 
-	if (G_find_cell2(param.output->answer, ""))
+	if (G_find_raster2(param.output->answer, ""))
 	    G_message(_("Output map already exists. Will be overwritten!"));
 
 	if (output_type == FCELL_TYPE) {

raster3d/r3.out.vtk/main.c

@@ -125,7 +125,7 @@ void check_input_maps(void)
 	mapset = NULL;
 	name = NULL;
 	name = param.top->answer;
-	mapset = G_find_cell2(name, "");
+	mapset = G_find_raster2(name, "");
 	if (mapset == NULL) {
 	    G3d_fatalError(_("Top cell map <%s> not found"),
 			   param.top->answer);
@@ -134,7 +134,7 @@ void check_input_maps(void)
 	mapset = NULL;
 	name = NULL;
 	name = param.bottom->answer;
-	mapset = G_find_cell2(name, "");
+	mapset = G_find_raster2(name, "");
 	if (mapset == NULL) {
 	    G3d_fatalError(_("Bottom cell map <%s> not found"),
 			   param.bottom->answer);
@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
 	mapset = NULL;
 	name = NULL;
 	name = param.top->answer;
-	mapset = G_find_cell2(name, "");
+	mapset = G_find_raster2(name, "");
 	in->top = open_input_map(name, mapset);
 	in->topMapType = Rast_get_map_type(in->top);
 
@@ -475,7 +475,7 @@ int main(int argc, char *argv[])
 	mapset = NULL;
 	name = NULL;
 	name = param.bottom->answer;
-	mapset = G_find_cell2(name, "");
+	mapset = G_find_raster2(name, "");
 	in->bottom = open_input_map(name, mapset);
 	in->bottomMapType = Rast_get_map_type(in->bottom);
 

raster3d/r3.to.rast/main.c

@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
 	G_asprintf(&RasterFileName, "%s_%05d", param.output->answer, i + 1);
 	G_message(_("Raster map %i Filename: %s"), i + 1, RasterFileName);
 
-	if (G_find_cell2(RasterFileName, ""))
+	if (G_find_raster2(RasterFileName, ""))
 	    G_message(_("Raster map %d Filename: %s already exists. Will be overwritten!"),
 		      i + 1, RasterFileName);
 

swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c

@@ -387,7 +387,7 @@ int r_slope_aspect(int argc, char *argv[])
     }
 
     /* check elevation file existence */
-    mapset = G_find_cell2(elev_name, "");
+    mapset = G_find_raster2(elev_name, "");
     if (!mapset)
 	G_fatal_error(_("Raster map <%s> not found"), elev_name);
 

vector/lidar/v.surf.bspline/main.c

@@ -288,7 +288,7 @@ G_add_keyword(_("interpolation"));
     if (!vector && map) {
 	grid = TRUE;
 	/*
-	   if (G_find_cell (out_map_opt->answer, G_mapset()) != NULL) 
+	   if (G_find_raster (out_map_opt->answer, G_mapset()) != NULL) 
 	   G_fatal_error (_("Raster <%s> already exist."), out_map_opt->answer);
 	 */
 

vector/v.vol.rst/main.c

@@ -640,7 +640,7 @@ int main(int argc, char *argv[])
     if (ii > 0) {
 	if ((cellinp != NULL) && (cellout != NULL)) {
 	    mapset = NULL;
-	    mapset = G_find_cell2(cellinp, "");
+	    mapset = G_find_raster2(cellinp, "");
 	    if (mapset == NULL)
 		G_fatal_error(_("Raster map <%s> not found"), cellinp);
 	    fdcell = Rast_open_old(cellinp, mapset);

vector/v.vol.rst/user1.c

@@ -358,7 +358,7 @@ int INPUT(struct Map_info *In, char *column, char *scol, char *wheresql)
 
   /** create a bitmap mask from given raster map **/
     if (maskmap != NULL) {
-	mapsetm = G_find_cell2(maskmap, "");
+	mapsetm = G_find_raster2(maskmap, "");
 	if (!mapsetm) {
 	    sprintf(buf, "mask raster map [%s] not found\n", maskmap);
 	    clean_fatal_error(buf);

visualization/nviz2/cmd/surface.c

@@ -51,7 +51,7 @@ int load_rasters(const struct GParams *params, nv_data * data)
     for (i = 0; i < nelevs; i++) {
 	/* check maps */
 	if (i < nelev_map && strcmp(params->elev_map->answers[i], "")) {
-	    mapset = G_find_cell2(params->elev_map->answers[i], "");
+	    mapset = G_find_raster2(params->elev_map->answers[i], "");
 	    if (mapset == NULL) {
 		G_fatal_error(_("Raster map <%s> not found"),
 			      params->elev_map->answers[i]);
@@ -101,7 +101,7 @@ int load_rasters(const struct GParams *params, nv_data * data)
 	/* color */
 	/* check for color map */
 	if (i < ncolor_map && strcmp(params->color_map->answers[i], "")) {
-	    mapset = G_find_cell2(params->color_map->answers[i], "");
+	    mapset = G_find_raster2(params->color_map->answers[i], "");
 	    if (mapset == NULL) {
 		G_fatal_error(_("Raster map <%s> not found"),
 			      params->color_map->answers[i]);