loading inclusion mask for gid prior to iterating over resource bins …

…and zones
NREL · Jan 28, 2025 · 142eb83 · 142eb83
1 parent a68e4f6
commit 142eb83
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/reV/supply_curve/aggregation.py b/reV/supply_curve/aggregation.py
@@ -425,7 +425,7 @@ def _get_gid_inclusion_mask(
             gid_inclusions = inclusion_mask[gid]
             assert gid_inclusions.shape[0] <= resolution
             assert gid_inclusions.shape[1] <= resolution
-        elif isinstance(inclusion_mask, np.ndarray):
+        elif isinstance(inclusion_mask, (np.ndarray, ExclusionMaskFromDict)):
             row_slice, col_slice = slice_lookup[gid]
             gid_inclusions = inclusion_mask[row_slice, col_slice]
         elif inclusion_mask is not None:

diff --git a/reV/supply_curve/sc_aggregation.py b/reV/supply_curve/sc_aggregation.py
@@ -1106,6 +1106,9 @@ def run_serial(
             res_data, res_class_bins, lcoe_data = temp
             h5_dsets_data = cls._get_extra_dsets(fh.gen, h5_dsets)
 
+            if inclusion_mask is None:
+                inclusion_mask = fh.exclusions
+
             n_finished = 0
             for gid in gids:
                 gid_inclusions = cls._get_gid_inclusion_mask(

diff --git a/tests/test_supply_curve_sc_aggregation.py b/tests/test_supply_curve_sc_aggregation.py
@@ -47,7 +47,7 @@
     "padus": {"dset": "ri_padus", "method": "mode"},
 }
 EXCL_DICT = {
-    "ri_srtm_slope": {"inclusion_range": (None, 5), "exclude_nodata": True},
+    "ri_srtm_slope": {"include_range": (None, 5), "exclude_nodata": True},
     "ri_padus": {"exclude_values": [1], "exclude_nodata": True},
 }
 RTOL = 0.001