Add battery salvage value ui form and defaults to hybrid configs

NREL · Aug 23, 2023 · 1a4cec5 · 1a4cec5
1 parent 1a1420d
commit 1a4cec5
Show file tree

Hide file tree

Showing 9 changed files with 16,403 additions and 16,481 deletions.
diff --git a/deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Host Developer.json
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
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
@@ -26507,5 +26507,6 @@
         "windfarm.farm.turbines_per_row": 11.0,
         "windfarm.layout.file_or_controls": 1.0
     },
+    "batt_salvage_percentage": 0.0,
     "ui_hyb_pv_capacity": 0.0
 }
diff --git a/deploy/runtime/ui/Financial Salvage Value.json b/deploy/runtime/ui/Financial Salvage Value.json
@@ -1,7 +1,7 @@
 {
     "Name": "Financial Salvage Value",
-    "Width": 864.0,
-    "Height": 121.0,
+    "Width": 859.0,
+    "Height": 83.0,
     "FormObjects": {
         "GroupBox": {
             "Visible": 1.0,
@@ -24,7 +24,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 101.0
+                    "Integer": 77.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -53,7 +53,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 60.0
+                    "Integer": 48.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -369,7 +369,12 @@
         "on_load{'Financial Salvage Value'} = define() {",
         "\ttech = technology();",
         "\tbatt_replacement_tech = ( (tech=='PV Battery')",
-        "\t|| (tech=='Generic Battery') || (tech== 'PVWatts Battery'));",
+        "\t|| (tech=='Generic Battery') \r",
+        "\t|| (tech== 'PVWatts Battery')\r",
+        "\t|| (tech=='PVWatts Wind Battery Hybrid')\r",
+        "\t|| (tech=='PVWatts Wind FuelCell Battery Hybrid') \r",
+        "\t|| (tech=='Photovoltaic Wind Battery Hybrid')\r",
+        "\t|| (tech=='Generic PVWatts Wind FuelCell Battery Hybrid') );",
         "\tshow('batt_salvage_percentage',batt_replacement_tech);",
         "\tshow('batt_salvage_value',batt_replacement_tech);",
         "\trefresh();",