prepare 5.87

ChangeLog

@@ -1,3 +1,12 @@
+2019-08-14  Per Abrahamsen  <[email protected]>
+
+	* surface.C (q_top): Fix sign error for forced_pressure.
+
+2019-08-08  Per Abrahamsen  <[email protected]>
+
+	* hydraulic_table.C (Cw2): Fix unit [cm^-1] instead of [h^-1].
+	* hydraulic.C (run): Ditto.
+
 2019-07-10  Per Abrahamsen  <[email protected]>
 
 	* hydraulic_table.C: New model.

Makefile

@@ -814,7 +814,7 @@ rate${OBJ}: rate.C rate.h model.h symbol.h block_model.h block_nested.h \
 soilfac${OBJ}: soilfac.C soilfac.h model.h symbol.h block_model.h \
  block_nested.h block.h scope.h attribute.h treelog.h frame_model.h \
  frame.h mathlib.h assertion.h librarian.h check.h geometry.h soil.h \
- soil_water.h soil_heat.h
+ soil_water.h soil_heat.h vcheck.h
 rubiscoN${OBJ}: rubiscoN.C rubiscoN.h model.h symbol.h block_model.h \
  block_nested.h block.h scope.h attribute.h treelog.h frame_model.h \
  frame.h librarian.h check.h
@@ -1475,6 +1475,15 @@ plf${OBJ}: plf.C plf.h assertion.h mathlib.h
 mathlib${OBJ}: mathlib.C mathlib.h assertion.h
 nrutil${OBJ}: nrutil.C
 version${OBJ}: version.C
+hydraulic_table${OBJ}: hydraulic_table.C hydraulic.h model_derived.h \
+ model_logable.h model.h symbol.h plf.h mathlib.h assertion.h librarian.h \
+ frame.h scope.h attribute.h block_model.h block_nested.h block.h \
+ treelog.h frame_model.h lexer_table.h units.h memutils.h
+program_weather${OBJ}: program_weather.C program.h model.h symbol.h run.h \
+ wsource.h weather.h weatherdata.h model_derived.h model_logable.h \
+ scope.h attribute.h time.h librarian.h block_model.h block_nested.h \
+ block.h treelog.h frame_model.h frame.h submodeler.h block_submodel.h \
+ frame_submodel.h assertion.h mathlib.h
 uzrichard2${OBJ}: uzrichard2.C uzmodel.h model.h symbol.h block_model.h \
  block_nested.h block.h scope.h attribute.h treelog.h frame_model.h \
  frame.h groundwater.h model_derived.h model_logable.h surface.h \
@@ -1485,10 +1494,11 @@ hydraulic_M_vGip${OBJ}: hydraulic_M_vGip.C hydraulic.h model_derived.h \
  block.h scope.h attribute.h treelog.h frame_model.h frame.h mathlib.h \
  assertion.h librarian.h
 reaction_shoot${OBJ}: reaction_shoot.C reaction.h model_framed.h \
- model_logable.h model.h symbol.h plf.h vegetation.h model_derived.h \
- chemistry.h chemical.h assertion.h mathlib.h treelog.h block_model.h \
- block_nested.h block.h scope.h attribute.h frame_model.h frame.h \
- librarian.h rate.h vcheck.h crop.h time.h check.h
+ model_logable.h model.h symbol.h log.h time.h border.h plf.h \
+ vegetation.h model_derived.h chemistry.h chemical.h assertion.h \
+ mathlib.h treelog.h block_model.h block_nested.h block.h scope.h \
+ attribute.h frame_model.h frame.h librarian.h rate.h vcheck.h crop.h \
+ check.h
 condition_walltime${OBJ}: condition_walltime.C condition.h model_framed.h \
  model_logable.h model.h symbol.h block_model.h block_nested.h block.h \
  scope.h attribute.h treelog.h frame_model.h frame.h librarian.h
@@ -2268,7 +2278,7 @@ action_while${OBJ}: action_while.C action.h model_framed.h model_logable.h \
 action_wait${OBJ}: action_wait.C action.h model_framed.h model_logable.h \
  model.h symbol.h block_model.h block_nested.h block.h scope.h \
  attribute.h treelog.h frame_model.h frame.h condition.h log.h time.h \
- border.h daisy.h program.h run.h assertion.h librarian.h
+ border.h daisy.h program.h run.h assertion.h librarian.h vcheck.h
 action_activity${OBJ}: action_activity.C action.h model_framed.h \
  model_logable.h model.h symbol.h frame.h scope.h attribute.h log.h \
  time.h border.h memutils.h librarian.h metalib.h library.h treelog.h \

TODO

@@ -1,8 +1,24 @@
 TODO ---things that needs to be done with Daisy -*- outline -*-
 
-* OPDATER hydraulic old
+* RAINPROOF
 
-Lad den tage output fra program hydraulic som input
+** DONE Plot BBCH start / end
+
+** Extend window for Atlantis
+
+** DONE Create "CPH-1hourP-dates.csv" and "CPH-8hourP-dates.csv" files
+
+** Value of waiting...
+
+M(today) / min (M (day); day in rest of application window)
+
+Prediction should use BBCH, #day with this BBCH
+
+** Risk of waiting?
+
+** We need to evaluate on complete application windows
+
+** I need to train on application windows that include last day
 
 * RAINPROOF ML
 

hydraulic_table.C

@@ -104,7 +104,7 @@ HydraulicTable::HydraulicTable (const BlockModel& al)
       throw "hyd table init err6";
     }
   const symbol Cw2_unit = lex.dimension (Cw2_c);
-  if (!units.can_convert (Cw2_unit, "h^-1", msg))
+  if (!units.can_convert (Cw2_unit, "cm^-1", msg))
     throw "hyd table init err7";
   const int K_c = lex.find_tag ("K");
   if (K_c < 0)
@@ -141,8 +141,8 @@ HydraulicTable::HydraulicTable (const BlockModel& al)
 	  throw "hyd table init err11";
 	}
       double Cw2 = lex.convert_to_double (entries[Cw2_c]);
-      if (units.can_convert (Cw2_unit, "h^-1", Cw2))
-	Cw2 = units.convert (Cw2_unit, "h^-1", Cw2);
+      if (units.can_convert (Cw2_unit, "cm^-1", Cw2))
+	Cw2 = units.convert (Cw2_unit, "cm^-1", Cw2);
       else
 	{
 	  lex.error ("Cw2 convert failed");

surface.C

@@ -121,7 +121,7 @@ Surface::Implementation::q_top (const Geometry& geo, const size_t edge,
                                 const double dt) const
 {
   if (use_forced_pressure)
-    return forced_pressure_value * 0.1 / 1.0; // mm -> cm/h.
+    return -forced_pressure_value * 0.1 / 1.0; // mm -> cm/h.
 
   if (use_forced_flux)
     return forced_flux_value * 0.1; // mm/h -> cm/h.