fixing zero receiver start-up time dispatch error

NREL · Dec 14, 2023 · b510584 · b510584
1 parent 804726c
commit b510584
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tcs/base_dispatch.cpp b/tcs/base_dispatch.cpp
@@ -335,7 +335,7 @@ void base_dispatch_opt::set_lp_solve_outputs(lprec* lp)
         lp_outputs.rel_mip_gap = get_mip_gap(lp, FALSE);
 
     // Set suboptimal state flag
-    if ((lp_outputs.solve_state == SUBOPTIMAL) & (solver_params.is_abort_flag)) {
+    if ((lp_outputs.solve_state == SUBOPTIMAL) && (solver_params.is_abort_flag)) {
         if (lp_outputs.solve_iter > solver_params.max_bb_iter) {
             lp_outputs.subopt_flag = INTERATION;    // stop due to iteration count
         }

diff --git a/tcs/csp_dispatch.cpp b/tcs/csp_dispatch.cpp
@@ -405,7 +405,7 @@ static void calculate_parameters(csp_dispatch_opt *optinst, unordered_map<std::s
             optinst->params.wnet_lim_min.at(t) =  wmin - max_parasitic;
             if( t < nt-1 )
             {
-                double delta_rec_startup = (std::min)(1., (std::max)(optinst->params.e_rec_startup / (std::max)(optinst->params.q_sfavail_expected.at(t + 1)*pars["delta"], 1.), optinst->params.dt_rec_startup / pars["delta"]));
+                double delta_rec_startup = (std::min)(1., (std::max)(optinst->params.e_rec_startup / (std::max)(optinst->params.q_sfavail_expected.at(t + 1)*pars["delta"], 1.), (std::max)(optinst->params.dt_rec_startup / pars["delta"], 1.e-6)));
                 optinst->params.delta_rs.at(t) = delta_rec_startup;
             }
         }
@@ -737,7 +737,7 @@ bool csp_dispatch_opt::optimize()
                 }
 
                 // Receiver startup only during solar positive periods
-                // TODO: This relies on presolve to remove variables (might want to great a special set of solar hours)
+                // TODO: This relies on presolve to remove variables (might want to get a special set of solar hours)
                 // yrsu[t] <= 0 when Qin[t] = 0
                 {
                     i = 0;