From fcf47f7771dfdaa53c1eec477a0fe5fbd67eef4f Mon Sep 17 00:00:00 2001 From: Matt Prilliman Date: Thu, 5 Oct 2023 08:53:34 -0500 Subject: [PATCH 1/3] Fix callbacks for wind bos system cost options for hybrids --- deploy/runtime/ui/Hybrid Costs.json | 2 ++ deploy/runtime/ui/Wind Farm Costs.json | 41 ++++++++++++++++---------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/deploy/runtime/ui/Hybrid Costs.json b/deploy/runtime/ui/Hybrid Costs.json index 83ce913b8a..be0a59d245 100644 --- a/deploy/runtime/ui/Hybrid Costs.json +++ b/deploy/runtime/ui/Hybrid Costs.json @@ -1208,6 +1208,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 index 3a86474d0c..c4010bd6d8 100644 --- 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,30 @@ "\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\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}\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", "}" ] } \ No newline at end of file From d31603300a466a5c17c6ff3c086dbb4e024edb2e Mon Sep 17 00:00:00 2001 From: Matt Prilliman Date: Thu, 5 Oct 2023 14:30:06 -0500 Subject: [PATCH 2/3] Hide resource file reference for hybrid wind costs --- deploy/runtime/ui/Wind Farm Costs.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deploy/runtime/ui/Wind Farm Costs.json b/deploy/runtime/ui/Wind Farm Costs.json index c4010bd6d8..bd93863ff2 100644 --- a/deploy/runtime/ui/Wind Farm Costs.json +++ b/deploy/runtime/ui/Wind Farm Costs.json @@ -3107,6 +3107,7 @@ "\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", @@ -3114,6 +3115,14 @@ "\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", From cbcb05db7ca5dfd7ebe3dd991d419334a530b6f7 Mon Sep 17 00:00:00 2001 From: Steven Janzou Date: Fri, 6 Oct 2023 02:39:02 -0600 Subject: [PATCH 3/3] 2023.10.6.ssc.285 beta release expires 1/6/2024 --- src/main_add.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main_add.h b/src/main_add.h index 32fc129a06..f6e9fd2836 100644 --- 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