feat: add mortality inputs for years 1-10 and subsequent, update both species, and fix UI assignment

dashboard/app.py

@@ -255,8 +255,25 @@ This version is smoother and may yield slightly different results than the discr
             # --- Adjustable Model Inputs ---
             model_inputs, model_defaults = get_model_inputs(config)
             with gr.Accordion("Adjust Model Inputs", open=True):
-                for k, comp in model_inputs.items():
-                    comp.render()
+                planting_density_A = model_inputs['planting_density_A']
+                r0_dbh_A = model_inputs['r0_dbh_A']
+                tm_dbh_A = model_inputs['tm_dbh_A']
+                r0_height_A = model_inputs['r0_height_A']
+                tm_height_A = model_inputs['tm_height_A']
+                planting_density_B = model_inputs['planting_density_B']
+                r0_dbh_B = model_inputs['r0_dbh_B']
+                tm_dbh_B = model_inputs['tm_dbh_B']
+                r0_height_B = model_inputs['r0_height_B']
+                tm_height_B = model_inputs['tm_height_B']
+                mort_1 = model_inputs['mort_1']
+                mort_2 = model_inputs['mort_2']
+                mort_3 = model_inputs['mort_3']
+                mort_4 = model_inputs['mort_4']
+                mort_5 = model_inputs['mort_5']
+                mort_sub = model_inputs['mort_sub']
+                project_duration = model_inputs['project_duration']
+                buffer_pct = model_inputs['buffer_pct']
+                soil_carbon = model_inputs['soil_carbon']
             # Update the update_declining_increment callback to use these new inputs
             def update_declining_increment(y1, y2, y3, y4, y5,
                                            planting_density_A, r0_dbh_A, tm_dbh_A, r0_height_A, tm_height_A,
@@ -322,7 +339,11 @@ This version is smoother and may yield slightly different results than the discr
                 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] + list(model_inputs.values()),
+                inputs=[year_1, year_2, year_3, year_4, year_5,
+                        planting_density_A, r0_dbh_A, tm_dbh_A, r0_height_A, tm_height_A,
+                        planting_density_B, r0_dbh_B, tm_dbh_B, r0_height_B, tm_height_B,
+                        mort_1, mort_2, mort_3, mort_4, mort_5, mort_sub,
+                        project_duration, buffer_pct, soil_carbon],
                 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

dashboard/inputs.py

@@ -15,13 +15,15 @@ def get_model_inputs(config):
     tm_dbh_B = gr.Number(value=spB['declining_increment']['dbh']['T_m'], label=f"{spB['name']} Tm (DBH, yrs)")
     r0_height_B = gr.Number(value=spB['declining_increment']['height']['r0'], label=f"{spB['name']} r0 (Height, m/yr)")
     tm_height_B = gr.Number(value=spB['declining_increment']['height']['T_m'], label=f"{spB['name']} Tm (Height, yrs)")
-    # Mortality (one set, mirrored)
-    mort_1 = gr.Number(value=spA['mortality_rates']['year_1'], label="Year 1 Mortality (%)")
-    mort_2 = gr.Number(value=spA['mortality_rates']['year_2'], label="Year 2 Mortality (%)")
-    mort_3 = gr.Number(value=spA['mortality_rates']['year_3'], label="Year 3 Mortality (%)")
-    mort_4 = gr.Number(value=spA['mortality_rates']['year_4'], label="Year 4 Mortality (%)")
-    mort_5 = gr.Number(value=spA['mortality_rates']['year_5'], label="Year 5 Mortality (%)")
-    mort_sub = gr.Number(value=spA['mortality_rates']['subsequent'], label="Subsequent Years Mortality (%)")
+    # Mortality (one set, mirrored, years 1-10 + subsequent)
+    mort_inputs = {}
+    mort_defaults = []
+    for yr in range(1, 11):
+        key = f"year_{yr}"
+        mort_inputs[key] = gr.Number(value=spA['mortality_rates'][key], label=f"Year {yr} Mortality (%)")
+        mort_defaults.append(spA['mortality_rates'][key])
+    mort_inputs['subsequent'] = gr.Number(value=spA['mortality_rates']['subsequent'], label="Subsequent Years Mortality (%)")
+    mort_defaults.append(spA['mortality_rates']['subsequent'])
     # Project/Carbon
     project_duration = gr.Number(value=config['project']['duration_years'], label="Project Duration (years)")
     buffer_pct = gr.Number(value=config['carbon']['buffer_percentage'], label="Buffer %")
@@ -38,12 +40,7 @@ def get_model_inputs(config):
         'tm_dbh_B': tm_dbh_B,
         'r0_height_B': r0_height_B,
         'tm_height_B': tm_height_B,
-        'mort_1': mort_1,
-        'mort_2': mort_2,
-        'mort_3': mort_3,
-        'mort_4': mort_4,
-        'mort_5': mort_5,
-        'mort_sub': mort_sub,
+        **mort_inputs,
         'project_duration': project_duration,
         'buffer_pct': buffer_pct,
         'soil_carbon': soil_carbon
@@ -53,8 +50,7 @@ def get_model_inputs(config):
         spA['declining_increment']['height']['r0'], spA['declining_increment']['height']['T_m'],
         spB['planting_density'], spB['declining_increment']['dbh']['r0'], spB['declining_increment']['dbh']['T_m'],
         spB['declining_increment']['height']['r0'], spB['declining_increment']['height']['T_m'],
-        spA['mortality_rates']['year_1'], spA['mortality_rates']['year_2'], spA['mortality_rates']['year_3'],
-        spA['mortality_rates']['year_4'], spA['mortality_rates']['year_5'], spA['mortality_rates']['subsequent'],
+        *mort_defaults,
         config['project']['duration_years'], config['carbon']['buffer_percentage'], config['carbon']['soil_carbon_per_ha_per_year']
     ]
     return components, defaults