Skip to content

Commit 51ac2e3

Browse files
committed
brought constraints over
1 parent 8369e69 commit 51ac2e3

File tree

3 files changed

+482
-82
lines changed

3 files changed

+482
-82
lines changed

src/libs/pestpp_common/SQP.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2097,15 +2097,15 @@ pair<Eigen::VectorXd, Eigen::VectorXd> SeqQuadProgram::calc_search_direction_vec
20972097

20982098
//message(1, "hessian:", hessian); // tmp
20992099
Mat constraint_mat;
2100-
if (use_ensemble_grad) {
2100+
/*if (use_ensemble_grad) {
21012101
message(1, "getting ensemble-based working set constraint matrix");
21022102
constraint_mat = constraints.get_working_set_constraint_matrix(current_ctl_dv_values, current_obs, dv, oe,true);
21032103
}
21042104
else
21052105
{
21062106
message(2, "getting working set constraint matrix");
21072107
constraint_mat = constraints.get_working_set_constraint_matrix(current_ctl_dv_values, current_obs, jco, true);
2108-
}
2108+
}*/
21092109
//todo:probably need to check if constraint_mat has any nonzeros?
21102110
vector<string> cnames = constraint_mat.get_row_names();
21112111

0 commit comments

Comments
 (0)