fix for default to no noise

jtwhite79 · May 2, 2024 · 12c1a2c · 12c1a2c
1 parent 5c11b5b
commit 12c1a2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/benchmarks/basic_tests.py b/benchmarks/basic_tests.py
@@ -821,6 +821,7 @@ def ext_stdcol_test():
     par.loc[pst.adj_par_names,"standard_deviation"] = (par.loc[pst.adj_par_names,"parubnd_trans"] - par.loc[pst.adj_par_names,"parlbnd_trans"]) / 4.0
     #par.loc[pst.adj_par_names[0],"mean"] = par.loc[pst.adj_par_names[0],"parubnd"]
     pst.pestpp_options["ies_num_reals"] = 10
+    pst.pestpp_options["ies_no_noise"] = False
     pst.control_data.noptmax = -1
     pst.write(os.path.join(m_d,"pest_base.pst"))
     pyemu.os_utils.run("{0} pest_base.pst".format(exe_path),cwd=m_d)
@@ -1488,8 +1489,9 @@ def sweep_bin_test():
     #run()
     #mf6_v5_ies_test()
     #prep_ends()
-    sweep_bin_test()
+    #sweep_bin_test()
     #mf6_v5_sen_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"))

diff --git a/src/libs/pestpp_common/EnsembleMethodUtils.cpp b/src/libs/pestpp_common/EnsembleMethodUtils.cpp
@@ -5685,12 +5685,15 @@ void EnsembleMethod::initialize(int cycle, bool run, bool use_existing)
         reset_to_nonoise = false;
     else if (!ppo->get_obscov_filename().empty())
         reset_to_nonoise = false;
+    else if (ppo->get_ies_use_mda())
+        reset_to_nonoise = false;
     else
     {
         map<string, double> obs_std = pest_scenario.get_ext_file_double_map("observation data external", "standard_deviation");
         if (obs_std.size() > 0)
             reset_to_nonoise = false;
     }
+
     if (reset_to_nonoise)
     {
         ss.str("");