♻️ Fix issue resulting from merge conflict.

ImperialCollegeLondon · Nov 6, 2024 · 4948a80 · 4948a80
1 parent 2bcb3e9
commit 4948a80
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/virtual_ecosystem/models/soil/soil_model.py b/virtual_ecosystem/models/soil/soil_model.py
@@ -151,15 +151,15 @@ def _setup(
 
         # Check that soil pool data is appropriately bounded
         if (
-            np.any(data["soil_c_pool_maom"] < 0.0)
-            or np.any(data["soil_c_pool_lmwc"] < 0.0)
-            or np.any(data["soil_c_pool_microbe"] < 0.0)
-            or np.any(data["soil_c_pool_pom"] < 0.0)
-            or np.any(data["soil_enzyme_pom"] < 0.0)
-            or np.any(data["soil_enzyme_maom"] < 0.0)
-            or np.any(data["soil_c_pool_necromass"] < 0.0)
-            or np.any(data["soil_n_pool_don"] < 0.0)
-            or np.any(data["soil_n_pool_particulate"] < 0.0)
+            np.any(self.data["soil_c_pool_maom"] < 0.0)
+            or np.any(self.data["soil_c_pool_lmwc"] < 0.0)
+            or np.any(self.data["soil_c_pool_microbe"] < 0.0)
+            or np.any(self.data["soil_c_pool_pom"] < 0.0)
+            or np.any(self.data["soil_enzyme_pom"] < 0.0)
+            or np.any(self.data["soil_enzyme_maom"] < 0.0)
+            or np.any(self.data["soil_c_pool_necromass"] < 0.0)
+            or np.any(self.data["soil_n_pool_don"] < 0.0)
+            or np.any(self.data["soil_n_pool_particulate"] < 0.0)
         ):
             to_raise = InitialisationError(
                 "Initial carbon pools contain at least one negative value!"