Skip to content

Commit 80b596e

Browse files
authored
Merge pull request #343 from mmorphew/master
Change enforce_par_limits to clamp offending parameters rather than universally shrink the upgrade vector.
2 parents 029a127 + 8a84187 commit 80b596e

File tree

3 files changed

+266
-157
lines changed

3 files changed

+266
-157
lines changed

benchmarks/basic_tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ def tie_by_group_test():
260260
assert jco.shape[1] == 2,jco.shape
261261
par_df = pyemu.pst_utils.read_parfile(os.path.join(m_d,"pest_tied.par"))
262262
print(par_df)
263+
print(tied_names)
263264
too_low = par.loc[par_df.parval1 < par.parlbnd,"parnme"]
264265
assert too_low.shape[0] == 0,too_low
265266
too_high = par.loc[par_df.parval1 > par.parubnd, "parnme"]

src/libs/pestpp_common/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ OBJECTS := \
3333
linear_analysis\
3434
covariance \
3535
constraints \
36-
EnsembleMethodUtils
36+
EnsembleMethodUtils \
37+
sequential_lp
3738
OBJECTS := $(addsuffix $(OBJ_EXT),$(OBJECTS))
3839

3940

0 commit comments

Comments
 (0)