Add calculated values to hybrid pages

Calculated PV, wind, battery capacity for Hybrid System page

Calculated PV, wind, battery costs for Hybrid Costs page

Update startup script for Hybrid / Host Developer to use new forms

Update defaults for new calculated variables

deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json

@@ -56265,7 +56265,13 @@
         "tod_library": "Uniform Dispatch",
         "total_installed_cost": 24304.0,
         "ui_annual_load": 0.0,
+        "ui_battery_capacity": 20.304,
+        "ui_battery_cost": 20304.0,
+        "ui_pv_capacity": 4.0,
+        "ui_pv_cost": 0.0,
         "ui_wacc": 4.06875,
+        "ui_wind_capacity": 1.0,
+        "ui_wind_cost": 4000.0,
         "ur_annual_min_charge": 0.0,
         "ur_billing_demand_is_shown": 0.0,
         "ur_billing_demand_lookback_percentages": [

deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json

@@ -30580,9 +30580,15 @@
         "term_tenor": 18.0,
         "tod_library": "Uniform Dispatch",
         "total_installed_cost": 451766000.0,
+        "ui_battery_capacity": 59400.0,
+        "ui_battery_cost": 104368000.0,
         "ui_electricity_rate_option": 0.0,
+        "ui_pv_capacity": 200000.0,
+        "ui_pv_cost": 205746000.0,
         "ui_system_nameplate_standalone": 0.0,
         "ui_wacc": 5.9994,
+        "ui_wind_capacity": 90000.0,
+        "ui_wind_cost": 141652000.0,
         "ur_annual_min_charge": 0.0,
         "ur_billing_demand_is_shown": 0.0,
         "ur_billing_demand_lookback_percentages": [

deploy/runtime/startup.lk

@@ -2602,6 +2602,7 @@ sethybridvariabledependencies([
 { 'IndependentVartableIndex' = 2,'IndependentVariableName' = 'system_capacity', 'DependentVartableIndex' = 3,'DependentVariableName' = 'battery_system_capacity'},
 { 'IndependentVartableIndex' = 2,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 3,'DependentVariableName' = 'battery_total_installed_cost'} 
 ]);
+addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system'});
 // pv
 addpage( [[ 'Solar Resource Data' ]], { 'sidebar'='PV Location and Resource', 'help'='pv_location_and_resource', 'bin_name'='PVWatts' } );
 addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collapsible'=true, 'collapsible_var'='pv_land_area_is_shown'}, {'name'='PVWatts Advanced Inputs', 'caption' = 'Advanced Inputs', 'collapsible'=true, 'collapsible_var'='pvwatts.advanced.is_shown'} ]], { 'sidebar'='PV System Design', 'help'='pvwatts_system_design', 'bin_name'='PVWatts' } );
@@ -2625,4 +2626,4 @@ addpage( [[ 'Operating Costs Standalone Battery']],{ 'sidebar'='Battery Operatin
 addpage( [[ 'Financial Tax Credits','Financial Cash Incentives']], { 'sidebar'='Battery Incentives', 'help'='incentives', 'bin_name'='Battery' } );
 // host developer
 setup_host_developer_pages(LOAD_SIMPLE);
-addpage([['Hybrid Summary']], {'sidebar'='Hybrid Summary', 'help'='hybrid_summary'});
+addpage([['Hybrid Costs']], {'sidebar'='Hybrid System Costs', 'help'='hybrid_costs'});