Update SCTL

dmalhotra · May 23, 2024 · 1cedd36 · 1cedd36
1 parent 94e67c4
commit 1cedd36
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -113,15 +113,23 @@ subdirheaders_HEADERS = \
 												SCTL/include/sctl/comm.hpp \
 												SCTL/include/sctl/comm.txx \
 												SCTL/include/sctl/common.hpp \
+												SCTL/include/sctl/complex.hpp \
+												SCTL/include/sctl/complex.txx \
 												SCTL/include/sctl/fft_wrapper.hpp \
+												SCTL/include/sctl/fft_wrapper.txx \
 												SCTL/include/sctl/fmm-wrapper.hpp \
 												SCTL/include/sctl/fmm-wrapper.txx \
+												SCTL/include/sctl/generic-kernel.hpp \
+												SCTL/include/sctl/generic-kernel.txx \
 												SCTL/include/sctl/intrin-wrapper.hpp \
+												SCTL/include/sctl/iterator.hpp \
+												SCTL/include/sctl/iterator.txx \
 												SCTL/include/sctl/kernel_functions.hpp \
 												SCTL/include/sctl/lagrange-interp.hpp \
 												SCTL/include/sctl/lagrange-interp.txx \
 												SCTL/include/sctl/lapack.h \
-												SCTL/include/sctl/legendre_rule.hpp \
+												SCTL/include/sctl/lin-solve.hpp \
+												SCTL/include/sctl/lin-solve.txx \
 												SCTL/include/sctl/mat_utils.hpp \
 												SCTL/include/sctl/mat_utils.txx \
 												SCTL/include/sctl/math_utils.hpp \
@@ -131,24 +139,32 @@ subdirheaders_HEADERS = \
 												SCTL/include/sctl/mem_mgr.hpp \
 												SCTL/include/sctl/mem_mgr.txx \
 												SCTL/include/sctl/morton.hpp \
+												SCTL/include/sctl/morton.txx \
 												SCTL/include/sctl/ode-solver.hpp \
 												SCTL/include/sctl/ode-solver.txx \
 												SCTL/include/sctl/ompUtils.hpp \
 												SCTL/include/sctl/ompUtils.txx \
-												SCTL/include/sctl/parallel_solver.hpp \
+												SCTL/include/sctl/permutation.hpp \
+												SCTL/include/sctl/permutation.txx \
 												SCTL/include/sctl/profile.hpp \
 												SCTL/include/sctl/profile.txx \
 												SCTL/include/sctl/quadrule.hpp \
+												SCTL/include/sctl/quadrule.txx \
 												SCTL/include/sctl/slender_element.hpp \
 												SCTL/include/sctl/slender_element.txx \
 												SCTL/include/sctl/sph_harm.hpp \
 												SCTL/include/sctl/sph_harm.txx \
+												SCTL/include/sctl/sse2neon.h \
 												SCTL/include/sctl/stacktrace.h \
+												SCTL/include/sctl/static-array.hpp \
+												SCTL/include/sctl/static-array.txx \
 												SCTL/include/sctl/tensor.hpp \
+												SCTL/include/sctl/tensor.txx \
 												SCTL/include/sctl/tree.hpp \
 												SCTL/include/sctl/tree.txx \
 												SCTL/include/sctl/vec-test.hpp \
 												SCTL/include/sctl/vec.hpp \
+												SCTL/include/sctl/vec.txx \
 												SCTL/include/sctl/vector.hpp \
 												SCTL/include/sctl/vector.txx \
 												SCTL/include/sctl/vtudata.hpp \

diff --git a/SCTL b/SCTL
diff --git a/examples/src/example-sctl.cpp b/examples/src/example-sctl.cpp
@@ -63,7 +63,7 @@ template <class Real> void test_particle_fmm(const Comm& comm) {
     StaticArray<Real,2> loc_err{0,0}, glb_err{0,0};
     for (const auto& a : Uerr) loc_err[0] = std::max<Real>(loc_err[0], fabs(a));
     for (const auto& a : Uref) loc_err[1] = std::max<Real>(loc_err[1], fabs(a));
-    comm.Allreduce<Real>(loc_err, glb_err, 2, Comm::CommOp::MAX);
+    comm.Allreduce<Real>(loc_err, glb_err, 2, CommOp::MAX);
     if (!comm.Rank()) std::cout<<"Maximum relative error: "<<glb_err[0]/glb_err[1]<<'\n';
   }
 }

diff --git a/examples/src/example2-c.c b/examples/src/example2-c.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <pvfmm.h>
 
-void fn_input(const double* coord, long n, double* out, void* ctx){ //Input function
+void fn_input(const double* coord, long n, double* out, const void* ctx){ //Input function
   int dof=3;
   double L=125;
   for(int i=0;i<n;i++){
@@ -17,7 +17,7 @@ void fn_input(const double* coord, long n, double* out, void* ctx){ //Input func
     }
   }
 }
-void fn_poten(const double* coord, long n, double* out, void* ctx){ //Output potential
+void fn_poten(const double* coord, long n, double* out, const void* ctx){ //Output potential
   int dof=3;
   double L=125;
   for(int i=0;i<n;i++){