Merge pull request #2044 from NREL/capex-table-capacity-match

Check for exact capacity match in capex tables

Author: mjprilliman

deploy/runtime/ui/PV Capex Fuel Cell.json

@@ -999,11 +999,11 @@
         "\t\texit;\r",
         "\t}\r",
         "\t//property('capex_table_inputs','ShowColumn','Capacity (kW),Costs ($/kW)');\r",
-        "\tif (sys_cap > input[nr - 1][0]) {\r",
+        "\tif (sys_cap >= input[nr - 1][0]) {\r",
         "\t\tcost = input[nr - 1][1];\r",
         "\t\t\t\r",
         "\t}\r",
-        "\telse if (sys_cap < input[0][0]) {\r",
+        "\telse if (sys_cap <= input[0][0]) {\r",
         "\t\tcost = input[0][1];\r",
         "\t\t\t\r",
         "\t}\r",

deploy/runtime/ui/PV Capex Table AC.json

@@ -995,10 +995,10 @@
         "\t\t${capex_table_total_installed_ac_cost} = total_cost;\r",
         "\t\texit;\r",
         "\t}\r",
-        "\tif (sys_cap > input[nr - 1][0]) {\r",
+        "\tif (sys_cap >= input[nr - 1][0]) {\r",
         "\t\tcost = input[nr - 1][1];\t\t\t\r",
         "\t}\r",
-        "\telse if (sys_cap < input[0][0]) {\r",
+        "\telse if (sys_cap <= input[0][0]) {\r",
         "\t\tcost = input[0][1];\t\t\t\r",
         "\t}\r",
         "\telse {\r",

deploy/runtime/ui/PV Capex Table Battery.json

@@ -1568,11 +1568,11 @@
         "\t\texit;\r",
         "\t}\r",
         "\telse if (nc == 2) {\r",
-        "\t\tif (sys_cap > input[nr - 1][0]) {\r",
+        "\t\tif (sys_cap >= input[nr - 1][0]) {\r",
         "\t\t\tcost = input[nr - 1][1];\r",
         "\t\t\r",
         "\t\t}\r",
-        "\t\telse if (sys_cap < input[0][0]) {\r",
+        "\t\telse if (sys_cap <= input[0][0]) {\r",
         "\t\t\tcost = input[0][1];\r",
         "\t\t\r",
         "\t\t}\r",
@@ -1595,12 +1595,12 @@
         "\t\t${capex_table_total_installed_batt_cost} = total_cost;\r",
         "\t\t}\r",
         "\telse {\r",
-        "\t\tif (sys_cap > input[nr - 1][0]) {\r",
+        "\t\tif (sys_cap >= input[nr - 1][0]) {\r",
         "\t\t\tcost = input[nr - 1][1];\r",
         "\t\t\tcost_kwh = input[nr - 1][2];\r",
         "\t\t\r",
         "\t\t}\r",
-        "\t\telse if (sys_cap < input[0][0]) {\r",
+        "\t\telse if (sys_cap <= input[0][0]) {\r",
         "\t\t\tcost = input[0][1];\r",
         "\t\t\tcost_kwh = input[0][2];\r",
         "\t\t\r",

deploy/runtime/ui/PV Capex Table Land.json

@@ -996,11 +996,11 @@
         "\t\t${capex_table_total_installed_land_cost} = total_cost;\r",
         "\t\texit;\r",
         "\t}\r",
-        "\tif (sys_cap > input[nr - 1][0]) {\r",
+        "\tif (sys_cap >= input[nr - 1][0]) {\r",
         "\t\tcost = input[nr - 1][1];\r",
         "\t\t\t\r",
         "\t}\r",
-        "\telse if (sys_cap < input[0][0]) {\r",
+        "\telse if (sys_cap <= input[0][0]) {\r",
         "\t\tcost = input[0][1];\r",
         "\t\t\t\r",
         "\t}\r",

deploy/runtime/ui/PV Capex Table.json

@@ -1005,10 +1005,10 @@
         "\t\texit;\r",
         "\t}\r",
         "\t//property('capex_table_inputs','ShowColumn','Capacity (kW),Costs ($/kW)');\r",
-        "\tif (sys_cap > input[nr - 1][0]) {\r",
+        "\tif (sys_cap >= input[nr - 1][0]) {\r",
         "\t\tcost = input[nr - 1][1];\r",
         "\t}\r",
-        "\telse if (sys_cap < input[0][0]) {\r",
+        "\telse if (sys_cap <= input[0][0]) {\r",
         "\t\tcost = input[0][1];\r",
         "\t}\r",
         "\telse {\r",