From 8bfe926bc64a31c924192d01f7ab70d0598c6ab2 Mon Sep 17 00:00:00 2001 From: Brian Mirletz Date: Mon, 16 Oct 2023 10:37:19 -0600 Subject: [PATCH] rename price signals dispatch to retail rate (#1495) * rename price signals dispatch to retail rate * additional startup.lk modifications to complete the renaming for hybrids, get self consumption working in a few more configurations --- deploy/runtime/startup.lk | 10 +++++----- deploy/runtime/ui/Battery Dispatch Options BTM.json | 4 ++-- ...e Signal.json => Battery Dispatch Retail Rate.json} | 8 ++++---- .../ui/Battery Dispatch Standalone Options BTM.json | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) rename deploy/runtime/ui/{Battery Dispatch Price Signal.json => Battery Dispatch Retail Rate.json} (98%) diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk index 8a71997c00..381f47b3f2 100644 --- a/deploy/runtime/startup.lk +++ b/deploy/runtime/startup.lk @@ -188,7 +188,7 @@ function setup_pages_battery_dispatch_btm() [ {'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 Price Signal', 'caption'='Price Signal'} ], + [ {'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', @@ -201,7 +201,7 @@ function setup_pages_standalone_battery_dispatch_btm() [ {'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 Price Signal', 'caption'='Price Signal'} ]], + [ {'name'='Battery Dispatch Retail Rate', 'caption'='Retail Rate'} ]], { 'sidebar'='Battery Dispatch', 'help'='battery_dispatch_btm', 'exclusive_var' = 'batt_dispatch_excl', 'exclusive_header_pages' = ['Battery Dispatch Common', 'Battery Dispatch Standalone Options BTM'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='Battery' } ); @@ -1255,7 +1255,7 @@ 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 Price Signal', 'caption'='Price Signal'} ], + [ {'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 } ); addpage( [[ 'Fuel Cell' ]], @@ -2850,7 +2850,7 @@ addpage( [[ 'Operating Costs Fuel Cell Hybrid' ]], { 'sidebar'='Fuel Cell Operat // 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( [[ {'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 Price Signal', 'caption'='Price Signal'} ]], { '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( [[ {'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' } ); addpage( [[ 'Operating Costs Standalone Battery']],{ 'sidebar'='Battery Operating Costs', 'help'='oc_battery', 'bin_name'='Battery' } ); // grid @@ -3159,7 +3159,7 @@ addpage( [[ 'Operating Costs Fuel Cell Hybrid' ]], { 'sidebar'='Fuel Cell Operat // 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( [[ {'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 Price Signal', 'caption'='Price Signal'} ]], { '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( [[ {'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' } ); addpage( [[ 'Operating Costs Standalone Battery']],{ 'sidebar'='Battery Operating Costs', 'help'='oc_battery', 'bin_name'='Battery' } ); // grid diff --git a/deploy/runtime/ui/Battery Dispatch Options BTM.json b/deploy/runtime/ui/Battery Dispatch Options BTM.json index 850dbcf743..d9846362f7 100644 --- a/deploy/runtime/ui/Battery Dispatch Options BTM.json +++ b/deploy/runtime/ui/Battery Dispatch Options BTM.json @@ -282,7 +282,7 @@ }, "Items": { "Type": 6.0, - "StringList": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast|Self-consumption" + "StringList": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Retail rate dispatch|Self-consumption" }, "ShowCaptions": { "Type": 2.0, @@ -586,7 +586,7 @@ "Label": "Battery dispatch options BTM", "Units": " ", "Group": "Battery Dispatch", - "IndexLabels": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast|Self-consumption", + "IndexLabels": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Retail rate dispatch|Self-consumption", "Flags": 3.0, "DefaultValue": 0.0, "UIObject": "RadioChoice", diff --git a/deploy/runtime/ui/Battery Dispatch Price Signal.json b/deploy/runtime/ui/Battery Dispatch Retail Rate.json similarity index 98% rename from deploy/runtime/ui/Battery Dispatch Price Signal.json rename to deploy/runtime/ui/Battery Dispatch Retail Rate.json index ac0849db57..20f7cb3bb6 100644 --- a/deploy/runtime/ui/Battery Dispatch Price Signal.json +++ b/deploy/runtime/ui/Battery Dispatch Retail Rate.json @@ -1,5 +1,5 @@ { - "Name": "Battery Dispatch Price Signal", + "Name": "Battery Dispatch Retail Rate", "Width": 1052.0, "Height": 520.0, "FormObjects": { @@ -848,7 +848,7 @@ }, "Caption": { "Type": 5.0, - "String": "Price Signal Forecast" + "String": "Retail Rate Dispatch" }, "Bold": { "Type": 2.0, @@ -885,7 +885,7 @@ }, "Caption": { "Type": 5.0, - "String": "The price signal forecast option operates the battery to minimize the electricity bill based on an electricity price estimate that represents the cost to the system owner of purchasing electricity from the grid in each time step." + "String": "The retail rate dispatch option operates the battery to minimize the electricity bill based on an electricity price estimate that represents the cost to the system owner of purchasing electricity from the grid in each time step." }, "TextColour": { "Type": 4.0, @@ -1048,7 +1048,7 @@ }, "Equations": [], "Callbacks": [ - "on_load{'Battery Dispatch Price Signal'}=define()", + "on_load{'Battery Dispatch Retail Rate'}=define()", "{\t", "\tvalue('batt_dispatch_choice', 4);", "\ttoggle_forecast_standalone_psd();", diff --git a/deploy/runtime/ui/Battery Dispatch Standalone Options BTM.json b/deploy/runtime/ui/Battery Dispatch Standalone Options BTM.json index e0ff03e631..8b11d2f772 100644 --- a/deploy/runtime/ui/Battery Dispatch Standalone Options BTM.json +++ b/deploy/runtime/ui/Battery Dispatch Standalone Options BTM.json @@ -118,7 +118,7 @@ }, "Items": { "Type": 6.0, - "StringList": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast" + "StringList": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Retail rate dispatch" }, "ShowCaptions": { "Type": 2.0, @@ -267,7 +267,7 @@ "Label": "Battery dispatch choice", "Units": " ", "Group": "Battery Dispatch", - "IndexLabels": "Peak shaving| Input grid power targets| Input battery power targets| Manual dispatch| Price signal forecast", + "IndexLabels": "Peak shaving| Input grid power targets| Input battery power targets| Manual dispatch| Retail rate dispatch", "Flags": 3.0, "DefaultValue": 3.0, "UIObject": "RadioChoice",