Increase DtPlotDischarge and log to fix geotopmodel#23

ssenoner · ssenoner · commit 45dcc0eefa1e · 2019-01-06T16:00:37.000+01:00
diff --git a/src/geotop/parameters.cc b/src/geotop/parameters.cc
@@ -1424,9 +1424,12 @@ static void assign_numeric_parameters(Par *par,
 
   par->state_discharge = 0;
   par->Dtplot_discharge *= 3600.;
-  if (par->Dtplot_discharge > 1.E-5 && par->Dtplot_discharge <= minDt)
+  if (par->Dtplot_discharge > 1.E-5 && par->Dtplot_discharge < par->Dt)
     {
-      par->plot_discharge_with_Dt_integration[1] = 1;
+      lg->logsf(geotop::logger::WARNING,
+                "Dtplot_discharge %.0f seconds will be increased to Dt %.0f",
+                par->Dtplot_discharge,par->Dt);
+      par->Dtplot_discharge = par->Dt;
     }
   else
     {

Original file line number	Diff line number	Diff line change
`@@ -1424,9 +1424,12 @@ static void assign_numeric_parameters(Par *par,`
`1424`	`1424`
`1425`	`1425`	`par->state_discharge = 0;`
`1426`	`1426`	`par->Dtplot_discharge *= 3600.;`
`1427`		`- if (par->Dtplot_discharge > 1.E-5 && par->Dtplot_discharge <= minDt)`
	`1427`	`+ if (par->Dtplot_discharge > 1.E-5 && par->Dtplot_discharge < par->Dt)`
`1428`	`1428`	`{`
`1429`		`- par->plot_discharge_with_Dt_integration[1] = 1;`
	`1429`	`+ lg->logsf(geotop::logger::WARNING,`
	`1430`	`+ "Dtplot_discharge %.0f seconds will be increased to Dt %.0f",`
	`1431`	`+ par->Dtplot_discharge,par->Dt);`
	`1432`	`+ par->Dtplot_discharge = par->Dt;`
`1430`	`1433`	`}`
`1431`	`1434`	`else`
`1432`	`1435`	`{`