merged

ChangeLog

@@ -1,8 +1,18 @@
+2019-06-04  Per Abrahamsen  <[email protected]>
+
+	* Version 5.84 released.
+
 2019-06-04  Per Abrahamsen  <[email protected]>
 
 	* reaction_shoot.C (shoot2): New model.
 
-2019-05-14  Per Abrahamsen  <[email protected]>
+2019-05-14  Per Abrahamsen  <[email protected]>
+
+	* Version 5.83 released.
+
+2019-05-14  Per Abrahamsen  <[email protected]>
+
+	* crop_std.C (CropStandard::tick): Call root_system->tick_daily with right type parameters.
 
 	* horizon.C (K_factor): New parameter.
 

Makefile

@@ -685,10 +685,10 @@ setup:
 	cat ChangeLog.old >> ChangeLog
 	$(MAKE) make-win32-portable
 	$(MAKE) make-win64-portable
-	$(MAKE) docs OBJHOME=win64-portable
+	$(MAKE) docs OBJHOME=win32-portable
 	make setupcommon MINGWHOME="$(MINGWHOME32)" MINGWDLL="$(MINGWDLL32)" OBJHOME=win32-portable NSISFILE=setup-w32.nsi
 	make setupcommon MINGWHOME="$(MINGWHOME64)" MINGWDLL="$(MINGWDLL64)" OBJHOME=win64-portable NSISFILE=setup-w64.nsi
-	cp -p daisy-$(TAG)-setup-w32.exe daisy-$(TAG)-setup-w64.exe $(DISTDIR)
+#	cp -p daisy-$(TAG)-setup-w32.exe daisy-$(TAG)-setup-w64.exe $(DISTDIR)
 	(cd txt && $(MAKE) dist DISTDIR="$(DISTDIR)" TAG=$(TAG))
 	(cd OpenMI && $(MAKE) checkin);
 	(cd lib && $(MAKE) checkin);

crop_std.C

@@ -565,7 +565,7 @@ CropStandard::tick (const Scope& scope,
 	  canopy->tick (production.WLeaf, production.WSOrg,
 		       production.WStem, DS, seed_CAI);
 	  nitrogen->content (DS, production, msg);
-	  root_system->tick_daily (geo, soil, soil_water, production.WRoot, 0.0,
+	  root_system->tick_daily (geo, soil, soil_water, production.WRoot, false,
                                    DS, msg);
 
 	  static const symbol root_symbol ("root");

program_weather.C

@@ -28,11 +28,11 @@
 #include "submodeler.h"
 #include "time.h"
 #include "assertion.h"
+#include "mathlib.h"
 
 #include <memory>
 #include <sstream>
 #include <vector>
-#include <cmath>
 
 struct ProgramWeather : public Program
 {

version.C

@@ -1,4 +1,4 @@
 // version.C -- automatically generated file
 
-extern const char *const version = "5.82";
+extern const char *const version = "5.84";
 extern const char *const version_date = __DATE__;