Merge pull request #506 from NREL/develop

v0.53.2

Author: Bill-Becker

CHANGELOG.md

@@ -25,7 +25,11 @@ Classify the change according to the following categories:
     ### Deprecated
     ### Removed
 
-## v0.53.0
+## v0.53.2
+### Fixed
+- `PV` `size_class` and cost defaults not updating correctly when both `max_kw` and the site's land or roof space are input
+
+## v0.53.1
 ### Fixed
 - Issue with `CHP` and `PV` cost curves when with-incentives segments is greater than no-incentives segments
 

Project.toml

@@ -1,7 +1,7 @@
 name = "REopt"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
 authors = ["Nick Laws", "Hallie Dunham <hallie.dunham@nrel.gov>", "Bill Becker <william.becker@nrel.gov>", "Bhavesh Rathod <bhavesh.rathod@nrel.gov>", "Alex Zolan <alexander.zolan@nrel.gov>", "Amanda Farthing <amanda.farthing@nrel.gov>", "Xiangkun Li <xiangkun.li@nrel.gov>", "An Pham <an.pham@nrel.gov>", "Byron Pullutasig <byron.pullatasig@nrel.gov>"]
-version = "0.53.1"
+version = "0.53.2"
 
 [deps]
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"

src/core/pv.jl

@@ -420,19 +420,22 @@ function get_pv_cost_params(;
         # Default case: Calculate based on land/roof space available or load
         max_kw_for_size_class = max_kw
         max_kw_roof, max_kw_ground = 0.0, 0.0
+        check_for_space_constrained = false
         space_constrained = false
         if !isnothing(site_roof_squarefeet) && location in ["both", "roof"]
             # Calculate size class based on roof space
             max_kw_roof = kw_per_square_foot * site_roof_squarefeet
-            space_constrained = true
+            check_for_space_constrained = true
         end
         if !isnothing(site_land_acres) && location in ["both", "ground"]
             # Calculate size class based on land space
             max_kw_ground = site_land_acres / acres_per_kw
-            space_constrained = true
+            check_for_space_constrained = true
         end
-        if space_constrained
-            max_kw_for_size_class = max_kw_roof + max_kw_ground
+        max_kw_roof_and_ground = max_kw_roof + max_kw_ground
+        if check_for_space_constrained && max_kw_roof_and_ground < max_kw_for_size_class
+            space_constrained = true
+            max_kw_for_size_class = max_kw_roof_and_ground
         end
         tech_sizes = [c["tech_sizes_for_cost_curve"] for c in defaults]
         # Include both roof and land for size class -> cost determination