Merge pull request #1412 from NREL/electric-load-callback-error

Add technology condition to critical load error message
NREL · Jun 3, 2023 · 45fba47 · 45fba47
2 parents 25f07f1 + 645d44a
commit 45fba47
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/deploy/runtime/ui/Electric Load Data.json b/deploy/runtime/ui/Electric Load Data.json
@@ -6080,15 +6080,18 @@
         "\t\r",
         "\t// error if user critical load not multiple of 8760\r",
         "\t// or different length than load data\r",
-        "\tif ( ${crit_load_type} == 1 )\r",
+        "\tif ( is_critical_load_tech ) \r",
         "\t{\r",
-        "\t\tif ( mod(#${crit_load_user_data}, 8760) != 0 || #${crit_load_user_data}!=#${load_user_data})\r",
+        "\t\tif ( ${crit_load_type} == 1 )\r",
         "\t\t{\r",
-        "\t\t\tmsgbox('Electric Load Data Error.\\n'\r",
-        "\t\t\t+'Electric load data and critical load data must use the same time step:\\n'\r",
-        "\t\t\t+'  Electric load time step is ' + 8760/#${load_user_data}*60 + ' minutes.\\n'\r",
-        "\t\t\t+'  Critical load time step is '  + 8760/#${crit_load_user_data}*60 + ' minutes.\\n\\n'\r",
-        "\t\t\t+'See Grid Outage page for critical load data and Electric Load page for electric load data.');\r",
+        "\t\t\tif ( mod(#${crit_load_user_data}, 8760) != 0 || #${crit_load_user_data}!=#${load_user_data})\r",
+        "\t\t\t{\r",
+        "\t\t\t\tmsgbox('Electric Load Data Error.\\n'\r",
+        "\t\t\t\t+'Electric load data and critical load data must use the same time step:\\n'\r",
+        "\t\t\t\t+'  Electric load time step is ' + 8760/#${load_user_data}*60 + ' minutes.\\n'\r",
+        "\t\t\t\t+'  Critical load time step is '  + 8760/#${crit_load_user_data}*60 + ' minutes.\\n\\n'\r",
+        "\t\t\t\t+'See Grid Outage page for critical load data and Electric Load page for electric load data.');\r",
+        "\t\t\t}\r",
         "\t\t}\r",
         "\t}\r",
         "}"