Update dashboard with improved metrics and parameter handling - Fixed per hectare calculations, added milestone comparisons, improved summary stats, updated README

README.md

@@ -4,66 +4,57 @@ A Python implementation of the Emissions Reduction (ER) model for Nigeria mangro
 
 ## Recent Updates and Improvements
 
-### Growth Model Enhancements (2024)
-- **Updated Allometric Equations**: Implemented Zanvo et al. (2023) species-specific equations:
+### Growth Model Enhancements (August 2024)
+- **Updated Growth Parameters**: Back-solved from August 2024 field data (t=1.58 years):
+  - DBH growth rate (b): Changed from 0.1237 to 0.4736 yr⁻¹
+  - Height growth rate (b): Changed from 0.1237 to 0.1335 yr⁻¹
+  - Height shape parameter (c): Changed from 2.1 to 1.5
+  - Rhizophora height asymptote: Changed from 12.0m to 11.58m
+
+- **Allometric Equations**: Using Zanvo et al. (2023) species-specific equations:
   - Rhizophora: Total = 1.938 × (DBH² H)^0.67628
   - Avicennia: Total = 1.486 × (DBH² H)^0.55864
 
-- **Chapman-Richards Implementation**:
-  - Improved growth parameter estimation
-  - Direct use of growth rate parameter (b) instead of deriving from Tm
-  - Separate parameterization for DBH and height growth
-  - Current parameters:
-    * Rhizophora: max DBH 11.07cm, max height 12.0m
-    * Avicennia: max DBH 17.0cm, max height 8.8m
-
-- **Growth Rate Parameters**:
-  - b = 0.25 yr^-1 (independently estimated growth rate)
-  - c = 2.1 (shape parameter)
-  - Removed Tm-based calculation (previously b = ln(c)/Tm)
-
 ### Dashboard Improvements
-- Added height growth visualization
-- Improved number formatting with comma separators
-- Enhanced scenario comparison features
-- Added biomass per tree tracking
-- Updated parameter input ranges
-
-### Configuration Updates
-- Restructured parameter files for clarity
-- Added detailed parameter documentation
-- Improved error handling for invalid inputs
-- Added support for scenario analysis
-
-## Features
-
-- Species-specific growth modeling using Chapman-Richards equations
-- Biomass estimation using allometric equations
-- Carbon conversion and emissions reduction calculations
-- Interactive dashboard for parameter exploration using Gradio
-- Configurable planting schedules and mortality rates
-- Scenario comparison for different DBH ranges and growth rates
-- Per-species carbon tracking and cumulative hectare calculations
+- **Enhanced Parameter Controls**:
+  - Direct input of Chapman-Richards parameters
+  - Separate growth parameters for DBH and height
+  - Real-time model updates
+  - Improved validation and error handling
+
+- **Improved Visualizations**:
+  - Carbon sequestration over time
+  - Annual emission reductions
+  - Per-tree biomass growth curves
+  - Enhanced data tables and summaries
+
+- **Detailed Metrics**:
+  - Project overview with total area and buffer pool
+  - Comprehensive carbon sequestration metrics
+  - Milestone year comparisons (10, 20, 30 years)
+  - Per hectare metrics with annual rates
+  - Species-specific results
 
 ## Model Parameters
 
 ### Species Parameters
-- **Rhizophora**
-  - Initial values: DBH = 1.0cm, Height = 0.5m
-  - Chapman-Richards parameters: a = 11.07cm, b = 0.35, c = 2.1
+- **Rhizophora spp.**
+  - DBH: a = 11.07 cm, b = 0.4736 yr⁻¹, c = 2.1
+  - Height: a = 11.58 m, b = 0.1335 yr⁻¹, c = 1.5
+  - Initial values: DBH = 1.0 cm, Height = 0.5 m
   - Configurable planting density and mortality rates
 
-- **Avicennia**
-  - Initial values: DBH = 1.0cm, Height = 0.5m
-  - Chapman-Richards parameters: a = 17.0cm, b = 0.35, c = 2.1
+- **Avicennia germinans**
+  - DBH: a = 11.07 cm, b = 0.4736 yr⁻¹, c = 2.1
+  - Height: a = 11.58 m, b = 0.1335 yr⁻¹, c = 1.5
+  - Initial values: DBH = 1.0 cm, Height = 0.5 m
   - Configurable planting density and mortality rates
 
-### Carbon Parameters
-- Biomass to carbon conversion factor
-- Carbon to CO2 conversion factor
-- Buffer pool percentage
-- Leakage percentage
-- Baseline emissions rate
+### Project Configuration
+- Total area: 5000 ha (2500 ha each in years 1-2)
+- Project duration: 30 years
+- Buffer pool: 20%
+- Species mix: Rhizophora spp. and Avicennia germinans
 
 ## Installation
 
@@ -80,74 +71,54 @@ A Python implementation of the Emissions Reduction (ER) model for Nigeria mangro
    pre-commit install
    ```
 
-## Project Structure
-
-- `src/` - Core model implementation
-  - `er_model.py` - Main ER calculation logic
-  - `allometry.py` - Species-specific allometric equations
-  - `metrics.py` - Carbon conversion and statistics
-- `scripts/` - Command-line tools
-  - `run_pipeline.py` - Execute full ER calculation workflow
-  - `analyze_results.py` - Generate reports and visualizations
-- `dashboard/` - Gradio web application for interactive exploration
-- `configs/` - Default parameter files
-- `outputs/` - Generated results and figures
-- `tests/` - Test suite
-
-## Dashboard Features
-
-The interactive Gradio dashboard allows users to:
-1. Adjust species-specific parameters:
-   - Planting density (trees/ha)
-   - Year-by-year mortality rates
-2. Configure planting schedule:
-   - Area planted per year (ha)
-   - Up to 5-year planting schedule
-3. Modify carbon parameters:
-   - Buffer pool percentage
-4. Explore scenarios:
-   - Test different DBH ranges
-   - Adjust growth rate factors
-   - Compare results across 1000 ha scenarios
-5. View results:
-   - Carbon sequestration over time
-   - Milestone year comparisons
-   - Per-species carbon tracking
-   - Cumulative hectare metrics
-   - Scenario comparison tables
-
 ## Usage
 
 1. Configure parameters in `configs/params.yaml`
 
-2. Run the full pipeline:
-   ```bash
-   python scripts/run_pipeline.py --config configs/params.yaml
-   ```
-
-3. Launch the dashboard:
+2. Launch the dashboard:
    ```bash
-   python dashboard/app.py
+   python -m dashboard.app
    ```
    This will start a Gradio server and open the dashboard in your default web browser.
+   The dashboard will be accessible via a public URL for sharing.
+
+3. Using the Dashboard:
+   - Adjust species parameters (density, mortality, growth)
+   - Set planting schedule (up to 5 years)
+   - Configure buffer pool percentage
+   - View real-time updates to:
+     * Carbon sequestration curves
+     * Annual emission reductions
+     * Biomass per tree growth
+     * Detailed metrics and summaries
 
-## Development
+## Project Structure
 
-- Code style is enforced using `black` and `isort`
-- Type hints are required for all public functions
-- Tests are written using `pytest`
-- Pre-commit hooks ensure code quality
+- `src/` - Core model implementation
+  - `er_model.py` - Main ER calculation logic
+  - `allometry.py` - Species-specific allometric equations
+  - `metrics.py` - Carbon conversion and statistics
+- `dashboard/` - Gradio web application
+- `configs/` - Parameter configuration files
+- `tests/` - Test suite
 
 ## Dependencies
 
 Key dependencies (specified in `environment.yml`):
-- numpy=1.24.3
-- pandas=2.0.3
-- gradio (latest version)
+- numpy
+- pandas
+- gradio
 - matplotlib
 - pyyaml
 - pytest (for development)
 
+## Development
+
+- Code style is enforced using `black` and `isort`
+- Type hints are required for all public functions
+- Tests are written using `pytest`
+- Pre-commit hooks ensure code quality
+
 ## License
 
 [License details to be added] 

dashboard/app.py

@@ -9,6 +9,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 import yaml
+import uuid
 
 from src.er_model import ERModel
 
@@ -21,17 +22,23 @@ def load_config(config_path: Path = Path("configs/params.yaml")) -> dict:
 
 def run_model(config: dict) -> Tuple[pd.DataFrame, pd.DataFrame, pd.DataFrame]:
     """Run model with current parameters."""
-    # Save temporary config
-    temp_config = Path("configs/temp_config.yaml")
-    with open(temp_config, "w") as f:
-        yaml.dump(config, f)
+    # Create a temporary config file with a unique name
+    temp_config = Path(f"configs/temp_config_{uuid.uuid4()}.yaml")
     
-    # Run model and cleanup
-    model = ERModel(temp_config)
-    results, species_results, scenario_results = model.run()
-    temp_config.unlink()
-    
-    return results, species_results, scenario_results
+    try:
+        # Save temporary config
+        with open(temp_config, "w") as f:
+            yaml.dump(config, f)
+        
+        # Run model
+        model = ERModel(temp_config)
+        results, species_results, scenario_results = model.run()
+        
+        return results, species_results, scenario_results
+    finally:
+        # Clean up temp file
+        if temp_config.exists():
+            temp_config.unlink()
 
 
 def format_number(x):
@@ -48,7 +55,13 @@ def format_number(x):
 def create_plots_and_tables(
     results: pd.DataFrame,
     species_results: pd.DataFrame,
-    scenario_results: pd.DataFrame
+    scenario_results: pd.DataFrame,
+    config: dict,
+    year_1_area: float,
+    year_2_area: float,
+    year_3_area: float,
+    year_4_area: float,
+    year_5_area: float
 ) -> Tuple[plt.Figure, plt.Figure, plt.Figure, str, pd.DataFrame, pd.DataFrame]:
     """Create carbon sequestration plots, summary, and tables."""
     # Clear any existing plots
@@ -96,11 +109,6 @@ def create_plots_and_tables(
     fig3 = plt.figure(figsize=(10, 6))
     ax3 = fig3.add_subplot(111)
     
-    # Load config to get growth parameters
-    config = load_config()
-    rhiz_params = config["species"][0]["chapman_richards"]
-    avic_params = config["species"][1]["chapman_richards"]
-    
     # Get initial values
     rhiz_init = config["species"][0]["initial_values"]
     avic_init = config["species"][1]["initial_values"]
@@ -114,12 +122,12 @@ def create_plots_and_tables(
         return initial + (a - initial) * (1 - np.exp(-b * t)) ** c
     
     # Calculate growth for Rhizophora
-    rhiz_dbh = chapman_richards(years, rhiz_params["dbh"], rhiz_init["dbh"])
-    rhiz_height = chapman_richards(years, rhiz_params["height"], rhiz_init["height"])
+    rhiz_dbh = chapman_richards(years, config["species"][0]["chapman_richards"]["dbh"], rhiz_init["dbh"])
+    rhiz_height = chapman_richards(years, config["species"][0]["chapman_richards"]["height"], rhiz_init["height"])
     
     # Calculate growth for Avicennia
-    avic_dbh = chapman_richards(years, avic_params["dbh"], avic_init["dbh"])
-    avic_height = chapman_richards(years, avic_params["height"], avic_init["height"])
+    avic_dbh = chapman_richards(years, config["species"][1]["chapman_richards"]["dbh"], avic_init["dbh"])
+    avic_height = chapman_richards(years, config["species"][1]["chapman_richards"]["height"], avic_init["height"])
     
     # Calculate biomass using Zanvo equations (convert kg to tonnes)
     rhiz_biomass = 1.938 * (rhiz_dbh**2 * rhiz_height)**0.67628 / 1000  # Convert kg to tonnes
@@ -147,7 +155,9 @@ def create_plots_and_tables(
     plt.draw()
 
     # Calculate total area from planting schedule
-    total_area = sum(float(v) for k, v in results.iloc[-1].items() if k.startswith("area_year"))
+    total_area = sum([
+        year_1_area, year_2_area, year_3_area, year_4_area, year_5_area
+    ])
     
     # Get final year carbon values
     final_gross = results["gross_carbon"].iloc[-1]
@@ -157,23 +167,54 @@ def create_plots_and_tables(
     if total_area > 0:
         gross_carbon_per_ha = final_gross / total_area
         net_carbon_per_ha = final_net / total_area
+        annual_net_per_ha = net_carbon_per_ha / len(results)  # Divide by actual years
     else:
         gross_carbon_per_ha = 0
         net_carbon_per_ha = 0
+        annual_net_per_ha = 0
+    
+    # Get year 10 and year 20 values for intermediate metrics
+    year_10_gross = results["gross_carbon"].iloc[9] if len(results) > 9 else 0
+    year_10_net = results["net_carbon"].iloc[9] if len(results) > 9 else 0
+    year_20_gross = results["gross_carbon"].iloc[19] if len(results) > 19 else 0
+    year_20_net = results["net_carbon"].iloc[19] if len(results) > 19 else 0
+    
+    # Calculate annual averages
+    years_with_carbon = len(results[results["gross_carbon"] > 0])
+    if years_with_carbon > 0:
+        avg_annual_gross = final_gross / years_with_carbon
+        avg_annual_net = final_net / years_with_carbon
+    else:
+        avg_annual_gross = 0
+        avg_annual_net = 0
     
     # Create summary text with formatted numbers
     summary = f"""
-Results Summary:
----------------
-Total Years: {len(results)}
+Project Overview:
+----------------
+Duration: {len(results)} years
 Total Area Planted: {format_number(total_area)} ha
-Total Gross Carbon: {format_number(final_gross)} tCO2
-Total Net Carbon: {format_number(final_net)} tCO2
+Buffer Pool: {config["carbon"]["buffer_percentage"]}%
+
+Carbon Sequestration:
+-------------------
+Total Gross Carbon (Year 30): {format_number(final_gross)} tCO2
+Total Net Carbon (Year 30): {format_number(final_net)} tCO2
+Average Annual Gross: {format_number(avg_annual_gross)} tCO2/yr
+Average Annual Net: {format_number(avg_annual_net)} tCO2/yr
+
+Milestone Years:
+--------------
+Year 10 Gross: {format_number(year_10_gross)} tCO2
+Year 10 Net: {format_number(year_10_net)} tCO2
+Year 20 Gross: {format_number(year_20_gross)} tCO2
+Year 20 Net: {format_number(year_20_net)} tCO2
 
 Per Hectare Metrics (Year 30):
 -----------------------------
 Gross Carbon per ha: {format_number(gross_carbon_per_ha)} tCO2/ha
 Net Carbon per ha: {format_number(net_carbon_per_ha)} tCO2/ha
+Average Annual Net per ha: {format_number(annual_net_per_ha)} tCO2/ha/yr
 """
     
     # Format species results table with comma separators
@@ -223,12 +264,24 @@ def update_model(
     year_4_area: float,
     year_5_area: float,
     buffer_percentage: float,
-    scenario_area: float = 1000.0,
-    dbh_range_min: float = 1.0,
-    dbh_range_max: float = 25.0,
-    height_range_min: float = 0.5,
-    height_range_max: float = 15.0,
-    growth_rate_factor: float = 1.0,
+    # Chapman-Richards parameters for Rhizophora
+    rhiz_dbh_a: float,
+    rhiz_dbh_b: float,
+    rhiz_dbh_c: float,
+    rhiz_height_a: float,
+    rhiz_height_b: float,
+    rhiz_height_c: float,
+    rhiz_initial_dbh: float,
+    rhiz_initial_height: float,
+    # Chapman-Richards parameters for Avicennia
+    avic_dbh_a: float,
+    avic_dbh_b: float,
+    avic_dbh_c: float,
+    avic_height_a: float,
+    avic_height_b: float,
+    avic_height_c: float,
+    avic_initial_dbh: float,
+    avic_initial_height: float,
 ) -> Tuple[plt.Figure, plt.Figure, plt.Figure, str, pd.DataFrame, pd.DataFrame]:
     """Update model with new parameters and return plots and tables."""
     # Load base config
@@ -244,6 +297,22 @@ def update_model(
         "year_5": rhiz_mort_5
     })
     
+    # Update Rhizophora Chapman-Richards parameters
+    config["species"][0]["chapman_richards"]["dbh"].update({
+        "a": rhiz_dbh_a,
+        "b": rhiz_dbh_b,
+        "c": rhiz_dbh_c
+    })
+    config["species"][0]["chapman_richards"]["height"].update({
+        "a": rhiz_height_a,
+        "b": rhiz_height_b,
+        "c": rhiz_height_c
+    })
+    config["species"][0]["initial_values"].update({
+        "dbh": rhiz_initial_dbh,
+        "height": rhiz_initial_height
+    })
+    
     # Update Avicennia parameters
     config["species"][1]["planting_density"] = avic_density
     config["species"][1]["mortality_rates"].update({
@@ -254,6 +323,22 @@ def update_model(
         "year_5": avic_mort_5
     })
     
+    # Update Avicennia Chapman-Richards parameters
+    config["species"][1]["chapman_richards"]["dbh"].update({
+        "a": avic_dbh_a,
+        "b": avic_dbh_b,
+        "c": avic_dbh_c
+    })
+    config["species"][1]["chapman_richards"]["height"].update({
+        "a": avic_height_a,
+        "b": avic_height_b,
+        "c": avic_height_c
+    })
+    config["species"][1]["initial_values"].update({
+        "dbh": avic_initial_dbh,
+        "height": avic_initial_height
+    })
+    
     # Update planting schedule
     config["project"]["planting_schedule"].update({
         "year_1": year_1_area,
@@ -266,179 +351,109 @@ def update_model(
     # Update carbon parameters
     config["carbon"]["buffer_percentage"] = buffer_percentage
     
-    # Add scenario parameters
-    config["scenarios"] = {
-        "area": scenario_area,
-        "dbh_range": [dbh_range_min, dbh_range_max],
-        "height_range": [height_range_min, height_range_max],
-        "growth_rate_factor": growth_rate_factor
-    }
-    
     # Run model and create plots/tables
     results, species_results, scenario_results = run_model(config)
-    return create_plots_and_tables(results, species_results, scenario_results)
+    return create_plots_and_tables(results, species_results, scenario_results, config, year_1_area, year_2_area, year_3_area, year_4_area, year_5_area)
 
 
 def main():
-    """Launch the Gradio interface."""
-    config = load_config()
-    
-    # Extract default values
-    rhiz_defaults = config["species"][0]
-    avic_defaults = config["species"][1]
-    planting_defaults = config["project"]["planting_schedule"]
-    carbon_defaults = config["carbon"]
-    scenario_defaults = config.get("scenarios", {
-        "area": 1000.0,
-        "dbh_range": [1.0, 25.0],
-        "height_range": [0.5, 15.0],
-        "growth_rate_factor": 1.0
-    })
-    
-    # Create interface
-    with gr.Blocks(title="ER Model Dashboard", theme=gr.themes.Soft()) as interface:
+    """Run the Gradio interface."""
+    with gr.Blocks(theme=gr.themes.Soft()) as app:
         gr.Markdown("# ER Model Dashboard")
-        gr.Markdown("Explore carbon sequestration results and test different parameters")
+        gr.Markdown("Explore carbon sequestration results with different growth parameters")
         
-        with gr.Row():
-            with gr.Column():
-                # Rhizophora parameters
-                gr.Markdown("### Rhizophora Parameters")
-                rhiz_density = gr.Slider(
-                    minimum=100,
-                    maximum=10000,
-                    value=rhiz_defaults["planting_density"],
-                    label="Planting Density (trees/ha)"
-                )
-                rhiz_mort_1 = gr.Slider(0, 100, rhiz_defaults["mortality_rates"]["year_1"], label="Year 1 Mortality (%)")
-                rhiz_mort_2 = gr.Slider(0, 100, rhiz_defaults["mortality_rates"]["year_2"], label="Year 2 Mortality (%)")
-                rhiz_mort_3 = gr.Slider(0, 100, rhiz_defaults["mortality_rates"]["year_3"], label="Year 3 Mortality (%)")
-                rhiz_mort_4 = gr.Slider(0, 100, rhiz_defaults["mortality_rates"]["year_4"], label="Year 4 Mortality (%)")
-                rhiz_mort_5 = gr.Slider(0, 100, rhiz_defaults["mortality_rates"]["year_5"], label="Year 5 Mortality (%)")
-                
-            with gr.Column():
-                # Avicennia parameters
-                gr.Markdown("### Avicennia Parameters")
-                avic_density = gr.Slider(
-                    minimum=100,
-                    maximum=10000,
-                    value=avic_defaults["planting_density"],
-                    label="Planting Density (trees/ha)"
-                )
-                avic_mort_1 = gr.Slider(0, 100, avic_defaults["mortality_rates"]["year_1"], label="Year 1 Mortality (%)")
-                avic_mort_2 = gr.Slider(0, 100, avic_defaults["mortality_rates"]["year_2"], label="Year 2 Mortality (%)")
-                avic_mort_3 = gr.Slider(0, 100, avic_defaults["mortality_rates"]["year_3"], label="Year 3 Mortality (%)")
-                avic_mort_4 = gr.Slider(0, 100, avic_defaults["mortality_rates"]["year_4"], label="Year 4 Mortality (%)")
-                avic_mort_5 = gr.Slider(0, 100, avic_defaults["mortality_rates"]["year_5"], label="Year 5 Mortality (%)")
-        
-        with gr.Row():
-            with gr.Column():
-                # Planting schedule
-                gr.Markdown("### Planting Schedule")
-                year_1_area = gr.Slider(0, 1000, planting_defaults["year_1"], label="Year 1 Area (ha)")
-                year_2_area = gr.Slider(0, 1000, planting_defaults["year_2"], label="Year 2 Area (ha)")
-                year_3_area = gr.Slider(0, 1000, planting_defaults["year_3"], label="Year 3 Area (ha)")
-                year_4_area = gr.Slider(0, 1000, planting_defaults["year_4"], label="Year 4 Area (ha)")
-                year_5_area = gr.Slider(0, 1000, planting_defaults["year_5"], label="Year 5 Area (ha)")
-                
-            with gr.Column():
-                # Carbon parameters
-                gr.Markdown("### Carbon Parameters")
-                buffer_percentage = gr.Slider(
-                    minimum=0,
-                    maximum=30,
-                    value=carbon_defaults["buffer_percentage"],
-                    label="Buffer Percentage (%)"
-                )
-                
-                # Scenario parameters
-                gr.Markdown("### Scenario Parameters")
-                scenario_area = gr.Slider(
-                    minimum=100,
-                    maximum=2000,
-                    value=scenario_defaults["area"],
-                    label="Scenario Area (ha)"
-                )
-                dbh_range_min = gr.Slider(
-                    minimum=0.5,
-                    maximum=10,
-                    value=scenario_defaults["dbh_range"][0],
-                    label="Min DBH (cm)"
-                )
-                dbh_range_max = gr.Slider(
-                    minimum=10,
-                    maximum=30,
-                    value=scenario_defaults["dbh_range"][1],
-                    label="Max DBH (cm)"
-                )
-                height_range_min = gr.Slider(
-                    minimum=0.5,
-                    maximum=5,
-                    value=scenario_defaults["height_range"][0],
-                    label="Min Height (m)"
-                )
-                height_range_max = gr.Slider(
-                    minimum=5,
-                    maximum=20,
-                    value=scenario_defaults["height_range"][1],
-                    label="Max Height (m)"
-                )
-                growth_rate_factor = gr.Slider(
-                    minimum=0.5,
-                    maximum=2.0,
-                    value=scenario_defaults["growth_rate_factor"],
-                    label="Growth Rate Factor"
-                )
-        
-        # Outputs
-        with gr.Row():
-            plot1 = gr.Plot(label="Carbon Sequestration Over Time")
-            plot2 = gr.Plot(label="Annual Emission Reductions")
+        with gr.Tab("Model Parameters"):
+            with gr.Row():
+                with gr.Column():
+                    gr.Markdown("### Rhizophora Parameters")
+                    rhiz_density = gr.Number(value=2500, label="Planting Density (trees/ha)")
+                    rhiz_mort_1 = gr.Number(value=20, label="Year 1 Mortality (%)")
+                    rhiz_mort_2 = gr.Number(value=10, label="Year 2 Mortality (%)")
+                    rhiz_mort_3 = gr.Number(value=5, label="Year 3 Mortality (%)")
+                    rhiz_mort_4 = gr.Number(value=2, label="Year 4 Mortality (%)")
+                    rhiz_mort_5 = gr.Number(value=1, label="Year 5 Mortality (%)")
+                    
+                    gr.Markdown("### Rhizophora Growth Parameters")
+                    rhiz_dbh_a = gr.Number(value=11.07, label="DBH Asymptote (cm)")
+                    rhiz_dbh_b = gr.Number(value=0.4736, label="DBH Growth Rate (yr⁻¹)")
+                    rhiz_dbh_c = gr.Number(value=2.1, label="DBH Shape Parameter")
+                    rhiz_height_a = gr.Number(value=11.58, label="Height Asymptote (m)")
+                    rhiz_height_b = gr.Number(value=0.1335, label="Height Growth Rate (yr⁻¹)")
+                    rhiz_height_c = gr.Number(value=1.5, label="Height Shape Parameter")
+                    rhiz_initial_dbh = gr.Number(value=1.0, label="Initial DBH (cm)")
+                    rhiz_initial_height = gr.Number(value=0.5, label="Initial Height (m)")
+                    
+                with gr.Column():
+                    gr.Markdown("### Avicennia Parameters")
+                    avic_density = gr.Number(value=2500, label="Planting Density (trees/ha)")
+                    avic_mort_1 = gr.Number(value=20, label="Year 1 Mortality (%)")
+                    avic_mort_2 = gr.Number(value=10, label="Year 2 Mortality (%)")
+                    avic_mort_3 = gr.Number(value=5, label="Year 3 Mortality (%)")
+                    avic_mort_4 = gr.Number(value=2, label="Year 4 Mortality (%)")
+                    avic_mort_5 = gr.Number(value=1, label="Year 5 Mortality (%)")
+                    
+                    gr.Markdown("### Avicennia Growth Parameters")
+                    avic_dbh_a = gr.Number(value=11.07, label="DBH Asymptote (cm)")
+                    avic_dbh_b = gr.Number(value=0.4736, label="DBH Growth Rate (yr⁻¹)")
+                    avic_dbh_c = gr.Number(value=2.1, label="DBH Shape Parameter")
+                    avic_height_a = gr.Number(value=11.58, label="Height Asymptote (m)")
+                    avic_height_b = gr.Number(value=0.1335, label="Height Growth Rate (yr⁻¹)")
+                    avic_height_c = gr.Number(value=1.5, label="Height Shape Parameter")
+                    avic_initial_dbh = gr.Number(value=1.0, label="Initial DBH (cm)")
+                    avic_initial_height = gr.Number(value=0.5, label="Initial Height (m)")
+                    
+            with gr.Row():
+                with gr.Column():
+                    gr.Markdown("### Project Parameters")
+                    year_1_area = gr.Number(value=2500, label="Year 1 Planting Area (ha)")
+                    year_2_area = gr.Number(value=2500, label="Year 2 Planting Area (ha)")
+                    year_3_area = gr.Number(value=0, label="Year 3 Planting Area (ha)")
+                    year_4_area = gr.Number(value=0, label="Year 4 Planting Area (ha)")
+                    year_5_area = gr.Number(value=0, label="Year 5 Planting Area (ha)")
+                    buffer_percentage = gr.Number(value=20, label="Buffer Pool (%)")
         
         with gr.Row():
-            plot3 = gr.Plot(label="Total Biomass per Tree")
-        
-        summary = gr.Textbox(label="Summary", lines=10)
+            update_btn = gr.Button("Update Model")
         
-        with gr.Row():
-            species_table = gr.Dataframe(
-                label="Annual Emission Reductions",
-                headers=["Year", "Annual ERs (tCO2)", "Cumulative ERs (tCO2)", "Area Planted (ha)", "Cumulative Area (ha)"]
-            )
-            scenario_table = gr.Dataframe(
-                label="Scenario Comparison",
-                headers=["Scenario", "DBH Range", "Height Range", "Growth Rate", "Year 5 tCO2", "Year 10 tCO2", "Year 15 tCO2", "Year 30 tCO2"]
-            )
+        with gr.Tab("Results"):
+            with gr.Row():
+                carbon_plot = gr.Plot(label="Carbon Sequestration")
+                annual_plot = gr.Plot(label="Annual ERs")
+                biomass_plot = gr.Plot(label="Biomass per Tree")
+            
+            summary_text = gr.Textbox(label="Summary", lines=10)
+            
+            with gr.Row():
+                annual_table = gr.DataFrame(label="Annual Results")
+                species_table = gr.DataFrame(label="Species Results")
         
-        # Update function
+        # Connect the update button to the model update function
         inputs = [
             rhiz_density, rhiz_mort_1, rhiz_mort_2, rhiz_mort_3, rhiz_mort_4, rhiz_mort_5,
             avic_density, avic_mort_1, avic_mort_2, avic_mort_3, avic_mort_4, avic_mort_5,
             year_1_area, year_2_area, year_3_area, year_4_area, year_5_area,
-            buffer_percentage, scenario_area, dbh_range_min, dbh_range_max,
-            height_range_min, height_range_max, growth_rate_factor
+            buffer_percentage,
+            # Chapman-Richards parameters for Rhizophora
+            rhiz_dbh_a, rhiz_dbh_b, rhiz_dbh_c,
+            rhiz_height_a, rhiz_height_b, rhiz_height_c,
+            rhiz_initial_dbh, rhiz_initial_height,
+            # Chapman-Richards parameters for Avicennia
+            avic_dbh_a, avic_dbh_b, avic_dbh_c,
+            avic_height_a, avic_height_b, avic_height_c,
+            avic_initial_dbh, avic_initial_height
         ]
         
-        outputs = [plot1, plot2, plot3, summary, species_table, scenario_table]
+        outputs = [carbon_plot, annual_plot, biomass_plot, summary_text, annual_table, species_table]
         
-        # Initialize with default values
-        interface.load(
-            fn=update_model,
-            inputs=inputs,
-            outputs=outputs,
-        )
+        # Connect button click event
+        update_btn.click(fn=update_model, inputs=inputs, outputs=outputs)
         
-        # Update on any change
-        for inp in inputs:
-            inp.change(
-                fn=update_model,
-                inputs=inputs,
-                outputs=outputs
-            )
-    
-    # Launch interface
-    interface.launch(share=False)
+        # Initialize the UI with default values
+        app.load(fn=update_model, inputs=inputs, outputs=outputs)
+    
+    return app
 
 
 if __name__ == "__main__":
-    main() 
+    app = main()
+    app.launch(share=True)