Fixed two bugs that had to deal with crop_end_type is harvest/earliest.

Author: ajwdewit

pcse/agromanager.py

@@ -156,20 +156,21 @@ def __call__(self, day):
 
         # end of the crop cycle
         finish_type = None
-        # Check if crop_end_date is reached for CROP_END_TYPE harvest/earliest
-        if self.crop_end_type in ["harvest", "earliest"]:
-            if day == self.crop_end_date:
-                finish_type = "harvest"
+        if self.in_crop_cycle:
+            # Check if crop_end_date is reached for CROP_END_TYPE harvest/earliest
+            if self.crop_end_type in ["harvest", "earliest"]:
+                if day == self.crop_end_date:
+                    finish_type = "harvest"
 
-        # Check for forced stop because maximum duration is reached
-        if self.in_crop_cycle and self.duration == self.max_duration:
-            finish_type = "max_duration"
+            # Check for forced stop because maximum duration is reached
+            if self.in_crop_cycle and self.duration == self.max_duration:
+                finish_type = "max_duration"
 
         # If finish condition is reached send a signal to finish the crop
         if finish_type is not None:
             self.in_crop_cycle = False
             self._send_signal(signal=signals.crop_finish, day=day,
-                              finish=finish_type, crop_delete=True)
+                              finish_type=finish_type, crop_delete=True)
 
     def _on_CROP_FINISH(self):
         """Register that crop has reached the end of its cycle.

pcse/crop/phenology.py

@@ -466,7 +466,7 @@ def _next_stage(self, day):
             s.DOM = day
             if p.CROP_END_TYPE in ["maturity","earliest"]:
                 self._send_signal(signal=signals.crop_finish,
-                                  day=day, finish="maturity",
+                                  day=day, finish_type="maturity",
                                   crop_delete=True)
         elif s.STAGE == "mature":
             msg = "Cannot move to next phenology stage: maturity already reached!"
@@ -485,7 +485,7 @@ def _on_CROP_FINISH(self, day, finish_type=None):
         strictly related to phenology (but to management) this is the most
         logical place to put it.
         """
-        if finish_type == 'harvest':
+        if finish_type in ['harvest', 'earliest']:
             self._for_finalize["DOH"] = day