More fixes for the CTests branch divergence blunder. Most be close.

EXP-code · Dec 29, 2023 · c9bc3ab · c9bc3ab
1 parent 2771cc3
commit c9bc3ab
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/coefs/BiorthBasis.H b/coefs/BiorthBasis.H
@@ -15,6 +15,7 @@
 #include <BiorthCyl.H>
 #include <EmpCylSL.H>
 #include <localmpi.H>
+#include <exputils.H>
 
 namespace Field
 {

diff --git a/exputil/orthoTest.cc b/exputil/orthoTest.cc
@@ -13,15 +13,17 @@
 #include <localmpi.H>		// MPI support
 #include <libvars.H>		// For orthoTol
 
-void orthoTest(const std::vector<Eigen::MatrixXd>& tests,
-	       const std::string& classname, const std::string& indexname)
+// Compute the orthogonality of a list of matrices and gather stats
+//
+std::tuple<bool, double, std::vector<double>>
+orthoCompute(const std::vector<Eigen::MatrixXd>& tests)
 {
   // Number of possible threads
   int nthrds = omp_get_max_threads();
 
   // Worst so far
   std::vector<double> worst(nthrds), lworst(tests.size());
-
+  
   // Rank
   int nmax = tests[0].rows();
 
@@ -51,8 +53,21 @@ void orthoTest(const std::vector<Eigen::MatrixXd>& tests,
   // END: harmonic order loop
 
   double worst_ever = *std::max_element(lworst.begin(), lworst.end());
+  bool good = true;
+  if (worst_ever > __EXP__::orthoTol) good = false;
+
+  return {good, worst_ever, lworst};
+}
 
-  if (worst_ever > __EXP__::orthoTol) {
+// Digest the stats from orthoCompute and report
+//
+void orthoTest(const std::vector<Eigen::MatrixXd>& tests,
+	       const std::string& classname, const std::string& indexname)
+{
+
+  auto [good, worst, lworst] = orthoCompute(tests);
+
+  if (not good) {
     std::cout << classname << ": orthogonality failure" << std::endl
 	      << std::right
 	      << std::setw(4) << indexname
@@ -67,4 +82,3 @@ void orthoTest(const std::vector<Eigen::MatrixXd>& tests,
       std::cout << classname + ": biorthogonal check passed" << std::endl;
   }
 }
-
diff --git a/include/exputils.H b/include/exputils.H
@@ -6,6 +6,9 @@
 #include <string>
 #include <Eigen/Eigen>
 
+std::tuple<bool, double, std::vector<double>>
+orthoCompute(const std::vector<Eigen::MatrixXd>& tests);
+
 void orthoTest(const std::vector<Eigen::MatrixXd>& tests,
 	       const std::string& classname, const std::string& indexname);