Fix: Use cumulative soil carbon for all tables and outputs; remove cumsum from table logic

dashboard/tables/__init__.py

@@ -71,8 +71,7 @@ def create_survival_table(model):
 
 def create_project_results_table(results: pd.DataFrame) -> pd.DataFrame:
     df = results.copy()
-    # Replace soil_carbon with its cumulative sum
-    df['soil_carbon'] = df['soil_carbon'].cumsum()
+    # No need to cumsum soil_carbon; model now provides cumulative values
     # Optionally format numbers for display
     for col in df.columns:
         if df[col].dtype in [float, int]:

er_model_core/er_model.py

@@ -249,6 +249,7 @@ class ERModel:
         results = []
         species_results = []
         species_metrics_rows = []  # For new per-year, per-species metrics
+        cumulative_soil_carbon = 0
         for year in years:
             year_results = {"year": year}
             species_year_results = {"Year": year}
@@ -318,15 +319,17 @@ class ERModel:
             soil_carbon = 0
             if hasattr(self.carbon, 'soil_carbon_per_ha_per_year'):
                 soil_carbon = self.carbon.soil_carbon_per_ha_per_year * cumulative_area
-            gross_carbon_with_soil = gross_carbon + soil_carbon
-            buffer_carbon_with_soil = buffer_carbon + (soil_carbon * (1 - self.carbon.buffer_percentage / 100))
+            cumulative_soil_carbon += soil_carbon
+            gross_carbon_with_soil = gross_carbon + cumulative_soil_carbon
+            buffer_carbon_with_soil = buffer_carbon + (cumulative_soil_carbon * (1 - self.carbon.buffer_percentage / 100))
             year_results.update({
                 "gross_carbon": gross_carbon,
                 "buffer_carbon": buffer_carbon,
                 "cumulative_area": cumulative_area,
                 "gross_carbon_with_soil": gross_carbon_with_soil,
                 "buffer_carbon_with_soil": buffer_carbon_with_soil,
-                "soil_carbon": soil_carbon
+                "soil_carbon": soil_carbon,
+                "cumulative_soil_carbon": cumulative_soil_carbon
             })
             results.append(year_results)
             species_results.append(species_year_results)