Merge branch 'develop' into marine-cost-curve-updates

NREL · Nov 26, 2024 · 7616d40 · 7616d40
2 parents f28fc7d + dd1fe7e
commit 7616d40
Show file tree

Hide file tree

Showing 58 changed files with 53,684 additions and 3,798 deletions.
diff --git a/code_attic/cmod_tcstrough_physical_csp_solver.cpp b/code_attic/cmod_tcstrough_physical_csp_solver.cpp
@@ -780,7 +780,9 @@ class cm_trough_physical_csp_solver : public compute_module
             as_double("W_pb_design") / as_double("eta_ref"),  //[MWt]
             as_double("solar_mult"),                          //[-]
             0.0,		                                      //[MWht]
+            true,                                             //Use fixed tank height
             as_double("h_tank"),					          //[m]
+            0.0,                                              // No input diameter (it is calculated)
             as_double("u_tank"),					          //[W/m^2-K]
             as_integer("tank_pairs"),			              //[-]
             as_double("hot_tank_Thtr"),		                  //[C]

diff --git a/code_attic/cmod_trough_physical_iph_old.cpp b/code_attic/cmod_trough_physical_iph_old.cpp
@@ -724,7 +724,9 @@ class cm_trough_physical_process_heat : public compute_module
             c_heat_sink.ms_params.m_q_dot_des / 1.0,  //[MWt]
             as_double("solar_mult"),                  //[-]
             c_heat_sink.ms_params.m_q_dot_des / 1.0 * as_double("tshours"), //[hr]
+            true,
 		    as_double("h_tank"),		              //[m]
+            0.0,
 		    as_double("u_tank"),		              //[W/m^2-K]
 		    as_integer("tank_pairs"),		          //[-]
 		    as_double("hot_tank_Thtr"),	              //[C]