Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jdub authored and jdub committed Mar 30, 2022
2 parents 7a4235a + f9f8a06 commit dd4b51f
Show file tree
Hide file tree
Showing 4 changed files with 188 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/libs/common/config_os.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define CONFIG_OS_H_


#define PESTPP_VERSION "5.1.15";
#define PESTPP_VERSION "5.1.16";

#if defined(_WIN32) || defined(_WIN64)
#define OS_WIN
Expand Down
8 changes: 6 additions & 2 deletions src/libs/pestpp_common/EnsembleMethodUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5299,8 +5299,12 @@ bool EnsembleMethod::solve(bool use_mda, vector<double> inflation_factors, vecto
vector<int> fails = run_ensemble(remaining_pe_lam, remaining_oe_lam,vector<int>(),cycle);

//for testing
if (pest_scenario.get_pestpp_options().get_ies_debug_fail_remainder())
fails.push_back(0);
if (pest_scenario.get_pestpp_options().get_ies_debug_fail_remainder()) {
ss.str("");
ss << "ies_debug_fail_remainder is True, failing par:obs realization " << org_pe_idxs[0] << ":" << org_oe_idxs[0];
message(0,ss.str());
fails.push_back(0);
}

//if any of the remaining runs failed
if (fails.size() == org_pe_idxs.size())
Expand Down
Loading

0 comments on commit dd4b51f

Please sign in to comment.