27 current logic to quit game causes simharness vectorized environment setup to crash

simfire/game/game.py

@@ -22,6 +22,8 @@ class Game:
     terrain, fire, and other sprites to be rendered and interact.
     """
 
+    num_active_games: int = 0
+
     def __init__(
         self,
         screen_size: Tuple[int, int],
@@ -90,6 +92,9 @@ def __init__(
         if self.record:
             self.frames = []
 
+        # Increment number of active games to track across instances.
+        Game.num_active_games += 1
+
     def _toggle_wind_magnitude_display(self):
         """
         Toggle display of wind MAGNITUDE over the main screen.
@@ -281,8 +286,11 @@ def quit(self) -> None:
         """
         Close the PyGame window and stop the `Game`
         """
-        pygame.display.quit()
-        pygame.quit()
+        Game.num_active_games -= 1
+
+        if Game.num_active_games == 0:
+            pygame.display.quit()
+            pygame.quit()
 
     def save(self, path: pathlib.Path, duration: int = 100) -> None:
         """Save a GIF of the simulation to a specified path

simfire/utils/layers.py

@@ -112,7 +112,7 @@ def __init__(
         self.fuel = self.fuel[:pixel_height, :pixel_width]
         self.topography = self.topography[:pixel_height, :pixel_width]
 
-        print(
+        log.info(
             f"Output shape of Fire Map: {height}m x {width}m "
             f"--> {self.fuel.shape} in pixel space"
         )
@@ -129,11 +129,20 @@ def _check_paths(self):
                 This could greatly improve functionality and speed up training interations
         """
         if self.output_path.exists():
-            log.debug(
-                "Data for this area already exists. Loading from file: "
-                f"{self.output_path}"
-            )
-            return True
+            tifs = [str(t) for t in self.output_path.glob("*.tif")]
+            if len(tifs) == 0:
+                log.info(
+                    f"The output path, {self.output_path}, exists, but does not "
+                    "contain any tif files. Returning false to ensure that data "
+                    "for this area is pulled."
+                )
+                return False
+            else:
+                log.debug(
+                    "Data for this area already exists. Loading from file: "
+                    f"{self.output_path}"
+                )
+                return True
         else:
             return False
 
@@ -212,26 +221,23 @@ def query_lat_lon_layer_data(self):
             band: the gdal raster band that contains the data
 
         """
-        if not self.output_path.exists():
-            self.output_path.mkdir(parents=True, exist_ok=True)
-
-            lf = landfire.Landfire(
-                bbox=f"{self.points[0][1]} {self.points[0][0]} \
-                    {self.points[1][1]+self.pad_distance} \
-                    {self.points[1][0]-self.pad_distance}",
-                output_crs="4326",
-            )
-            # assume the order of data retrieval stays the same
-            lf.request_data(
-                layers=self.layer_products.values(),
-                output_path=str(self.output_path / self.product_layers_path),
-            )
-
-            shutil.unpack_archive(
-                self.output_path / self.product_layers_path, self.output_path
-            )
-        else:
-            log.debug(f"Data already exists for {self.output_path}")
+        self.output_path.mkdir(parents=True, exist_ok=True)
+
+        lf = landfire.Landfire(
+            bbox=f"{self.points[0][1]} {self.points[0][0]} \
+                {self.points[1][1]+self.pad_distance} \
+                {self.points[1][0]-self.pad_distance}",
+            output_crs="4326",
+        )
+        # assume the order of data retrieval stays the same
+        lf.request_data(
+            layers=self.layer_products.values(),
+            output_path=str(self.output_path / self.product_layers_path),
+        )
+
+        shutil.unpack_archive(
+            self.output_path / self.product_layers_path, self.output_path
+        )
 
     def _make_data(self):
         """