UI forms and defaults for battery adjust losses (#1902)

* UI forms and defaults for battery adjust losses * Form adjustments to reduce redundant drop down menus (group losses with losses * Clean up battery availability loss inputs Rename "Battery Ancillary Losses" UI form .json file to "Battery Losses". * "Battery Availability" group name to match "System Availability" * Fix line groupings on pvwatts battery form * Add lk required to handle adjust losses for analysis periods other than 25 years * Fix the losses form again after merge * Update PVWatts-Battery System Design form for availability --------- Co-authored-by: Paul Gilman <[email protected]>
NREL · Nov 14, 2024 · ed210cc · ed210cc
1 parent d071b71
commit ed210cc
Show file tree

Hide file tree

Showing 45 changed files with 369,101 additions and 52 deletions.
diff --git a/deploy/runtime/defaults/Custom Generation Battery_All Equity Partnership Flip.json b/deploy/runtime/defaults/Custom Generation Battery_All Equity Partnership Flip.json
diff --git a/deploy/runtime/defaults/Custom Generation Battery_Commercial.json b/deploy/runtime/defaults/Custom Generation Battery_Commercial.json
diff --git a/deploy/runtime/defaults/Custom Generation Battery_Host Developer.json b/deploy/runtime/defaults/Custom Generation Battery_Host Developer.json
diff --git a/deploy/runtime/defaults/Custom Generation Battery_Leveraged Partnership Flip.json b/deploy/runtime/defaults/Custom Generation Battery_Leveraged Partnership Flip.json
diff --git a/deploy/runtime/defaults/Custom Generation Battery_Merchant Plant.json b/deploy/runtime/defaults/Custom Generation Battery_Merchant Plant.json
diff --git a/deploy/runtime/defaults/Custom Generation Battery_Residential.json b/deploy/runtime/defaults/Custom Generation Battery_Residential.json
diff --git a/deploy/runtime/defaults/Custom Generation Battery_Sale Leaseback.json b/deploy/runtime/defaults/Custom Generation Battery_Sale Leaseback.json
diff --git a/deploy/runtime/defaults/Custom Generation Battery_Single Owner.json b/deploy/runtime/defaults/Custom Generation Battery_Single Owner.json
diff --git a/deploy/runtime/defaults/Custom Generation Battery_Third Party.json b/deploy/runtime/defaults/Custom Generation Battery_Third Party.json
diff --git a/...untime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json b/...untime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json
diff --git a/.../runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/.../runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
diff --git a/deploy/runtime/defaults/Fuel Cell_Commercial.json b/deploy/runtime/defaults/Fuel Cell_Commercial.json
diff --git a/deploy/runtime/defaults/Fuel Cell_Single Owner.json b/deploy/runtime/defaults/Fuel Cell_Single Owner.json
diff --git a/deploy/runtime/defaults/MEwave Battery_Single Owner.json b/deploy/runtime/defaults/MEwave Battery_Single Owner.json
diff --git a/deploy/runtime/defaults/PV Battery_All Equity Partnership Flip.json b/deploy/runtime/defaults/PV Battery_All Equity Partnership Flip.json
diff --git a/deploy/runtime/defaults/PV Battery_Commercial.json b/deploy/runtime/defaults/PV Battery_Commercial.json
diff --git a/deploy/runtime/defaults/PV Battery_Host Developer.json b/deploy/runtime/defaults/PV Battery_Host Developer.json
diff --git a/deploy/runtime/defaults/PV Battery_Leveraged Partnership Flip.json b/deploy/runtime/defaults/PV Battery_Leveraged Partnership Flip.json
diff --git a/deploy/runtime/defaults/PV Battery_Merchant Plant.json b/deploy/runtime/defaults/PV Battery_Merchant Plant.json
diff --git a/deploy/runtime/defaults/PV Battery_Residential.json b/deploy/runtime/defaults/PV Battery_Residential.json
diff --git a/deploy/runtime/defaults/PV Battery_Sale Leaseback.json b/deploy/runtime/defaults/PV Battery_Sale Leaseback.json
diff --git a/deploy/runtime/defaults/PV Battery_Single Owner.json b/deploy/runtime/defaults/PV Battery_Single Owner.json
diff --git a/deploy/runtime/defaults/PV Battery_Third Party.json b/deploy/runtime/defaults/PV Battery_Third Party.json
diff --git a/deploy/runtime/defaults/PVWatts Battery_Commercial.json b/deploy/runtime/defaults/PVWatts Battery_Commercial.json
diff --git a/deploy/runtime/defaults/PVWatts Battery_Host Developer.json b/deploy/runtime/defaults/PVWatts Battery_Host Developer.json
diff --git a/deploy/runtime/defaults/PVWatts Battery_Residential.json b/deploy/runtime/defaults/PVWatts Battery_Residential.json
diff --git a/deploy/runtime/defaults/PVWatts Battery_Third Party.json b/deploy/runtime/defaults/PVWatts Battery_Third Party.json
diff --git a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json
diff --git a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json
diff --git a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json
diff --git a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
diff --git a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json
diff --git a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json
diff --git a/deploy/runtime/defaults/Standalone Battery_All Equity Partnership Flip.json b/deploy/runtime/defaults/Standalone Battery_All Equity Partnership Flip.json
diff --git a/deploy/runtime/defaults/Standalone Battery_Commercial.json b/deploy/runtime/defaults/Standalone Battery_Commercial.json
diff --git a/deploy/runtime/defaults/Standalone Battery_Host Developer.json b/deploy/runtime/defaults/Standalone Battery_Host Developer.json
diff --git a/deploy/runtime/defaults/Standalone Battery_Leveraged Partnership Flip.json b/deploy/runtime/defaults/Standalone Battery_Leveraged Partnership Flip.json
diff --git a/deploy/runtime/defaults/Standalone Battery_Merchant Plant.json b/deploy/runtime/defaults/Standalone Battery_Merchant Plant.json
diff --git a/deploy/runtime/defaults/Standalone Battery_Residential.json b/deploy/runtime/defaults/Standalone Battery_Residential.json
diff --git a/deploy/runtime/defaults/Standalone Battery_Sale Leaseback.json b/deploy/runtime/defaults/Standalone Battery_Sale Leaseback.json
diff --git a/deploy/runtime/defaults/Standalone Battery_Single Owner.json b/deploy/runtime/defaults/Standalone Battery_Single Owner.json
diff --git a/deploy/runtime/defaults/Standalone Battery_Third Party.json b/deploy/runtime/defaults/Standalone Battery_Third Party.json
diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk
@@ -153,7 +153,7 @@ function setup_pages_battery_cell_and_system(is_reopt,is_btm)
 			  'Battery Current and Capacity',
 			  'Battery Configuration',
 			  {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'},
-			  {'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
+			  {'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
 			  {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'},
 			  'Battery Standalone Enable',
 			 ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_btm', 'bin_name'='Battery' } );
@@ -165,7 +165,7 @@ function setup_pages_battery_cell_and_system(is_reopt,is_btm)
 			  'Battery Current and Capacity',
 			  'Battery Configuration',
 			  {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'},
-			  {'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
+			  {'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
 			  {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'},
 			  'Battery Standalone Enable',
 			 ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_btm', 'bin_name'='Battery'  } );
@@ -177,7 +177,7 @@ function setup_pages_battery_cell_and_system(is_reopt,is_btm)
 			  'Battery Current and Capacity',
 			  'Battery Configuration',
 			  {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'},
-			  {'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
+			  {'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
 			  {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'},
 			  'Battery Standalone Enable',
 			 ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_fom', 'bin_name'='Battery'  } );
@@ -1326,7 +1326,7 @@ addpage( [[ { 'name'='Battery None', 'caption'='No Battery'}],
 			'Battery Life Cycle Calendar',
 			{ 'name'='Battery Replacements', 'caption'='Battery Replacements', 'collapsible'=true, 'collapsible_var'='battery_replacements_shown'},
 			{ 'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'},
-			{ 'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
+			{ 'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
 			{ 'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'},
 			'Battery Standalone Enable' ]],
 		 { 'sidebar'='Battery Storage', 'help'='battery_storage_btm', 'exclusive_var'='en_batt'} );
@@ -1374,7 +1374,7 @@ addpage( [[ { 'name'='Battery None','caption'='No Battery'}],
 		    'Battery Life Cycle Calendar',
 		    { 'name'='Battery Replacements', 'caption'='Battery Replacements', 'collapsible'=true, 'collapsible_var'='battery_replacements_shown'},
 		    { 'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'},
-		    { 'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
+		    { 'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'},
 		    { 'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'},
 		    'Battery Standalone Enable' ]],
 	     { 'sidebar'='Battery Storage', 'help'='battery_storage_fom', 'exclusive_var'='en_batt'} );
@@ -2857,7 +2857,7 @@ addpage( [[{'name'='AA Empty', 'caption'='Fixed Output'}], [{'name'='Fuel Cell D
 addpage( [[ 'Fuel Cell Costs Hybrid' ]], { 'sidebar'='Fuel Cell Installation Costs', 'help'='cc_fuel_cell', 'bin_name'='FuelCell' } );
 addpage( [[ 'Operating Costs Fuel Cell Hybrid' ]], { 'sidebar'='Fuel Cell Operating Costs', 'help'='oc_fuel_cell', 'bin_name'='FuelCell' } );
 // battery
-addpage( [['Battery Model', 'Battery Bank Sizing', 'Battery Current and Capacity', 'Battery Configuration', {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'}, {'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'}, {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'}, 'Battery Standalone Enable', ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_fom', 'bin_name'='Battery'  } );
+addpage( [['Battery Model', 'Battery Bank Sizing', 'Battery Current and Capacity', 'Battery Configuration', {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'}, {'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'}, {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'}, 'Battery Standalone Enable', ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_fom', 'bin_name'='Battery'  } );
 addpage( [[ {'name'='Battery Life Cycle Calendar', 'caption'='Calendar and Cycle Degradation'}], [{'name'='Battery Life Empty 1','caption'='Li-on NMC/Graphite Degradation'}], [{'name'='Battery Life Empty 2','caption'='Li-ion LMO/LTO Degradation'}]], {'sidebar'='Battery Life', 'help'='battery_life' , 'exclusive_var' = 'batt_life_excl', 'exclusive_header_pages' = ['Battery Replacements','Battery Life Options' ], 'exclusive_tabs' = true, 'exclusive_hide' = true, 'bin_name'='Battery'  } );
 addpage( [[ {'name'='Battery Dispatch Automated FOM', 'caption'='Automated'} ], [{'name'='Battery Dispatch PV Smoothing', 'caption'='System Smoothing'}], [ {'name'='Battery Dispatch Custom Time Series', 'caption'='Custom Time Series'} ], [ {'name'='Battery Dispatch Manual', 'caption'='Manual'}] ], { 'sidebar'='Battery Dispatch', 'help'='battery_dispatch_fom', 'exclusive_var' = 'batt_dispatch_excl', 'exclusive_header_pages' = ['Battery Dispatch Common', 'Battery Dispatch Options FOM'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='Battery'} );
 addpage( [[ 'Standalone Battery Costs'/*, 'Battery Enable' set on battery dispatch automated fom*/ ]], { 'sidebar'='Battery Installation Costs', 'help'='cc_standalone_battery', 'bin_name'='Battery' } );
@@ -2927,7 +2927,7 @@ addpage( [[ {'name'='AA Empty', 'caption'='Fixed Output'} ], [ {'name'='AA Empty
 addpage( [[ 'Fuel Cell Costs Hybrid' ]], { 'sidebar'='Fuel Cell Installation Costs', 'help'='cc_fuel_cell', 'bin_name'='FuelCell' } );
 addpage( [[ 'Operating Costs Fuel Cell Hybrid' ]], { 'sidebar'='Fuel Cell Operating Costs', 'help'='oc_fuel_cell', 'bin_name'='FuelCell' } );
 // battery
-addpage( [[ 'Battery Model', 'Battery Bank Sizing', 'Battery Current and Capacity', 'Battery Configuration', {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'}, {'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'}, {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'}, 'Battery Standalone Enable', ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_btm', 'bin_name'='Battery'  } );
+addpage( [[ 'Battery Model', 'Battery Bank Sizing', 'Battery Current and Capacity', 'Battery Configuration', {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'}, {'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'}, {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'}, 'Battery Standalone Enable', ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_btm', 'bin_name'='Battery'  } );
 addpage( [[ {'name'='Battery Life Cycle Calendar', 'caption'='Calendar and Cycle Degradation'}], [{'name'='Battery Life Empty 1','caption'='Li-on NMC/Graphite Degradation'}], [{'name'='Battery Life Empty 2','caption'='Li-ion LMO/LTO Degradation'}]], {'sidebar'='Battery Life', 'help'='battery_life' , 'exclusive_var' = 'batt_life_excl', 'exclusive_header_pages' = ['Battery Replacements','Battery Life Options' ], 'exclusive_tabs' = true, 'exclusive_hide' = true, 'bin_name'='Battery'  } );
 addpage( [[ {'name'='Battery Dispatch Peak Shaving BTM', 'caption'='Peak Shaving'} ], [ {'name'='Battery Dispatch Grid Power Targets', 'caption'='Grid Power Targets'} ], [ {'name'='Battery Dispatch Battery Power Targets', 'caption'='Battery Power Targets'}], [ {'name'='Battery Dispatch Manual', 'caption'='Manual'}], [ {'name'='Battery Dispatch Retail Rate', 'caption'='Retail Rate'} ], [ {'name'='Battery Dispatch Self Consumption', 'caption'='Self Consumption'} ]], { 'sidebar'='Battery Dispatch', 'help'='battery_dispatch_btm', 'exclusive_var' = 'batt_dispatch_excl', 'exclusive_header_pages' = ['Battery Dispatch Common', 'Battery Dispatch Options BTM'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='Battery' } );
 addpage( [[ 'Standalone Battery Costs', 'Battery Enable' ]],{ 'sidebar'='Battery Installation Costs', 'help'='cc_standalone_battery', 'bin_name'='Battery' } );
@@ -3145,7 +3145,7 @@ addpage( [[{'name'='AA Empty', 'caption'='Fixed Output'}], [{'name'='Fuel Cell D
 addpage( [[ 'Fuel Cell Costs Hybrid' ]], { 'sidebar'='Fuel Cell Installation Costs', 'help'='cc_fuel_cell', 'bin_name'='FuelCell' } );
 addpage( [[ 'Operating Costs Fuel Cell Hybrid' ]], { 'sidebar'='Fuel Cell Operating Costs', 'help'='oc_fuel_cell', 'bin_name'='FuelCell' } );
 // battery
-addpage( [['Battery Model', 'Battery Bank Sizing', 'Battery Current and Capacity', 'Battery Configuration', {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'}, {'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'}, {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'}, 'Battery Standalone Enable', ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_fom', 'bin_name'='Battery'  } );
+addpage( [['Battery Model', 'Battery Bank Sizing', 'Battery Current and Capacity', 'Battery Configuration', {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'}, {'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'}, {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'}, 'Battery Standalone Enable', ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_fom', 'bin_name'='Battery'  } );
 addpage( [[ {'name'='Battery Life Cycle Calendar', 'caption'='Calendar and Cycle Degradation'}], [{'name'='Battery Life Empty 1','caption'='Li-on NMC/Graphite Degradation'}], [{'name'='Battery Life Empty 2','caption'='Li-ion LMO/LTO Degradation'}]], {'sidebar'='Battery Life', 'help'='battery_life' , 'exclusive_var' = 'batt_life_excl', 'exclusive_header_pages' = ['Battery Replacements','Battery Life Options' ], 'exclusive_tabs' = true, 'exclusive_hide' = true, 'bin_name'='Battery'  } );
 addpage( [[ {'name'='Battery Dispatch Automated FOM', 'caption'='Automated'} ], [{'name'='Battery Dispatch PV Smoothing', 'caption'='PV Smoothing'}], [ {'name'='Battery Dispatch Custom Time Series', 'caption'='Custom Time Series'} ], [ {'name'='Battery Dispatch Manual', 'caption'='Manual'}] ], { 'sidebar'='Battery Dispatch', 'help'='battery_dispatch_fom', 'exclusive_var' = 'batt_dispatch_excl', 'exclusive_header_pages' = ['Battery Dispatch Common', 'Battery Dispatch Options FOM'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='Battery'} );
 addpage( [[ 'Standalone Battery Costs'/*, 'Battery Enable' set on battery dispatch automated fom*/ ]], { 'sidebar'='Battery Installation Costs', 'help'='cc_standalone_battery', 'bin_name'='Battery' } );
@@ -3227,7 +3227,7 @@ addpage( [[ {'name'='AA Empty', 'caption'='Fixed Output'} ], [ {'name'='AA Empty
 addpage( [[ 'Fuel Cell Costs Hybrid' ]], { 'sidebar'='Fuel Cell Installation Costs', 'help'='cc_fuel_cell', 'bin_name'='FuelCell' } );
 addpage( [[ 'Operating Costs Fuel Cell Hybrid' ]], { 'sidebar'='Fuel Cell Operating Costs', 'help'='oc_fuel_cell', 'bin_name'='FuelCell' } );
 // battery
-addpage( [[ 'Battery Model', 'Battery Bank Sizing', 'Battery Current and Capacity', 'Battery Configuration', {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'}, {'name'='Battery Ancillary Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'}, {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'}, 'Battery Standalone Enable', ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_btm', 'bin_name'='Battery'  } );
+addpage( [[ 'Battery Model', 'Battery Bank Sizing', 'Battery Current and Capacity', 'Battery Configuration', {'name'='Battery Voltage', 'caption'='Battery Voltage', 'collapsible'=true, 'collapsible_var'='battery_voltage_shown'}, {'name'='Battery Losses', 'caption'='Battery Losses', 'collapsible'=true, 'collapsible_var'='battery_losses_shown'}, {'name'='Battery Thermal', 'caption'='Battery Thermal', 'collapsible'=true, 'collapsible_var'='battery_thermal_shown'}, 'Battery Standalone Enable', ]], { 'sidebar'='Battery Cell and System', 'help'='battery_storage_btm', 'bin_name'='Battery'  } );
 addpage( [[ {'name'='Battery Life Cycle Calendar', 'caption'='Calendar and Cycle Degradation'}], [{'name'='Battery Life Empty 1','caption'='Li-on NMC/Graphite Degradation'}], [{'name'='Battery Life Empty 2','caption'='Li-ion LMO/LTO Degradation'}]], {'sidebar'='Battery Life', 'help'='battery_life' , 'exclusive_var' = 'batt_life_excl', 'exclusive_header_pages' = ['Battery Replacements','Battery Life Options' ], 'exclusive_tabs' = true, 'exclusive_hide' = true, 'bin_name'='Battery'  } );
 addpage( [[ {'name'='Battery Dispatch Peak Shaving BTM', 'caption'='Peak Shaving'} ], [ {'name'='Battery Dispatch Grid Power Targets', 'caption'='Grid Power Targets'} ], [ {'name'='Battery Dispatch Battery Power Targets', 'caption'='Battery Power Targets'}], [ {'name'='Battery Dispatch Manual', 'caption'='Manual'}], [ {'name'='Battery Dispatch Retail Rate', 'caption'='Retail Rate'} ], [ {'name'='Battery Dispatch Self Consumption', 'caption'='Self Consumption'} ]], { 'sidebar'='Battery Dispatch', 'help'='battery_dispatch_btm', 'exclusive_var' = 'batt_dispatch_excl', 'exclusive_header_pages' = ['Battery Dispatch Common', 'Battery Dispatch Options BTM'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='Battery' } );
 addpage( [[ 'Standalone Battery Costs', 'Battery Enable' ]],{ 'sidebar'='Battery Installation Costs', 'help'='cc_standalone_battery', 'bin_name'='Battery' } );