From fdd768782d0170809f36d105ab45b9288831c514 Mon Sep 17 00:00:00 2001 From: Michael G Threet Date: Thu, 16 May 2024 16:20:05 -0700 Subject: [PATCH] Pass CI checks --- simfire/utils/layers.py | 2 +- tests/historical_test.py | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/simfire/utils/layers.py b/simfire/utils/layers.py index 28812cd..a1fff16 100644 --- a/simfire/utils/layers.py +++ b/simfire/utils/layers.py @@ -772,7 +772,7 @@ def _load_texture(self) -> np.ndarray: class HistoricalLayer: def __init__( self, - year: int, + year: str, state: str, fire: str, path: Union[Path, str], diff --git a/tests/historical_test.py b/tests/historical_test.py index 3298bd9..2f6dae6 100644 --- a/tests/historical_test.py +++ b/tests/historical_test.py @@ -1,4 +1,5 @@ -from datetime import datetime, timedelta +from datetime import timedelta + from simfire.sim.simulation import FireSimulation from simfire.utils.config import Config from simfire.utils.layers import HistoricalLayer @@ -7,7 +8,7 @@ sim = FireSimulation(config) hist_layer = HistoricalLayer( - config.historical.year, + str(config.historical.year), config.historical.state, config.historical.fire, config.historical.path, @@ -16,9 +17,7 @@ config.operational.width, ) -# Get hist_layer start time -# Set udpate duration to 1m, 1h, whatever makes sense -update_minutes = 12 * 60 +update_minutes = 1 * 60 update_interval = f"{update_minutes}m" update_interval_datetime = timedelta(minutes=update_minutes) current_time = hist_layer.convert_to_datetime(hist_layer.start_time) @@ -30,7 +29,3 @@ sim.fire_map[mitigations != 0] = mitigations[mitigations != 0] sim.run(update_interval) current_time += update_interval_datetime -# Loop through simulation -# Update Historical Layer to get mitigations for specifc times (can filter the data frame) - -print("done!")