a few lil fixes

Author: jtwhite79

CMakeLists.txt

@@ -1,6 +1,6 @@
 # This is the top-level CMake file for PEST++
 cmake_minimum_required(VERSION 3.15)
-
+set(CMAKE_VERBOSE_MAKEFILE,ON)
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_compile_definitions(_DEBUG)
 endif()

benchmarks/ies_test_part4.py

@@ -5031,11 +5031,48 @@ def large_invest():
     pyemu.os_utils.run("{0} pest.pst /e".format(exe_path),cwd=t_d)
 
 
+def tenpar_xsec_combined_autoadaloc_mm_stress_test():
+    """testing combined matrix + autoadaloc"""
+    model_d = "ies_10par_xsec"
+    test_d = os.path.join(model_d, "master_comb_aal_test1")
+    template_d = os.path.join(model_d, "test_template")
+
+    if not os.path.exists(template_d):
+        raise Exception("template_d {0} not found".format(template_d))
+    pst_name = os.path.join(template_d, "pest.pst")
+    pst = pyemu.Pst(pst_name)
+
+    if os.path.exists(test_d):
+        shutil.rmtree(test_d)
+    shutil.copytree(template_d, test_d)
+    pst.pestpp_options = {}
+    pst.pestpp_options["ies_num_reals"] = 30
+    
+    mat = pyemu.Matrix.from_names(pst.nnz_obs_names, pst.adj_par_names).to_dataframe()
+    mat.loc[:, :] = 1
+    mat.loc[:, pst.adj_par_names[::2]] = 0
+    pyemu.Matrix.from_dataframe(mat).to_ascii(os.path.join(template_d, "loc.mat"))
 
+    pst.pestpp_options["ies_localizer"] = "loc.mat"
+    pst.pestpp_options["ies_autoadaloc"] = True
+    pst.pestpp_options["ies_verbose_level"] = 3
+    pst.pestpp_options["ies_debug_fail_remainder"] = True
+    pst.pestpp_options["ies_debug_fail_subset"] = True
+    pst.pestpp_options["ies_debug_bad_phi"] = True
+    pst.pestpp_options["ies_multimodal_alpha"] = 0.99
+    
+    pst.control_data.noptmax = 3
 
+    pst.write(os.path.join(template_d, "pest_aal_restart.pst"))
+    pyemu.os_utils.start_workers(template_d, exe_path, "pest_aal_restart.pst", num_workers=10,
+                                 master_dir=test_d, verbose=True, worker_root=model_d,
+                                 port=port)
+    
 
 if __name__ == "__main__":
-    tenpar_adjust_weights_test()
+    tenpar_xsec_combined_autoadaloc_mm_stress_test()
+
+    #tenpar_adjust_weights_test()
     #large_invest()
     #tenpar_fixed_transform_test()
     #tenpar_reg_factor_test()

scripts/build_pestpp_mac_arm.sh

@@ -11,7 +11,7 @@ cd "$script_path"/..
 rm -rfd build
 mkdir build
 cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DFORCE_STATIC=OFF ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fsanitize=address -fno-omit-frame-pointer" -DCMAKE_EXE_LINKER_FLAGS="-fsanitize=address" -DCMAKE_CXX_COMPILER=g++ -DFORCE_STATIC=OFF ..
 make -j
 cpack -G TGZ
 cp *.tar.gz ../

src/libs/pestpp_common/EnsembleMethodUtils.cpp

@@ -297,7 +297,7 @@ void EnsembleSolver::update_multimodal_components(const double mm_alpha) {
 	}
     performance_log->log_event("getting phi vectors for all weights");
     map<string,map<string,double>> weight_phi_map = ph.get_meas_phi_weight_ensemble(oe,weights);
-    //int verbose_level = pest_scenario.get_pestpp_options().get_ies_verbose_level();
+    //int verbose_level = pest_scenario.get_loading par ensemble from binary filepestpp_options().get_ies_verbose_level();
     if (num_threads > 1)
     {
         performance_log->log_event("starting multithreaded MM neighbor calcs");
@@ -321,7 +321,7 @@ void EnsembleSolver::update_multimodal_components(const double mm_alpha) {
             exception_ptrs.push_back(exception_ptr());
         }
         for (int i = 0; i < num_threads; i++) {
-            threads.push_back(thread(mm_neighbor_thread_function, i, verbose_level, mm_alpha, weight_phi_map,preal_names,
+        	threads.push_back(thread(mm_neighbor_thread_function, i, verbose_level, mm_alpha, weight_phi_map,preal_names,
                                      oreal_names, parcov_inv, real_map, std::ref(*ut_ptr), std::ref(exception_ptrs[i])));
         }
 
@@ -1101,6 +1101,7 @@ void EnsembleSolver::solve(int num_threads, double cur_lam, bool use_glm_form, P
 	{
 		//worker.work(0, iter, cur_lam, use_glm_form, act_par_names, act_obs_names);
 		ut_ptr->work(0, iter, cur_lam, use_glm_form, act_par_names, act_obs_names);
+		delete ut_ptr;
 	}
 	else
 	{
@@ -8087,7 +8088,7 @@ void EnsembleMethod::message(int level, const string& _message, string extra, bo
 	stringstream ss;
 	ss << _message << " " << extra;
 	string s = ss.str();
-	message(level, s, echo);
+	message(level, s, vector<string>(),echo);
 }
 
 void EnsembleMethod::message(int level, const string& _message, int extra)
@@ -8205,12 +8206,12 @@ bool EnsembleMethod::initialize_pe(Covariance& cov)
 			}
 			catch (const exception& e)
 			{
-				ss << "error processing par jcb: " << e.what();
+				ss << "error processing par binary file: " << e.what();
 				throw_em_error(ss.str());
 			}
 			catch (...)
 			{
-				throw_em_error(string("error processing par jcb"));
+				throw_em_error(string("error processing par binary file"));
 			}
 		}
 		else

src/libs/pestpp_common/EnsembleMethodUtils.h

@@ -291,7 +291,7 @@ class MmUpgradeThread
     unordered_map<string, Eigen::VectorXd>& weight_map;
 
     unordered_map<string, Eigen::VectorXd>& par_resid_map, & par_diff_map;
-    unordered_map<string, Eigen::VectorXd>& obs_resid_map, & obs_diff_map, obs_err_map;
+    unordered_map<string, Eigen::VectorXd>& obs_resid_map, & obs_diff_map, & obs_err_map;
 
     mutex ctrl_lock, weight_lock, loc_lock, parcov_lock;
     mutex obs_resid_lock, obs_diff_lock, par_resid_lock;
@@ -334,7 +334,7 @@ class UpgradeThread
 	unordered_map<string, double>& weight_map;
 
 	unordered_map<string, Eigen::VectorXd>& par_resid_map, & par_diff_map, & Am_map;
-	unordered_map<string, Eigen::VectorXd>& obs_resid_map, & obs_diff_map, obs_err_map;
+	unordered_map<string, Eigen::VectorXd>& obs_resid_map, & obs_diff_map, &obs_err_map;
 
 	mutex ctrl_lock, weight_lock, loc_lock, parcov_lock;
 	mutex obs_resid_lock, obs_diff_lock, par_resid_lock;