diff --git a/raster/r.sim/r.sim.sediment/r.sim.sediment.md b/raster/r.sim/r.sim.sediment/r.sim.sediment.md
index 87e4afe0a6a..8e3c7cf6ae3 100644
--- a/raster/r.sim/r.sim.sediment/r.sim.sediment.md
+++ b/raster/r.sim/r.sim.sediment/r.sim.sediment.md
@@ -76,7 +76,7 @@ Summary of a run in JSON:
r.sim.sediment elevation=elevation water_depth=water_depth detachment_coeff=detachment \
transport_coeff=transport shear_stress=shear_stress man_value=1 \
sediment_flux=flux erosion_deposition=erdep transport_capacity=tc \
- duration=1 random_seed=1 -p format=json
+ duration=1 seed=1 -p format=json
```
```json
diff --git a/raster/r.sim/r.sim.sediment/tests/r_sim_sediment_random_test.py b/raster/r.sim/r.sim.sediment/tests/r_sim_sediment_random_test.py
index 21c0f2c1379..66dbb7fc5fc 100644
--- a/raster/r.sim/r.sim.sediment/tests/r_sim_sediment_random_test.py
+++ b/raster/r.sim/r.sim.sediment/tests/r_sim_sediment_random_test.py
@@ -65,15 +65,15 @@ def simulate(session, walkers=None, env=None, **kwargs):
def test_same_seed_gives_same_flux(session):
"""Two runs with the same seed give the same sediment flux."""
- first, _ = simulate(session, random_seed=1)
- second, _ = simulate(session, random_seed=1)
+ first, _ = simulate(session, seed=1)
+ second, _ = simulate(session, seed=1)
assert np.array_equal(first, second)
def test_different_seeds_give_different_results(session):
"""Runs with different seeds give different fluxes and walker positions."""
- first_flux, first_walkers = simulate(session, "walkers_seed_1", random_seed=1)
- second_flux, second_walkers = simulate(session, "walkers_seed_2", random_seed=2)
+ first_flux, first_walkers = simulate(session, "walkers_seed_1", seed=1)
+ second_flux, second_walkers = simulate(session, "walkers_seed_2", seed=2)
assert not np.array_equal(first_flux, second_flux)
assert not np.array_equal(first_walkers, second_walkers)
@@ -83,7 +83,7 @@ def test_generated_seed_is_the_seed_option(session):
env = session.env.copy()
env["GRASS_RANDOM_SEED"] = "3"
generated, _ = simulate(session, env=env)
- given, _ = simulate(session, random_seed=3)
+ given, _ = simulate(session, seed=3)
assert np.array_equal(generated, given)
@@ -94,9 +94,9 @@ def test_results_do_not_depend_on_nprocs(session, nprocs):
The water depth is an input here, so nothing a walker reacts to is
changed by the other walkers of the same step.
"""
- serial_flux, serial = simulate(session, f"walkers_{nprocs}_serial", random_seed=5)
+ serial_flux, serial = simulate(session, f"walkers_{nprocs}_serial", seed=5)
parallel_flux, parallel = simulate(
- session, f"walkers_{nprocs}_parallel", random_seed=5, nprocs=nprocs
+ session, f"walkers_{nprocs}_parallel", seed=5, nprocs=nprocs
)
assert serial.size
assert np.array_equal(parallel, serial)
@@ -107,11 +107,11 @@ def test_results_do_not_depend_on_nprocs(session, nprocs):
def test_seed_outside_range_is_an_error(session, seed):
"""A seed the generator cannot use is refused, not silently wrapped."""
with pytest.raises(CalledModuleError, match="outside the range"):
- simulate(session, random_seed=seed)
+ simulate(session, seed=seed)
@pytest.mark.parametrize("seed", ["12abc", "1.5", "-", "99999999999999999999"])
def test_seed_which_is_not_an_integer_is_an_error(session, seed):
"""A seed which the parser lets through but which is not an integer is refused."""
with pytest.raises(CalledModuleError, match="Invalid random seed"):
- simulate(session, random_seed=seed)
+ simulate(session, seed=seed)
diff --git a/raster/r.sim/r.sim.sediment/tests/r_sim_sediment_summary_test.py b/raster/r.sim/r.sim.sediment/tests/r_sim_sediment_summary_test.py
index 4fc1ee25067..84a2ca6257b 100644
--- a/raster/r.sim/r.sim.sediment/tests/r_sim_sediment_summary_test.py
+++ b/raster/r.sim/r.sim.sediment/tests/r_sim_sediment_summary_test.py
@@ -70,7 +70,7 @@ def sediment_inputs(session_tools):
"shear_stress": "shear_stress",
"man_value": 1,
"diffusion_coeff": 0.05,
- "random_seed": 1,
+ "seed": 1,
}
diff --git a/raster/r.sim/r.sim.sediment/testsuite/test_r_sim_sediment.py b/raster/r.sim/r.sim.sediment/testsuite/test_r_sim_sediment.py
index bb4bc13a8de..85a01273384 100644
--- a/raster/r.sim/r.sim.sediment/testsuite/test_r_sim_sediment.py
+++ b/raster/r.sim/r.sim.sediment/testsuite/test_r_sim_sediment.py
@@ -85,7 +85,7 @@ def test_default(self):
shear_stress=self.tauin,
sediment_flux=self.sedflux,
erosion_deposition=self.erdep,
- random_seed=1,
+ seed=1,
)
# Assert that the output rasters exist
diff --git a/raster/r.sim/r.sim.water/main.c b/raster/r.sim/r.sim.water/main.c
index e1055c16cf7..e03034fb28b 100644
--- a/raster/r.sim/r.sim.water/main.c
+++ b/raster/r.sim/r.sim.water/main.c
@@ -315,7 +315,6 @@ int main(int argc, char *argv[])
flag.tserie->guisection = _("Output");
parm.seed = G_define_standard_option(G_OPT_M_SEED);
- parm.seed->key = "random_seed";
flag.generateSeed = G_define_flag();
flag.generateSeed->key = 's';
@@ -323,7 +322,7 @@ int main(int argc, char *argv[])
_("Generate random seed (result is non-deterministic) [deprecated]");
flag.generateSeed->description =
_("This flag is deprecated and will be removed in a future release. "
- "Seeding is automatic or use parameter random_seed.");
+ "Seeding is automatic or use parameter seed.");
parm.threads = G_define_option();
parm.threads->key = "nprocs";
diff --git a/raster/r.sim/r.sim.water/r.sim.water.html b/raster/r.sim/r.sim.water/r.sim.water.html
index b9f2fbc0ab1..5a81b41767f 100644
--- a/raster/r.sim/r.sim.water/r.sim.water.html
+++ b/raster/r.sim/r.sim.water/r.sim.water.html
@@ -232,7 +232,7 @@ Run summary
r.sim.water elevation=elevation depth=depth discharge=discharge rain_value=50 \
- man_value=0.05 nwalkers=100000 duration=20 output_step=10 random_seed=3 \
+ man_value=0.05 nwalkers=100000 duration=20 output_step=10 seed=3 \
-t -p format=json
Run summary
nwalkers=100000,
duration=20,
output_step=10,
- random_seed=3,
+ seed=3,
flags="tp",
format="json",
)
@@ -273,7 +273,7 @@ Run summary
nwalkers=100000,
duration=20,
output_step=10,
- random_seed=3,
+ seed=3,
flags="tp",
format="json",
)
@@ -325,7 +325,7 @@ Run summary
Random numbers and parallel processing
The walkers are placed and moved using pseudo-random numbers. The seed
-is given by random_seed; without it, a seed is generated and
+is given by seed; without it, a seed is generated and
recorded in the history of the output maps and in the run summary as
seed, so that the run can be repeated. With more than one thread, the
results differ slightly between thread counts and between repeated runs,
@@ -421,7 +421,7 @@ EXAMPLE
r.sim.water elevation=elevation man=mannings rain_value=20 depth=depth \
- duration=30 random_seed=1
+ duration=30 seed=1
EXAMPLE
rain_value=20,
depth="depth",
duration=30,
- random_seed=1,
+ seed=1,
)