Merge branch 'develop' into fuelcell-fom-dispatch

NREL · Oct 9, 2023 · 183dfbd · 183dfbd
2 parents d1594a1 + ba05c36
commit 183dfbd
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 16 deletions.
diff --git a/deploy/runtime/ui/Hybrid Costs.json b/deploy/runtime/ui/Hybrid Costs.json
@@ -1212,6 +1212,8 @@
         "\tis_fuel_cell_tech = ( technology() == 'PVWatts Wind FuelCell Battery Hybrid' || technology() == 'Generic PVWatts Wind FuelCell Battery Hybrid' ) ;\r",
         "\tshow( 'ui_generic_cost',  is_generic_tech );\r",
         "\tshow( 'ui_fuel_cell_cost', is_fuel_cell_tech );\r",
+        "\tvalue('total_installed_cost', value('total_installed_cost'));\r",
+        "\trefresh('total_installed_cost');\r",
         "\trefresh();\r",
         "};"
     ]

diff --git a/deploy/runtime/ui/Wind Farm Costs.json b/deploy/runtime/ui/Wind Farm Costs.json
@@ -2721,22 +2721,7 @@
         "\trefresh('total_installed_cost');\r",
         "\tvalue('turbine_cost_fixed',old_value);",
         "\r",
-        "\ttech = technology();\r",
-        "\t\r",
-        "\tif ( 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' ) {\r",
-        "\t\twind_name = 'Total Installed Cost of Wind Subsystem';\r",
-        "\t\twind_description = 'See the Hybrid Cost page for the total installed cost of the hybrid system. The total installed cost of the wind subsystem is the sum of the indirect, sales tax, and direct costs. Note that it does not include any financing costs from the Financial Parameters page.';\r",
-        "\t}\r",
-        "\telse {\r",
-        "\t\twind_name = 'Total installed cost';\r",
-        "\t\twind_description = 'The total installed cost is the sum of the indirect, sales tax, and direct costs. Note that it does not include any financing costs from the Financial Parameters page.';\r",
-        "\t}\r",
-        "\tproperty('lblTotalInstalledCostDescription', 'Caption', wind_description );\r",
-        "\tproperty('grpTotalInstalledCost', 'Caption', wind_name );\r",
-        "\tproperty('lblTotalInstalledCost', 'Caption', wind_name );\r",
+        "\thybrid_wind_cost_check();\r",
         "};",
         "",
         "on_change{'install_type'} = define()",
@@ -3112,6 +3097,39 @@
         "\t\tproperty('wind_cost_label', 'Caption', 'You can either enter capital costs yourself using the inputs below, or use the Estimate buttons to automatically populate those inputs using NREL cost models for turbine and balance-of-system capital costs. See Help for details.');",
         "\t\trefresh();",
         "\t}",
+        "}\r",
+        "\r",
+        "function hybrid_wind_cost_check()\r",
+        "{\r",
+        "\ttech = technology();\r",
+        "\tif ( 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' ) {\r",
+        "\t\tshow('btn_est_bos_cost', false);\r",
+        "\t\tshow('reference_resource_file', false);\r",
+        "\t\twind_name = 'Total Installed Cost of Wind Subsystem';\r",
+        "\t\twind_description = 'See the Hybrid Cost page for the total installed cost of the hybrid system. The total installed cost of the wind subsystem is the sum of the indirect, sales tax, and direct costs. Note that it does not include any financing costs from the Financial Parameters page.';\r",
+        "\t}\r",
+        "\telse {\r",
+        "\t\twind_name = 'Total installed cost';\r",
+        "\t\twind_description = 'The total installed cost is the sum of the indirect, sales tax, and direct costs. Note that it does not include any financing costs from the Financial Parameters page.';\r",
+        "\t\tshow('btn_est_bos_cost', true);\r",
+        "\t\tif ( value('wind_resource_model_choice') == 0 )\r",
+        "\t\t{\r",
+        "\t\t\tshow('reference_resource_file',true);\r",
+        "\t\t}\r",
+        "\t\telse\r",
+        "\t\t{\r",
+        "\t\t\tshow('reference_resource_file',false);\r",
+        "\t\t}\r",
+        "\t}\r",
+        "\t\r",
+        "\tproperty('lblTotalInstalledCostDescription', 'Caption', wind_description );\r",
+        "\tproperty('grpTotalInstalledCost', 'Caption', wind_name );\r",
+        "\tproperty('lblTotalInstalledCost', 'Caption', wind_name );\r",
+        "\t\r",
+        "\trefresh();\r",
         "}"
     ]
 }
diff --git a/src/main_add.h b/src/main_add.h
@@ -74,6 +74,8 @@ static SamApp::ver releases[] = {
 	//intermediate version numbers are required in this list in order for the version upgrade script (versions.lk) to work correctly
 	//please clarify the reason for the new version in a comment. Examples: public release, variable changes, internal release, public beta release, etc.
 	//the top version should always be the current working version
+			{ 2023, 10, 6 },  // 2023.10.6 ssc 285 beta release from develop with hybrids expires 1/6/2024
+			{ 2023, 10, 2 },  // 2023.10.2 ssc 284 beta release from develop with hybrids expires 1/2/2024
 			{ 2023, 9, 19 },  // 2023.9.19 ssc 283 beta release from develop with hybrids expires 12/19/2023
 			{ 2023, 7, 24 },  // 2023.7.24 Add new molten salt linear fresnel model and IPH
 			{ 2022, 11, 21 }, // 2022.11.21 ssc 278 public release and ssc 279 revision 1