Distribute - Albedo - Follow up fixes after merge with latest in main

The main branch had an overhaul of the init method, changing a few pieces of the logic in
this branch with was developed in parallel. This now also adds the accessor to veg_type
from the topo with the ImageData base class.

Author: jomey

smrf/distribute/variable_base.py

@@ -128,6 +128,10 @@ def veg_tau(self):
     def veg_k(self):
         return self.topo.veg_k
 
+    @property
+    def veg_type(self):
+        return self.topo.veg_type
+
     # END - Topo accessor methods
 
     # START - config accessors

smrf/tests/distribute/test_albedo.py

@@ -7,15 +7,17 @@
 from smrf.distribute.albedo import Albedo
 
 CONFIG = {
-    "decay_method": "date_method",
-    "decay_start": pd.to_datetime("2025-04-01"),
-    "decay_end": pd.to_datetime("2025-07-01"),
-    "grain_size": 100.0,
-    "max_grain": 800.0,
-    "max": 1.0,
-    "min": 0.0,
-    "dirt": 2,
-    "date_method_veg_default": 0.2,
+    "albedo": {
+        "decay_method": "date_method",
+        "decay_start": pd.to_datetime("2025-04-01"),
+        "decay_end": pd.to_datetime("2025-07-01"),
+        "grain_size": 100.0,
+        "max_grain": 800.0,
+        "max": 1.0,
+        "min": 0.0,
+        "dirt": 2,
+        "date_method_veg_default": 0.2,
+    }
 }
 DECAY_TIME = pd.to_datetime("2025-04-30")
 NO_DECAY_TIME = pd.to_datetime("2025-03-01")
@@ -32,8 +34,8 @@
 
 class TestAlbedo(unittest.TestCase):
     def setUp(self):
-        self.subject = Albedo(CONFIG)
-        self.subject.initialize(TOPO, DATA)
+        self.subject = Albedo(CONFIG, TOPO)
+        self.subject.initialize(DATA)
 
     def test_before_decay_window(self):
         current, decay = self.subject.decay_window(NO_DECAY_TIME)
@@ -51,7 +53,11 @@ def test_distribute_date_method_not_in_window(self, decay_alb_power, envphys_alb
 
         envphys_albedo.assert_called()
         envphys_albedo.assert_called_with(
-            STORM_DAYS, COS_Z, CONFIG["grain_size"], CONFIG["max_grain"], CONFIG["dirt"]
+            STORM_DAYS,
+            COS_Z,
+            CONFIG["albedo"]["grain_size"],
+            CONFIG["albedo"]["max_grain"],
+            CONFIG["albedo"]["dirt"]
         )
         decay_alb_power.assert_not_called()
 
@@ -74,7 +80,11 @@ def test_distribute_post_fire_not_in_window(self, decay_burned, envphys_albedo):
 
         envphys_albedo.assert_called()
         envphys_albedo.assert_called_with(
-            STORM_DAYS, COS_Z, CONFIG["grain_size"], CONFIG["max_grain"], CONFIG["dirt"]
+            STORM_DAYS,
+            COS_Z,
+            CONFIG["albedo"]["grain_size"],
+            CONFIG["albedo"]["max_grain"],
+            CONFIG["albedo"]["dirt"]
         )
         decay_burned.assert_not_called()