remove debug messages, copy lambda selection code to svda solver

Author: Michael Morphew

src/libs/pestpp_common/SVDASolver.cpp

@@ -470,7 +470,7 @@ ModelRun SVDASolver::iteration_upgrd(RunManagerAbstract &run_manager, Terminatio
 			}
 		}
 
-		vector<double> lambda_vec = base_lambda_vec;
+		vector<double> lambda_vec = pest_scenario.get_pestpp_options().get_base_lambda_vec();
 		std::sort(lambda_vec.begin(), lambda_vec.end());
 		auto iter = std::unique(lambda_vec.begin(), lambda_vec.end());
 		lambda_vec.resize(std::distance(lambda_vec.begin(), iter));
@@ -699,6 +699,45 @@ ModelRun SVDASolver::iteration_upgrd(RunManagerAbstract &run_manager, Terminatio
 	{
 		throw runtime_error("all upgrade runs failed");
 	}
+
+	// Check if best_lambda is at the edge of lambda_vec
+
+	// regrab lambda_vec
+	vector<double> lambda_vec = pest_scenario.get_pestpp_options().get_base_lambda_vec();	
+	std::sort(lambda_vec.begin(), lambda_vec.end());
+	auto iter = std::unique(lambda_vec.begin(), lambda_vec.end());
+	lambda_vec.resize(std::distance(lambda_vec.begin(), iter));
+
+	auto last_lambda = lambda_vec.back();
+	auto first_lambda = lambda_vec.front();
+	file_manager.rec_ofstream() << "Checking to see if best lambda is at the edge" << std::endl;
+	double lambda_spacing_factor = 10.0; // doing powers of 10 for now
+	bool extended = false;
+
+	if (best_lambda == last_lambda)
+	{
+		// Add a new larger lambda
+		double new_lambda = last_lambda * lambda_spacing_factor;
+		if (std::find(lambda_vec.begin(), lambda_vec.end(), new_lambda) == lambda_vec.end())
+		{
+			lambda_vec.push_back(new_lambda);
+			extended = true;
+			file_manager.rec_ofstream() << "*** Extending lambda_vec: added larger lambda " << new_lambda << std::endl;
+		}
+	}
+	else if (best_lambda == first_lambda)
+	{
+		// Add a new smaller lambda
+		double new_lambda = first_lambda / lambda_spacing_factor;
+		if (std::find(lambda_vec.begin(), lambda_vec.end(), new_lambda) == lambda_vec.end())
+		{
+			lambda_vec.push_back(new_lambda);
+			extended = true;
+			file_manager.rec_ofstream() << "*** Extending lambda_vec: added smaller lambda " << new_lambda << std::endl;
+		}
+	}
+	std::sort(lambda_vec.begin(), lambda_vec.end());
+	pest_scenario.get_pestpp_options_ptr()->set_base_lambda_vec(lambda_vec);
 	return best_upgrade_run;
 }
 

src/libs/pestpp_common/SVDSolver.cpp

@@ -1081,11 +1081,6 @@ ModelRun SVDSolver::iteration_upgrd(RunManagerAbstract &run_manager, Termination
 		auto iter = std::unique(lambda_vec.begin(), lambda_vec.end());
 		lambda_vec.resize(std::distance(lambda_vec.begin(), iter));
 
-		file_manager.rec_ofstream() << "DEBUG: lambda list at start of new iteration = ";
-		for (auto val : pest_scenario.get_pestpp_options().get_base_lambda_vec())
-			file_manager.rec_ofstream() << val << " ";
-		file_manager.rec_ofstream() << std::endl;
-
 		int i_update_vec = 0;
 		stringstream message;
 		stringstream prf_message;
@@ -1387,10 +1382,6 @@ ModelRun SVDSolver::iteration_upgrd(RunManagerAbstract &run_manager, Termination
 	std::sort(lambda_vec.begin(), lambda_vec.end());
 	pest_scenario.get_pestpp_options_ptr()->set_base_lambda_vec(lambda_vec);
 
-	file_manager.rec_ofstream() << "DEBUG: lambda list after extend = ";
-	for (auto val : pest_scenario.get_pestpp_options().get_base_lambda_vec())
-		file_manager.rec_ofstream() << val << " ";
-	file_manager.rec_ofstream() << std::endl;
 	return best_upgrade_run;
 }