fix: use year_1 to year_10 and subsequent for mortality inputs, matching YAML structure

dashboard/app.py

@@ -265,12 +265,11 @@ This version is smoother and may yield slightly different results than the discr
                 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']
+                # Mortality years 1-10 + subsequent
+                mort_vars = []
+                for yr in range(1, 11):
+                    mort_vars.append(model_inputs[f'year_{yr}'])
+                mort_sub = model_inputs['subsequent']
                 project_duration = model_inputs['project_duration']
                 buffer_pct = model_inputs['buffer_pct']
                 soil_carbon = model_inputs['soil_carbon']
@@ -278,8 +277,7 @@ This version is smoother and may yield slightly different results than the discr
             def update_declining_increment(y1, y2, y3, y4, y5,
                                            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):
+                                           *mortality_inputs, project_duration, buffer_pct, soil_carbon):
                 config = update_planting_schedule(MODEL_CONFIGS["Declining Increment"], [y1, y2, y3, y4, y5])
                 # Update species_A params
                 config['species'][0]['planting_density'] = planting_density_A
@@ -293,14 +291,11 @@ This version is smoother and may yield slightly different results than the discr
                 config['species'][1]['declining_increment']['dbh']['T_m'] = tm_dbh_B
                 config['species'][1]['declining_increment']['height']['r0'] = r0_height_B
                 config['species'][1]['declining_increment']['height']['T_m'] = tm_height_B
-                # Update mortality for BOTH species from the same UI values
+                # Update mortality for BOTH species from the same UI values (years 1-10 + subsequent)
                 for i in [0, 1]:
-                    config['species'][i]['mortality_rates']['year_1'] = mort_1
-                    config['species'][i]['mortality_rates']['year_2'] = mort_2
-                    config['species'][i]['mortality_rates']['year_3'] = mort_3
-                    config['species'][i]['mortality_rates']['year_4'] = mort_4
-                    config['species'][i]['mortality_rates']['year_5'] = mort_5
-                    config['species'][i]['mortality_rates']['subsequent'] = mort_sub
+                    for yr_idx, yr in enumerate(range(1, 11)):
+                        config['species'][i]['mortality_rates'][f'year_{yr}'] = mortality_inputs[yr_idx]
+                    config['species'][i]['mortality_rates']['subsequent'] = mortality_inputs[10]
                 # Update project/carbon params
                 config['project']['duration_years'] = project_duration
                 config['carbon']['buffer_percentage'] = buffer_pct
@@ -342,8 +337,7 @@ This version is smoother and may yield slightly different results than the discr
                 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],
+                        *mort_vars, 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