UI improvements: move Key Metrics, update plot color, modularize cumulative soil carbon

.gradio/certificate.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----

dashboard/app.py

@@ -16,7 +16,7 @@ import warnings
 import traceback
 from src.allometry import calculate_biomass
 from dashboard.plots import check_complex, create_growth_increment_plots, create_all_plots
-from dashboard.tables import create_survival_table, create_biomass_table
+from dashboard.tables import create_survival_table, create_biomass_table, create_project_results_table
 import yaml
 import tempfile
 
@@ -65,12 +65,9 @@ def run_model_from_config(config):
     plots = create_all_plots(results, species_results, config)
     summary = create_summary(results, species_results, config, model)
     survival_table = create_survival_table(model)
-    # Format tables
-    results_fmt = results.copy()
+    # Use modularized table formatting
+    results_fmt = create_project_results_table(results)
     species_results_fmt = species_results.copy()
-    for col in results_fmt.columns:
-        if results_fmt[col].dtype in [float, int]:
-            results_fmt[col] = results_fmt[col].apply(lambda x: f"{x:,.2f}" if isinstance(x, float) else f"{x:,}")
     for col in species_results_fmt.columns:
         if species_results_fmt[col].dtype in [float, int]:
             species_results_fmt[col] = species_results_fmt[col].apply(lambda x: f"{x:,.2f}" if isinstance(x, float) else f"{x:,}")
@@ -84,12 +81,9 @@ def run_model(config_path):
     plots = create_all_plots(results, species_results, config)
     summary = create_summary(results, species_results, config, model)
     survival_table = create_survival_table(model)
-    # Format tables
-    results_fmt = results.copy()
+    # Use modularized table formatting
+    results_fmt = create_project_results_table(results)
     species_results_fmt = species_results.copy()
-    for col in results_fmt.columns:
-        if results_fmt[col].dtype in [float, int]:
-            results_fmt[col] = results_fmt[col].apply(lambda x: f"{x:,.2f}" if isinstance(x, float) else f"{x:,}")
     for col in species_results_fmt.columns:
         if species_results_fmt[col].dtype in [float, int]:
             species_results_fmt[col] = species_results_fmt[col].apply(lambda x: f"{x:,.2f}" if isinstance(x, float) else f"{x:,}")
@@ -98,32 +92,32 @@ def run_model(config_path):
 def create_summary(results, species_results, config, model):
     total_area = sum(config["project"]["planting_schedule"].values())
     final_gross = results["gross_carbon"].iloc[-1]
-    final_net = results["net_carbon"].iloc[-1]
+    final_buffer = results["buffer_carbon"].iloc[-1]
     # Sum soil carbon over all years
     total_soil_carbon = results["soil_carbon"].sum()
     final_gross_soil = final_gross + total_soil_carbon
-    final_net_soil = final_net + total_soil_carbon
+    final_buffer_soil = final_buffer + total_soil_carbon
     years = len(results)
     gross_carbon_per_ha = final_gross / total_area if total_area > 0 else 0
-    net_carbon_per_ha = final_net / total_area if total_area > 0 else 0
+    buffer_carbon_per_ha = final_buffer / total_area if total_area > 0 else 0
     gross_carbon_per_ha_soil = final_gross_soil / total_area if total_area > 0 else 0
-    net_carbon_per_ha_soil = final_net_soil / total_area if total_area > 0 else 0
-    annual_net_per_ha = net_carbon_per_ha / years if years > 0 else 0
-    annual_net_per_ha_soil = net_carbon_per_ha_soil / years if years > 0 else 0
+    buffer_carbon_per_ha_soil = final_buffer_soil / total_area if total_area > 0 else 0
+    annual_buffer_per_ha = buffer_carbon_per_ha / years if years > 0 else 0
+    annual_buffer_per_ha_soil = buffer_carbon_per_ha_soil / years if years > 0 else 0
     soil_carbon_val = config["carbon"].get("soil_carbon_per_ha_per_year", 0)
     # Milestone years
     def get_val(col, idx):
         return results[col].iloc[idx] if len(results) > idx else 0
     year_5_gross = get_val("gross_carbon", 4)
-    year_5_net = get_val("net_carbon", 4)
+    year_5_buffer = get_val("buffer_carbon", 4)
     year_10_gross = get_val("gross_carbon", 9)
-    year_10_net = get_val("net_carbon", 9)
+    year_10_buffer = get_val("buffer_carbon", 9)
     year_20_gross = get_val("gross_carbon", 19)
-    year_20_net = get_val("net_carbon", 19)
+    year_20_buffer = get_val("buffer_carbon", 19)
     avg_annual_gross = final_gross / years if years > 0 else 0
-    avg_annual_net = final_net / years if years > 0 else 0
+    avg_annual_buffer = final_buffer / years if years > 0 else 0
     avg_annual_gross_soil = final_gross_soil / years if years > 0 else 0
-    avg_annual_net_soil = final_net_soil / years if years > 0 else 0
+    avg_annual_buffer_soil = final_buffer_soil / years if years > 0 else 0
     # Surviving trees at milestones
     milestones = [5, 10, 20, 30]
     survival_lines = []
@@ -141,14 +135,14 @@ def create_summary(results, species_results, config, model):
     summary = (
         f"Project Overview:\n----------------\nDuration: {years} years\nTotal Area Planted: {total_area:,.0f} ha\nBuffer Pool: {config['carbon']['buffer_percentage']}%\n\n"
         f"Soil Carbon:\n-----------\nSoil carbon added: {soil_carbon_val} tCO2/ha/year\nTotal soil carbon added over project: {total_soil_carbon:,.0f} tCO2\n\n"
-        f"Carbon Sequestration (Biomass Only):\n-------------------\nTotal Gross Carbon (Year {years}): {final_gross:,.0f} tCO2\nTotal Net Carbon (Year {years}): {final_net:,.0f} tCO2\nAverage Annual Gross: {avg_annual_gross:,.0f} tCO2/yr\nAverage Annual Net: {avg_annual_net:,.0f} tCO2/yr\n\n"
-        f"Carbon Sequestration (With Soil Carbon):\n-------------------\nTotal Gross Carbon (Year {years}): {final_gross_soil:,.0f} tCO2\nTotal Net Carbon (Year {years}): {final_net_soil:,.0f} tCO2\nAverage Annual Gross: {avg_annual_gross_soil:,.0f} tCO2/yr\nAverage Annual Net: {avg_annual_net_soil:,.0f} tCO2/yr\n\n"
-        f"Milestone Years (Biomass Only):\n--------------\nYear 5 Gross: {year_5_gross:,.0f} tCO2\nYear 5 Net: {year_5_net:,.0f} tCO2\nYear 10 Gross: {year_10_gross:,.0f} tCO2\nYear 10 Net: {year_10_net:,.0f} tCO2\nYear 20 Gross: {year_20_gross:,.0f} tCO2\nYear 20 Net: {year_20_net:,.0f} tCO2\n\n"
+        f"Carbon Sequestration (Biomass Only):\n-------------------\nTotal Gross Carbon (Year {years}): {final_gross:,.0f} tCO2\nTotal Buffer Carbon (Year {years}): {final_buffer:,.0f} tCO2\nAverage Annual Gross: {avg_annual_gross:,.0f} tCO2/yr\nAverage Annual Buffer: {avg_annual_buffer:,.0f} tCO2/yr\n\n"
+        f"Carbon Sequestration (With Soil Carbon):\n-------------------\nTotal Gross Carbon (Year {years}): {final_gross_soil:,.0f} tCO2\nTotal Buffer Carbon (Year {years}): {final_buffer_soil:,.0f} tCO2\nAverage Annual Gross: {avg_annual_gross_soil:,.0f} tCO2/yr\nAverage Annual Buffer: {avg_annual_buffer_soil:,.0f} tCO2/yr\n\n"
+        f"Milestone Years (Biomass Only):\n--------------\nYear 5 Gross: {year_5_gross:,.0f} tCO2\nYear 5 Buffer: {year_5_buffer:,.0f} tCO2\nYear 10 Gross: {year_10_gross:,.0f} tCO2\nYear 10 Buffer: {year_10_buffer:,.0f} tCO2\nYear 20 Gross: {year_20_gross:,.0f} tCO2\nYear 20 Buffer: {year_20_buffer:,.0f} tCO2\n\n"
         "Surviving Trees (Milestones):\n----------------------------\n"
         + "\n".join(survival_lines)
         + "\n\nPer Hectare Surviving Trees (Final Year):\n----------------------------------------\n"
         + "\n".join(per_ha_lines)
-        + f"\n\nPer Hectare Metrics (Year {years}):\n-----------------------------\nGross Carbon per ha (biomass only): {gross_carbon_per_ha:,.0f} tCO2/ha\nNet Carbon per ha (biomass only): {net_carbon_per_ha:,.0f} tCO2/ha\nGross Carbon per ha (with soil): {gross_carbon_per_ha_soil:,.0f} tCO2/ha\nNet Carbon per ha (with soil): {net_carbon_per_ha_soil:,.0f} tCO2/ha\nAverage Annual Net per ha (biomass only): {annual_net_per_ha:,.2f} tCO2/ha/yr\nAverage Annual Net per ha (with soil): {annual_net_per_ha_soil:,.2f} tCO2/ha/yr\n"
+        + f"\n\nPer Hectare Metrics (Year {years}):\n-----------------------------\nGross Carbon per ha (biomass only): {gross_carbon_per_ha:,.0f} tCO2/ha\nBuffer Carbon per ha (biomass only): {buffer_carbon_per_ha:,.0f} tCO2/ha\nGross Carbon per ha (with soil): {gross_carbon_per_ha_soil:,.0f} tCO2/ha\nBuffer Carbon per ha (with soil): {buffer_carbon_per_ha_soil:,.0f} tCO2/ha\nAverage Annual Buffer per ha (biomass only): {annual_buffer_per_ha:,.2f} tCO2/ha/yr\nAverage Annual Buffer per ha (with soil): {annual_buffer_per_ha_soil:,.2f} tCO2/ha/yr\n"
     )
     return summary
 
@@ -157,6 +151,7 @@ def hex_to_rgba(hex_color, alpha):
     r, g, b = tuple(int(hex_color[i:i+2], 16) for i in (0, 2, 4))
     return f'rgba({r},{g},{b},{alpha})'
 
+# Gradio UI code starts here
 with gr.Blocks() as demo:
     gr.Markdown("# Mangrove ER Model Dashboard\nDeclining Increment Model Only")
     with gr.Tabs():
@@ -168,25 +163,33 @@ with gr.Blocks() as demo:
             else:
                 gr.Markdown("**Mode:** Discrete declining increment growth (sum of annual increments)")
             gr.Markdown("## Planting Schedule (ha per year)")
-            year_1 = gr.Number(value=2500, label="Year 1 Area (ha)")
-            year_2 = gr.Number(value=2500, label="Year 2 Area (ha)")
-            year_3 = gr.Number(value=0, label="Year 3 Area (ha)")
-            year_4 = gr.Number(value=0, label="Year 4 Area (ha)")
-            year_5 = gr.Number(value=0, label="Year 5 Area (ha)")
+            year_1 = gr.Number(value=2500, label="Year 1 Area (ha)", info="Enter the area to be planted in year 1 (ha)")
+            year_2 = gr.Number(value=2500, label="Year 2 Area (ha)", info="Enter the area to be planted in year 2 (ha)")
+            year_3 = gr.Number(value=0, label="Year 3 Area (ha)", info="Enter the area to be planted in year 3 (ha)")
+            year_4 = gr.Number(value=0, label="Year 4 Area (ha)", info="Enter the area to be planted in year 4 (ha)")
+            year_5 = gr.Number(value=0, label="Year 5 Area (ha)", info="Enter the area to be planted in year 5 (ha)")
             update_btn = gr.Button("Update Results", variant="primary")
             with gr.Row():
                 carbon_plot = gr.Plot()
                 biomass_plot = gr.Plot()
                 annual_plot = gr.Plot()
-            # Add new growth/increment curves plot
             growth_plot = gr.Plot(label="Growth & Increment Curves (DBH/Height)")
             summary_box = gr.Textbox(label="Summary", lines=12)
-            results_box = gr.Dataframe(label="Project Results (Annual)")
-            species_box = gr.Dataframe(label="Species Results (Annual)")
-            survival_box = gr.Dataframe(label="Surviving Trees Table")
-            # Replace size_table with biomass debug table
-            biomass_debug_table = gr.Dataframe(label="Biomass Table (inputs & outputs per year)")
-
+            key_metrics = gr.Markdown("""\
+**Key Metrics**
+- Total Area Planted: ... ha\n- Total Buffer Carbon (final year): ... tCO2\n- Average Annual Buffer Carbon: ... tCO2/yr\n- Buffer Pool: ... %
+""")
+            # --- Tabbed tables section ---
+            with gr.Tabs():
+                with gr.Tab("Project Results (Annual)"):
+                    results_box = gr.Dataframe(label="Project Results (Annual)")
+                with gr.Tab("Species Results (Annual)"):
+                    species_box = gr.Dataframe(label="Species Results (Annual)")
+                with gr.Tab("Surviving Trees Table"):
+                    survival_box = gr.Dataframe(label="Surviving Trees Table")
+                with gr.Tab("Biomass Table"):
+                    biomass_debug_table = gr.Dataframe(label="Biomass Table (inputs & outputs per year)")
+            # --- End tabbed tables ---
             def update_declining_increment(y1, y2, y3, y4, y5):
                 config = update_planting_schedule(MODEL_CONFIGS["Declining Increment"], [y1, y2, y3, y4, y5])
                 with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as tmp:
@@ -199,24 +202,25 @@ with gr.Blocks() as demo:
                 survival_table = create_survival_table(model)
                 growth_fig = create_growth_increment_plots(config, model_type="declining_increment")
                 biomass_debug_df = create_biomass_table(config)
-                results_fmt = results.copy()
+                results_fmt = create_project_results_table(results)
                 species_results_fmt = species_results.copy()
-                for col in results_fmt.columns:
-                    if results_fmt[col].dtype in [float, int]:
-                        results_fmt[col] = results_fmt[col].apply(lambda x: f"{x:,.2f}" if isinstance(x, float) else f"{x:,}")
                 for col in species_results_fmt.columns:
                     if species_results_fmt[col].dtype in [float, int]:
                         species_results_fmt[col] = species_results_fmt[col].apply(lambda x: f"{x:,.2f}" if isinstance(x, float) else f"{x:,}")
-                return plots[0], plots[1], plots[2], growth_fig, summary, results_fmt, species_results_fmt, survival_table, biomass_debug_df
-
+                # Key metrics for summary card
+                total_area = sum(config["project"]["planting_schedule"].values())
+                final_buffer = results["buffer_carbon"].iloc[-1]
+                avg_annual_buffer = final_buffer / len(results) if len(results) > 0 else 0
+                buffer_pool = config["carbon"]["buffer_percentage"]
+                key_metrics_md = f"""**Key Metrics**\n- Total Area Planted: {total_area:,.0f} ha\n- Total Buffer Carbon (final year): {final_buffer:,.0f} tCO2\n- Average Annual Buffer Carbon: {avg_annual_buffer:,.0f} tCO2/yr\n- Buffer Pool: {buffer_pool}%"""
+                return (plots[0], plots[1], plots[2], growth_fig, summary, results_fmt, species_results_fmt, survival_table, biomass_debug_df, key_metrics_md)
             update_btn.click(
                 update_declining_increment,
                 inputs=[year_1, year_2, year_3, year_4, year_5],
-                outputs=[carbon_plot, biomass_plot, annual_plot, growth_plot, summary_box, results_box, species_box, survival_box, biomass_debug_table]
+                outputs=[carbon_plot, biomass_plot, annual_plot, growth_plot, summary_box, results_box, species_box, survival_box, biomass_debug_table, key_metrics]
             )
-
             # Show initial results
-            c, b, a, g, summary, r, s, surv, biomass_debug_df = update_declining_increment(2500, 2500, 0, 0, 0)
+            c, b, a, g, summary, r, s, surv, biomass_debug_df, key_metrics_md = update_declining_increment(2500, 2500, 0, 0, 0)
             carbon_plot.value = c
             biomass_plot.value = b
             annual_plot.value = a
@@ -226,4 +230,5 @@ with gr.Blocks() as demo:
             species_box.value = s
             survival_box.value = surv
             biomass_debug_table.value = biomass_debug_df
+            key_metrics.value = key_metrics_md
     demo.launch(share=True) 

dashboard/plots/__init__.py

@@ -81,29 +81,29 @@ def create_growth_increment_plots(config, model_type=None):
 
 def create_all_plots(results, species_results, config):
     # Diagnostic: Check for complex numbers in results DataFrame columns used for plotting
-    for col in ["gross_carbon", "net_carbon"]:
+    for col in ["gross_carbon", "buffer_carbon"]:
         arr = np.array(results[col])
         check_complex(arr, f"results['{col}']")
-    # 1. Carbon curve (gross and net, with and without soil)
+    # 1. Carbon curve (gross and buffer, with and without soil)
     fig1 = go.Figure()
     fig1.add_trace(go.Scatter(x=results["year"], y=results["gross_carbon"], mode="lines+markers", name="Gross Carbon", line=dict(width=2, color="blue")))
-    fig1.add_trace(go.Scatter(x=results["year"], y=results["net_carbon"], mode="lines+markers", name="Net Carbon", line=dict(width=2, color="red")))
+    fig1.add_trace(go.Scatter(x=results["year"], y=results["buffer_carbon"], mode="lines+markers", name="Buffer Carbon", line=dict(width=2, color="red")))
     if "gross_carbon_with_soil" in results.columns:
         # For backward compatibility, but we now sum soil carbon in summary, so recalc here for plot
         soil_cumsum = results["soil_carbon"].cumsum()
         gross_with_soil = results["gross_carbon"] + soil_cumsum
-        net_with_soil = results["net_carbon"] + soil_cumsum
+        buffer_with_soil = results["buffer_carbon"] + soil_cumsum
         fig1.add_trace(go.Scatter(x=results["year"], y=gross_with_soil, mode="lines+markers", name="Gross Carbon (with Soil)", line=dict(width=2, dash="dot", color="green")))
-        fig1.add_trace(go.Scatter(x=results["year"], y=net_with_soil, mode="lines+markers", name="Net Carbon (with Soil)", line=dict(width=2, dash="dot", color="orange")))
+        fig1.add_trace(go.Scatter(x=results["year"], y=buffer_with_soil, mode="lines+markers", name="Buffer Carbon (with Soil)", line=dict(width=2, dash="dot", color="#43c6ac")))
     fig1.update_layout(title="Carbon Sequestration Over Time", xaxis_title="Year", yaxis_title="Carbon (tCO2)", hovermode="x unified", template="plotly_white")
 
-    # 2. Annual carbon (ERs)
-    annual_ers = results["net_carbon"].diff().fillna(results["net_carbon"].iloc[0])
+    # 2. Annual buffer carbon (ERs)
+    annual_ers = results["buffer_carbon"].diff().fillna(results["buffer_carbon"].iloc[0])
     arr = np.array(annual_ers)
     check_complex(arr, "annual_ers")
     fig2 = go.Figure()
-    fig2.add_trace(go.Bar(x=results["year"], y=annual_ers, name="Annual ERs", marker_color="#2ecc71", opacity=0.7))
-    fig2.update_layout(title="Annual Emission Reductions", xaxis_title="Year", yaxis_title="Annual ERs (tCO2)", hovermode="x unified", template="plotly_white")
+    fig2.add_trace(go.Bar(x=results["year"], y=annual_ers, name="Annual Buffer ERs", marker_color="#2ecc71", opacity=0.7))
+    fig2.update_layout(title="Annual Emission Reductions (Buffer)", xaxis_title="Year", yaxis_title="Annual Buffer ERs (tCO2)", hovermode="x unified", template="plotly_white")
 
     # 3. Biomass per tree for all species (refactored to use model.species_metrics)
     years = results["year"]

dashboard/tables/__init__.py

@@ -66,4 +66,14 @@ def create_survival_table(model):
     for col in surv.columns:
         surv[col] = surv[col].apply(lambda x: f"{x:,.0f}")
     surv = surv.reset_index()
-    return surv 
+    return surv
+
+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()
+    # Optionally format numbers for display
+    for col in df.columns:
+        if df[col].dtype in [float, int]:
+            df[col] = df[col].apply(lambda x: f"{x:,.2f}" if isinstance(x, float) else f"{x:,}")
+    return df 

requirements.txt

@@ -0,0 +1,5 @@
+gradio>=3.41.2
+pandas>=1.5.3
+numpy>=1.23.0
+plotly>=5.0.0
+pyyaml

src/er_model.py

@@ -314,21 +314,21 @@ class ERModel:
             species_year_results["Cumulative ha"] = cumulative_area
             species_year_results["tCO2/ha"] = total_carbon / cumulative_area if cumulative_area > 0 else 0
             gross_carbon = total_carbon
-            net_carbon = gross_carbon * (1 - self.carbon.buffer_percentage / 100)
-            net_carbon -= self.carbon.leakage_percentage / 100 * gross_carbon
-            net_carbon -= self.carbon.baseline_emissions * cumulative_area
-            # Add soil carbon if present
+            buffer_carbon = gross_carbon * (1 - self.carbon.buffer_percentage / 100)
+            buffer_carbon -= self.carbon.leakage_percentage / 100 * gross_carbon
+            buffer_carbon -= self.carbon.baseline_emissions * cumulative_area
+            # Cumulative soil carbon: add 1 t/ha for every hectare ever planted, each year
             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
-            net_carbon_with_soil = net_carbon + soil_carbon
+            buffer_carbon_with_soil = buffer_carbon + soil_carbon
             year_results.update({
                 "gross_carbon": gross_carbon,
-                "net_carbon": net_carbon,
+                "buffer_carbon": buffer_carbon,
                 "cumulative_area": cumulative_area,
                 "gross_carbon_with_soil": gross_carbon_with_soil,
-                "net_carbon_with_soil": net_carbon_with_soil,
+                "buffer_carbon_with_soil": buffer_carbon_with_soil,
                 "soil_carbon": soil_carbon
             })
             results.append(year_results)