Skip to content

Commit 4bc35eb

Browse files
committed
Merge remote-tracking branch 'origin/add-cst-reopt' into update-cst-reopt-with-develop
2 parents fdfc0c4 + fa026f0 commit 4bc35eb

5 files changed

Lines changed: 491265 additions & 32 deletions

File tree

src/core/cst_ssc.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,25 +169,25 @@ function run_ssc(case_data::Dict)
169169
end
170170
if model == "ptc"
171171
if haskey(case_data["CST"], "inlet_temp_degF") && haskey(case_data["CST"], "outlet_temp_degF")
172-
inlet_temp = case_data["CST"]["inlet_temp_degF"]
173-
outlet_temp = case_data["CST"]["outlet_temp_degF"]
172+
inlet_temp = (case_data["CST"]["inlet_temp_degF"] - 32) / (9/5)
173+
outlet_temp = (case_data["CST"]["outlet_temp_degF"] - 32) / (9/5)
174174
user_defined_inputs["h_tank_in"] = defaults["h_tank"]
175175
user_defined_inputs["f_htfmin"] = 0.0
176176
user_defined_inputs["f_htfmax"] = 1.0
177177
if !haskey(user_defined_inputs, "T_loop_in_des")
178-
user_defined_inputs["T_loop_in_des"] = inlet_temp
178+
user_defined_inputs["T_loop_in_des"] = outlet_temp
179179
end
180180
if !haskey(user_defined_inputs, "T_loop_out")
181-
user_defined_inputs["T_loop_out"] = outlet_temp
181+
user_defined_inputs["T_loop_out"] = inlet_temp + 50
182182
end
183183
if !haskey(user_defined_inputs, "T_tank_hot_inlet_min")
184-
user_defined_inputs["T_tank_hot_inlet_min"] = outlet_temp - 50
184+
user_defined_inputs["T_tank_hot_inlet_min"] = inlet_temp + 40
185185
end
186186
if !haskey(user_defined_inputs, "hot_tank_Thtr")
187-
user_defined_inputs["hot_tank_Thtr"] = outlet_temp - 10
187+
user_defined_inputs["hot_tank_Thtr"] = inlet_temp + 40
188188
end
189189
if !haskey(user_defined_inputs, "cold_tank_Thtr")
190-
user_defined_inputs["cold_tank_Thtr"] = inlet_temp - 10
190+
user_defined_inputs["cold_tank_Thtr"] = outlet_temp - 10
191191
end
192192
if !haskey(user_defined_inputs, "lat")
193193
user_defined_inputs["lat"] = lat

0 commit comments

Comments
 (0)