Merge pull request #132 from adrn/template-quadls

A few tweaks to build exp with clang++ on mac via gala build

Author: The9Cat

expui/BiorthBasis.H

@@ -14,6 +14,7 @@
 #include <BiorthBess.H>
 #include <BasisFactory.H>
 #include <BiorthCube.H>
+#include <sltableMP2.H>
 #include <SLGridMP2.H>
 #include <YamlCheck.H>
 #include <BiorthCyl.H>

exputil/SLGridMP2.cc

@@ -696,6 +696,11 @@ SLGridSph::~SLGridSph()
 
 				// Members
 
+double SLGridSph::eigenvalue(int l, int n)
+{
+  return table.get()[l].ev[n];
+}
+
 double SLGridSph::r_to_xi(double r)
 {
   double ret;
@@ -2313,6 +2318,10 @@ SLGridSlab::~SLGridSlab()
   // Nothing
 }
 
+double SLGridSlab::eigenvalue(int kx, int ky, int n) {
+  return table.get()[kx].get()[ky].ev[n];
+}
+
 // Coordinate transformation member functions for tanh map
 double SLGridSlab::TanhMap::z_to_xi  (double z)  { return tanh(z/H);       }
 double SLGridSlab::TanhMap::xi_to_z  (double xi) { return H*atanh(xi);     }

include/PseudoAccel.H

@@ -63,17 +63,17 @@ public:
       if (queue.size()==Nsize) {
 
 	if (CENTER) {
-	  accel << 
-	    2.0*std::get<0>(QuadLS(t, x).coefs()),
-	    2.0*std::get<0>(QuadLS(t, y).coefs()),
-	    2.0*std::get<0>(QuadLS(t, z).coefs());
+	  accel <<
+	    2.0*std::get<0>(QuadLS<std::vector<double>>(t, x).coefs()),
+	    2.0*std::get<0>(QuadLS<std::vector<double>>(t, y).coefs()),
+	    2.0*std::get<0>(QuadLS<std::vector<double>>(t, z).coefs());
 	}
 
 	if (AXIS) {
-	  auto [a, b, c] = QuadLS(t, u).coefs();
-	  auto [d, e, f] = QuadLS(t, v).coefs();
-	  auto [g, h, i] = QuadLS(t, w).coefs();
-	  
+	  auto [a, b, c] = QuadLS<std::vector<double>>(t, u).coefs();
+	  auto [d, e, f] = QuadLS<std::vector<double>>(t, v).coefs();
+	  auto [g, h, i] = QuadLS<std::vector<double>>(t, w).coefs();
+
 	  double T = t.back();	// Last eval time
 
 	  Eigen::Vector3d n, dndt, d2ndt2;

include/SLGridMP2.H

@@ -129,7 +129,7 @@ public:
 				// Members
 
   //! Eigenvalue for index and harmonic order l
-  double eigenvalue(int l, int n) {return table[l].ev[n];}
+  double eigenvalue(int l, int n);
 
   //! Map radial coordinate to nondimensional coordinate
   double r_to_xi(double r);
@@ -396,12 +396,12 @@ public:
   //! Destructor
   ~SLGridSlab();
 
-  
+
   //@{
   //! Members
 
   //! Get n^th eigenvalue for given wave number indices
-  double eigenvalue(int kx, int ky, int n) {return table[kx][ky].ev[n];}
+  double eigenvalue(int kx, int ky, int n);
 
   //! Map from vertical coordinate to dimensionless coordinate
   double z_to_xi(double z)   { return mM->z_to_xi(z); }