diff --git a/benchmarks/basic_tests.py b/benchmarks/basic_tests.py index ba6b56fc..0ae729ea 100644 --- a/benchmarks/basic_tests.py +++ b/benchmarks/basic_tests.py @@ -1491,7 +1491,7 @@ def sweep_bin_test(): #prep_ends() #sweep_bin_test() #mf6_v5_sen_test() - ext_stdcol_test() + #ext_stdcol_test() #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-glm.exe"),os.path.join("..","bin","win","pestpp-glm.exe")) #shutil.copy2(os.path.join("..", "exe", "windows", "x64", "Debug", "pestpp-ies.exe"), # os.path.join("..", "bin", "win", "pestpp-ies.exe")) @@ -1529,7 +1529,7 @@ def sweep_bin_test(): #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-ies.exe"),os.path.join("..","bin","win","pestpp-ies.exe")) #tplins1_test() - #fr_timeout_test() + fr_timeout_test() #mf6_v5_ies_test() #mf6_v5_sen_test() diff --git a/src/libs/pestpp_common/EnsembleMethodUtils.cpp b/src/libs/pestpp_common/EnsembleMethodUtils.cpp index 374afa38..aa260072 100644 --- a/src/libs/pestpp_common/EnsembleMethodUtils.cpp +++ b/src/libs/pestpp_common/EnsembleMethodUtils.cpp @@ -5225,13 +5225,16 @@ void EnsembleMethod::initialize(int cycle, bool run, bool use_existing) ss.str(""); ss << " WARNING: Prior-data conflict detected. Continuing with IES parameter" << endl; ss << " adjustment will likely result in parameter and forecast bias." << endl; - ss << " Consider using 'ies_drop_conflicts' as a quick fix."; + //ss << " Consider using 'ies_drop_conflicts' as a quick fix."; message(1, ss.str()); } else { - - //check that all obs are in conflict + ss.str(""); + ss << " WARNING: 'ies_drop_conflicts' is not an ideal approach. A better" << endl; + ss << " approach would be to dig in and figure out why these observations " << endl; + ss << " are in conflict." << endl; + //check that all obs are in conflict message(1, "dropping conflicted observations"); if (in_conflict.size() == act_obs_names.size()) {