Skip to content

Commit dd4b51f

Browse files
jdubjdub
authored andcommitted
Merge remote-tracking branch 'origin/develop'
2 parents 7a4235a + f9f8a06 commit dd4b51f

4 files changed

Lines changed: 188 additions & 15 deletions

File tree

src/libs/common/config_os.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define CONFIG_OS_H_
33

44

5-
#define PESTPP_VERSION "5.1.15";
5+
#define PESTPP_VERSION "5.1.16";
66

77
#if defined(_WIN32) || defined(_WIN64)
88
#define OS_WIN

src/libs/pestpp_common/EnsembleMethodUtils.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5299,8 +5299,12 @@ bool EnsembleMethod::solve(bool use_mda, vector<double> inflation_factors, vecto
52995299
vector<int> fails = run_ensemble(remaining_pe_lam, remaining_oe_lam,vector<int>(),cycle);
53005300

53015301
//for testing
5302-
if (pest_scenario.get_pestpp_options().get_ies_debug_fail_remainder())
5303-
fails.push_back(0);
5302+
if (pest_scenario.get_pestpp_options().get_ies_debug_fail_remainder()) {
5303+
ss.str("");
5304+
ss << "ies_debug_fail_remainder is True, failing par:obs realization " << org_pe_idxs[0] << ":" << org_oe_idxs[0];
5305+
message(0,ss.str());
5306+
fails.push_back(0);
5307+
}
53045308

53055309
//if any of the remaining runs failed
53065310
if (fails.size() == org_pe_idxs.size())

0 commit comments

Comments
 (0)