Feature/stoichiometry for Animals

tests/models/animals/conftest.py

@@ -672,19 +672,34 @@ def butterfly_cohort_instance(
 
 @pytest.fixture
 def excrement_pool_instance():
-    """Fixture for a soil pool used in tests."""
+    """Fixture for an excrement pool used in tests."""
     from virtual_ecosystem.models.animal.decay import ExcrementPool
 
     return ExcrementPool(
-        scavengeable_carbon=0.0,
-        decomposed_carbon=0.0,
-        scavengeable_nitrogen=0.0,
-        decomposed_nitrogen=0.0,
-        scavengeable_phosphorus=0.0,
-        decomposed_phosphorus=0.0,
+        scavengeable_cnp={"carbon": 0.0, "nitrogen": 0.0, "phosphorus": 0.0},
+        decomposed_cnp={"carbon": 0.0, "nitrogen": 0.0, "phosphorus": 0.0},
     )
 
 
+@pytest.fixture
+def excrement_pools_instance():
+    """Fixture for excrement pools used in tests."""
+    from virtual_ecosystem.models.animal.decay import ExcrementPool
+
+    return {
+        1: [
+            ExcrementPool(
+                scavengeable_cnp={
+                    "carbon": 500.0,
+                    "nitrogen": 100.0,
+                    "phosphorus": 50.0,
+                },
+                decomposed_cnp={"carbon": 0.0, "nitrogen": 0.0, "phosphorus": 0.0},
+            )
+        ]
+    }
+
+
 @pytest.fixture
 def plant_instance(plant_data_instance, constants_instance):
     """Fixture for a plant community used in tests."""
@@ -737,12 +752,8 @@ def carcass_pool_instance():
     from virtual_ecosystem.models.animal.decay import CarcassPool
 
     return CarcassPool(
-        scavengeable_carbon=0.0,
-        decomposed_carbon=0.0,
-        scavengeable_nitrogen=0.0,
-        decomposed_nitrogen=0.0,
-        scavengeable_phosphorus=0.0,
-        decomposed_phosphorus=0.0,
+        scavengeable_cnp={"carbon": 0.0, "nitrogen": 0.0, "phosphorus": 0.0},
+        decomposed_cnp={"carbon": 0.0, "nitrogen": 0.0, "phosphorus": 0.0},
     )
 
 
@@ -752,16 +763,17 @@ def carcass_pools_instance():
     from virtual_ecosystem.models.animal.decay import CarcassPool
 
     return {
-        1: [
+        cell_id: [
             CarcassPool(
-                scavengeable_carbon=500.0,
-                decomposed_carbon=0.0,
-                scavengeable_nitrogen=100.0,
-                decomposed_nitrogen=0.0,
-                scavengeable_phosphorus=50.0,
-                decomposed_phosphorus=0.0,
+                scavengeable_cnp={
+                    "carbon": 500.0,
+                    "nitrogen": 100.0,
+                    "phosphorus": 50.0,
+                },
+                decomposed_cnp={"carbon": 0.0, "nitrogen": 0.0, "phosphorus": 0.0},
             )
         ]
+        for cell_id in range(0, 9)  # Creates carcass pools for cells 0 to 8
     }