r.sim.water: fix logfile writing (OSGeo#4522)

neteler · Oct 15, 2024 · 14d4745 · 14d4745
1 parent 4d2a3f9
commit 14d4745
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/raster/r.sim/r.sim.sediment/main.c b/raster/r.sim/r.sim.sediment/main.c
@@ -416,6 +416,8 @@ int main(int argc, char *argv[])
         G_message(_("Using metric conversion factor %f, step=%f"), wp.conv,
                   wp.step);
 
+    wp.observation = parm.observation->answer;
+    wp.logfile = parm.logfile->answer;
     init_library_globals(&wp);
 
     if ((wp.tc == NULL) && (wp.et == NULL) && (wp.conc == NULL) &&

diff --git a/raster/r.sim/r.sim.water/main.c b/raster/r.sim/r.sim.water/main.c
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
     parm.logfile->required = NO;
     parm.logfile->description =
         _("Name for sampling points output text file. For each observation "
-          "vector point the time series of sediment transport is stored.");
+          "vector point the time series of water discharge is stored.");
     parm.logfile->guisection = _("Output");
 
     parm.nwalk = G_define_option();
@@ -524,6 +524,8 @@ int main(int argc, char *argv[])
         G_message(_("Using metric conversion factor %f, step=%f"), wp.conv,
                   wp.step);
 
+    wp.observation = parm.observation->answer;
+    wp.logfile = parm.logfile->answer;
     init_library_globals(&wp);
 
     if ((wp.depth == NULL) && (wp.disch == NULL) && (wp.err == NULL))

diff --git a/raster/r.sim/simlib/hydro.c b/raster/r.sim/simlib/hydro.c
@@ -151,9 +151,6 @@ void main_loop(void)
         maxwa = maxwa / nblock;
     }
 
-    /* Create the observation points */
-    create_observation_points();
-
     G_debug(2, " maxwa, nblock %d %d", maxwa, nblock);
 
     for (iblock = 1; iblock <= nblock; iblock++) {