Merge branch 'develop' into me_cost_array_scaling

NREL · Oct 17, 2023 · 1a375ec · 1a375ec
2 parents dbfcd81 + ed0b465
commit 1a375ec
Show file tree

Hide file tree

Showing 14 changed files with 829 additions and 159 deletions.
diff --git a/deploy/runtime/defaults/Fuel Cell_Single Owner.json b/deploy/runtime/defaults/Fuel Cell_Single Owner.json
@@ -28960,6 +28960,7 @@
         0.0
     ],
     "fuelcell_dispatch_choice": 0.0,
+    "fuelcell_dispatch_choice_fom": 0.0,
     "fuelcell_dispatch_excl": 0.0,
     "fuelcell_dispatch_input": [
         0.0,

diff --git a/deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
@@ -2009,6 +2009,7 @@
             0.0
         ],
         "fuelcell_dispatch_choice": 0.0,
+        "fuelcell_dispatch_choice_fom": 0.0,
         "fuelcell_dispatch_excl": 0.0,
         "fuelcell_dispatch_input": [
             0.0

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
@@ -1934,6 +1934,7 @@
             0.0
         ],
         "fuelcell_dispatch_choice": 0.0,
+        "fuelcell_dispatch_choice_fom": 0.0,
         "fuelcell_dispatch_excl": 0.0,
         "fuelcell_dispatch_input": [
             0.0

diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk
diff --git 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/...ime/ui/Battery Dispatch Price Signal.json → ...time/ui/Battery Dispatch Retail Rate.json b/...ime/ui/Battery Dispatch Price Signal.json → ...time/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
@@ -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",

diff --git a/deploy/runtime/ui/Fuel Cell Dispatch.json → ...oy/runtime/ui/Fuel Cell Dispatch BTM.json b/deploy/runtime/ui/Fuel Cell Dispatch.json → ...oy/runtime/ui/Fuel Cell Dispatch BTM.json
@@ -1,5 +1,5 @@
 {
-    "Name": "Fuel Cell Dispatch",
+    "Name": "Fuel Cell Dispatch BTM",
     "Width": 1052.0,
     "Height": 150.0,
     "FormObjects": {
@@ -504,7 +504,7 @@
         "};"
     ],
     "Callbacks": [
-        "on_load{'Fuel Cell Dispatch'} = define() ",
+        "on_load{'Fuel Cell Dispatch BTM'} = define() ",
         "{",
         "\tenable_fc_dispatch_options();",
         "};",