replace use of deprecated grass.script.array.read api calls (#622)

src/imagery/i.gabor/i.gabor.py

@@ -172,8 +172,7 @@ def main():
             name = f"{win_size}_{deg}_{freq}_{offset}_{aspect}"
             filters[name] = gabor2d(win_size, deg, freq, aspect, offset, ntype)
 
-    inarr = garray.array()
-    inarr.read(input)
+    inarr = garray.array(input)
     if flags["c"]:
         convolved = []
         if type(q) == list:

src/raster/r.agent/libagent/grassland.py

@@ -45,10 +45,9 @@ def setgrasslayer(self, layername, grassmapname, force=False):
         @param string name of an existing GRASS map layer
         @param boolean optional, whether to overwrite values if key exists
         """
-        layer = garray.array()
         # fill the new grass array with the contents from the map (must exist)
         if grassmapname in grass.list_strings("rast"):
-            layer.read(grassmapname)
+            layer = garray.array(grassmapname)
             self.grassmapnames[layername] = grassmapname
             self.setlayer(layername, layer, force)
         else:

src/raster/r.droka/r.droka.py

@@ -200,18 +200,14 @@ def main():
     quota = what.split("\n")
 
     # array per la somma dei massi
-    tot = garray.array()
-    tot.read(r_elevation)
+    tot = garray.array(r_elevation)
     tot[...] = (tot * 0.0).astype(float)
-    somma = garray.array()
 
     # array per le velocita
-    velocity = garray.array()
     velMax = garray.array()
     velMean = garray.array()
 
     # array per energia
-    energy = garray.array()
     enMax = garray.array()
     enMean = garray.array()
     grass.message("Waiting...")
@@ -247,18 +243,18 @@ def main():
 
         # calcolo velocita
         grass.mapcalc("vel = $red*sqrt(2*9.8*F)", red=red, overwrite=True)
-        velocity.read("vel")
+        velocity = garray.array("vel")
         velMax[...] = (np.where(velocity > velMax, velocity, velMax)).astype(float)
         velMean[...] = (velocity + velMean).astype(float)
 
         # calcolo numero massi
         grass.mapcalc("somma=if(vel>0,1,0)", overwrite=True)
-        somma.read("somma")
+        somma = garray.array("somma")
         tot[...] = (somma + tot).astype(float)
 
         # calcolo energia
         grass.mapcalc("en=$m*9.8*F/1000", m=m, overwrite=True)
-        energy.read("en")
+        energy = garray.array("en")
         enMax[...] = (np.where(energy > enMax, energy, enMax)).astype(float)
         enMean[...] = (energy + enMean).astype(float)
     grass.message("Create output maps...")

src/raster/r.exdet/r.exdet.py

@@ -232,10 +232,9 @@ def main(options, flags):
     # Import reference data & compute univar stats per reference layer
     s = len(REF)
     dat_ref = stat_mean = stat_min = stat_max = None
-    layer = garray.array()
 
     for i, map in enumerate(REF):
-        layer.read(map, null=np.nan)
+        layer = garray.array(map, null=np.nan)
         r, c = layer.shape
         if dat_ref is None:
             dat_ref = np.empty((s, r, c), dtype=np.double)
@@ -249,7 +248,7 @@ def main(options, flags):
         stat_mean[i] = np.nanmean(layer)
         stat_max[i] = np.nanmax(layer)
         dat_ref[i, :, :] = layer
-    del layer
+        del layer
 
     # Compute mahalanobis over full set of reference layers
     mahal_ref = mahal(v=dat_ref, m=stat_mean, VI=VI)
@@ -283,14 +282,13 @@ def main(options, flags):
     # Import projected layers in numpy array
     s = len(PRO)
     dat_pro = None
-    layer = garray.array()
     for i, map in enumerate(PRO):
-        layer.read(map, null=np.nan)
+        layer = garray.array(map, null=np.nan)
         r, c = layer.shape
         if dat_pro is None:
             dat_pro = np.empty((s, r, c), dtype=np.double)
         dat_pro[i, :, :] = layer
-    del layer
+        del layer
 
     # Compute mahalanobis distance
     mahal_pro = mahal(v=dat_pro, m=stat_mean, VI=VI)

src/raster/r.fidimo/r.fidimo.py

@@ -1035,10 +1035,8 @@ def cdf(x):
                         name="density_from_point_unmasked_tmp_%d" % os.getpid(),
                     )
 
-                x1 = garray.array()
-                x1.read("lower_distance_tmp_%d" % os.getpid())
-                x2 = garray.array()
-                x2.read("upper_distance_tmp_%d" % os.getpid())
+                x1 = garray.array("lower_distance_tmp_%d" % os.getpid())
+                x2 = garray.array("upper_distance_tmp_%d" % os.getpid())
                 Density = garray.array()
                 Density[...] = cdf(x2) - cdf(x1)
                 grass.debug(_("Write density from point to garray. unmasked"))
@@ -1351,8 +1349,7 @@ def cdf(x):
                             + str(cat)
                         )
                     )
-                    CorrectedDensity = garray.array()
-                    CorrectedDensity.read("density_" + str(cat))
+                    CorrectedDensity = garray.array("density_" + str(cat))
 
                     RealisedDensity = garray.array()
                     if options["seed2"]:

src/raster/r.flexure/r.flexure.py

@@ -227,14 +227,14 @@ def main():
         flex.PlateSolutionType = "vWC1994"
     # Parameters that are often changed for the solution
     qs = options["input"]
-    flex.qs = garray.array()
-    flex.qs.read(qs)
+    flex.qs = garray.array(qs)
     # Elastic thickness
     try:
         flex.Te = float(options["te"])
     except:
-        flex.Te = garray.array()  # FlexureTe is the one that is used by Flexure
-        flex.Te.read(options["te"])
+        flex.Te = garray.array(
+            options["te"]
+        )  # FlexureTe is the one that is used by Flexure
         flex.Te = np.array(flex.Te)
     if options["te_units"] == "km":
         flex.Te *= 1000

src/raster/r.flowfill/r.flowfill.py

@@ -200,8 +200,7 @@ def main():
 
     # Output DEM as temporary file for FORTRAN
     temp_FlowFill_input_file = gscript.tempfile(create=False)
-    dem = garray.array()
-    dem.read(_input, null=-999999)
+    dem = garray.array(_input, null=-999999)
     dem_array = np.array(dem[:]).astype(np.float32)
     del dem
     newnc = Dataset(temp_FlowFill_input_file, "w", format="NETCDF4")
@@ -217,8 +216,7 @@ def main():
     # Output runoff raster as temporary file for FORTRAN
     if _h_runoff_raster is not "":
         temp_FlowFill_runoff_file = gscript.tempfile(create=False)
-        rr = garray.array()
-        rr.read(_h_runoff_raster, null=0.0)
+        rr = garray.array(_h_runoff_raster, null=0.0)
         rr_array = np.array(rr[:]).astype(np.float32)
         del rr
         newnc = Dataset(temp_FlowFill_runoff_file, "w", format="NETCDF4")

src/raster/r.popgrowth/r.popgrowth.py

@@ -247,17 +247,15 @@ def ricker_mod(n0, r, k, t):
 
             tmp_map_rast.append("r_exp_tmp_")
 
-            r = garray.array()
-            r.read("r_exp_tmp_%d" % os.getpid())
+            r = garray.array("r_exp_tmp_%d" % os.getpid())
 
         elif options["r_exp_value"]:
             r = float(options["r_exp_value"])
         else:
             grass.fatal(_("No r value/map provided for exponential model"))
 
         # run model
-        n0_map = garray.array()
-        n0_map.read("n0_tmp_%d" % os.getpid())
+        n0_map = garray.array("n0_tmp_%d" % os.getpid())
         exponential_map = garray.array()
         exponential_map[...] = exponential_mod(n0_map, r, t)
         ricker_map.write("exponential_output_tmp_%d" % os.getpid())
@@ -310,8 +308,7 @@ def ricker_mod(n0, r, k, t):
 
             tmp_map_rast.append("r_rick_tmp_")
 
-            r = garray.array()
-            r.read("r_rick_tmp_%d" % os.getpid())
+            r = garray.array("r_rick_tmp_%d" % os.getpid())
 
         elif options["r_rick_value"]:
             r = float(options["r_rick_value"])
@@ -335,17 +332,15 @@ def ricker_mod(n0, r, k, t):
 
             tmp_map_rast.append("k_tmp_")
 
-            k = garray.array()
-            k.read("k_tmp_%d" % os.getpid())
+            k = garray.array("k_tmp_%d" % os.getpid())
 
         elif options["k_value"]:
             k = float(options["k_value"])
         else:
             grass.fatal(_("No value/map for carrying capacity (k) provided"))
 
         # run model
-        n0_map = garray.array()
-        n0_map.read("n0_tmp_%d" % os.getpid())
+        n0_map = garray.array("n0_tmp_%d" % os.getpid())
         ricker_map = garray.array()
         ricker_map[...] = ricker_mod(n0_map, r, k, t)
         ricker_map.write("ricker_output_tmp_%d" % os.getpid())

src/raster/r.richdem.breachdepressions/r.richdem.breachdepressions.py

@@ -85,8 +85,7 @@ def main():
     _output = options["output"]
     _topology = options["topology"]
 
-    dem = garray.array()
-    dem.read(_input, null=np.nan)
+    dem = garray.array(_input, null=np.nan)
 
     rd_inout = rd.rdarray(dem, no_data=np.nan)
     rd.BreachDepressions(dem=rd_inout, in_place=True, topology=_topology)

src/raster/r.richdem.filldepressions/r.richdem.filldepressions.py

@@ -103,8 +103,7 @@ def main():
     else:
         epsilon = False
 
-    dem = garray.array()
-    dem.read(_input, null=np.nan)
+    dem = garray.array(_input, null=np.nan)
 
     rd_inout = rd.rdarray(dem, no_data=np.nan)
     rd.FillDepressions(dem=rd_inout, epsilon=epsilon, in_place=True, topology=_topology)

src/raster/r.richdem.flowaccumulation/r.richdem.flowaccumulation.py

@@ -119,12 +119,10 @@ def main():
     if _weights == "":
         rd_weights = None
     else:
-        g_weights = garray.array()
-        g_weights.read(_weights, null=np.nan)
+        g_weights = garray.array(_weights, null=np.nan)
         rd_weights = rd.rdarray(g_weights, no_data=np.nan)
 
-    dem = garray.array()
-    dem.read(_input, null=np.nan)
+    dem = garray.array(_input, null=np.nan)
 
     mask = dem * 0 + 1
 

src/raster/r.richdem.resolveflats/r.richdem.resolveflats.py

@@ -79,8 +79,7 @@ def main():
     if (_rasters == _output).any():
         g.message(flags="e", message="output would overwrite " + _output)
 
-    dem = garray.array()
-    dem.read(_input, null=np.nan)
+    dem = garray.array(_input, null=np.nan)
 
     rd_input = rd.rdarray(dem, no_data=np.nan)
     rd_output = rd.ResolveFlats(rd_input)