Merge branch 'devel' of github.com:EXP-code/EXP into devel

Author: Martin D. Weinberg

include/cudaParticle.cuH

@@ -90,8 +90,12 @@ extern __host__
 std::ostream& operator<< (std::ostream& os, const cudaParticle& p);
 
 //! Functor for extracting level info from cudaParticle structures
+#if CUDART_VERSION < 12040
 struct cuPartToLevel :
   public thrust::unary_function<cudaParticle, unsigned int>
+#else
+struct cuPartToLevel
+#endif
 {
   int _t;
 
@@ -106,8 +110,12 @@ struct cuPartToLevel :
 };
 
 //! Functor for extracting change level info from cudaParticle structures
+#if CUDART_VERSION < 12040
 struct cuPartToChange :
   public thrust::unary_function<cudaParticle, thrust::pair<int, int>>
+#else
+struct cuPartToChange
+#endif
 {
   __host__ __device__
   thrust::pair<int, int> operator()(const cudaParticle& p) const

src/user/CMakeLists.txt

@@ -31,7 +31,7 @@ if(ENABLE_CUDA)
   #   UserLogPot.cc UserMNdisk.cc UserMW.cc UserTest.cc UserTestCuda.cc 
   #   PROPERTIES LANGUAGE CUDA)
   set(cudatest_SRC UserTestCuda.cc cudaUserTest.cu)
-  list(APPEND barSRC cudaUserBar.cu)
+  list(APPEND bar_SRC cudaUserBar.cu)
 endif()
 
 foreach(mlib ${USER_MODULES})

src/user/UserBar.H

@@ -24,7 +24,7 @@ class UserBar : public ExternalForce
 {
 private:
 
-  string angm_name, ctr_name;
+  std::string angm_name, ctr_name;
   Component *c0, *c1;
 
   void determine_acceleration_and_potential(void);

src/user/cudaUserBar.cu

@@ -4,7 +4,7 @@
 #include <cudaReduce.cuH>
 
 #include <Component.H>
-#include "UserSat.H"
+#include "UserBar.H"
 
 // Global device symbols for CUDA kernel
 //
@@ -55,13 +55,13 @@ userBarForceKernel(dArray<cudaParticle> P, dArray<int> I,
       cuFP_t pp = (xx*xx - yy*yy)*cos2p + 2.0*xx*yy*sin2p;
 
       if (userBarSoft) {
-	fac = 1.0 + rr/b5;
+	fac = 1.0 + rr/userBarB5;
 	ffac = -userBarAmp / pow(fac, 6.0);
-	nn = pp / (b5*rr);
+	nn = pp / (userBarB5*rr);
       } else {
-	fac = 1.0 + pow(rr/b5, 5.0);
+	fac = 1.0 + pow(rr/userBarB5, 5.0);
 	ffac = -userBarAmp / (fac*fac);
-	nn = pp * pow(rr/b5, 3.0)/ (b5*b5);
+	nn = pp * pow(rr/userBarB5, 3.0)/ (userBarB5*userBarB5);
       }
 
       // Add acceleration
@@ -80,14 +80,13 @@ userBarForceKernel(dArray<cudaParticle> P, dArray<int> I,
 
 
 __global__
-void testConstantsUserSat(cuFP_t tnow)
+void testConstantsUserBar(cuFP_t tnow)
 {
   printf("-------------------------\n");
-  printf("---UserSat constants-----\n");
+  printf("---UserBar constants-----\n");
   printf("-------------------------\n");
   printf("   Time   = %e\n", tnow          );
   printf("   Amp    = %e\n", userBarAmp    );
-  printf("   Amp    = %e\n", userBarNumFac );
   printf("   b5     = %e\n", userBarB5     );
   printf("   Center = %e, %e, %e\n",
 	 userBarCen[0], userBarCen[1], userBarCen[2] );
@@ -96,26 +95,17 @@ void testConstantsUserSat(cuFP_t tnow)
   printf("-------------------------\n");
 }
 
-void UserBar::determine_acceration_and_potential_cuda()
+void UserBar::determine_acceleration_and_potential_cuda()
 {
   // Sanity check
   //
   int nbodies = cC->Number();
   if (nbodies != static_cast<int>(cC->Particles().size())) {
-    std::cerr << "UserSat: ooops! number=" << nbodies
+    std::cerr << "UserBar: ooops! number=" << nbodies
 	      << " but particle size=" << cC->Particles().size() << endl;
     nbodies = static_cast<int>(cC->Particles().size());
   }
 
-  if (nbodies==0) {		// Return if there are no particles
-    if (verbose) {
-      cout << "Process " << myid << ": in UserBar, nbodies=0" 
-	   << " for Component <" << cC->name << "> at T=" << tnow
-	   << endl;
-    }
-    return;
-  }
-
   double amp = afac * numfac * amplitude/fabs(amplitude) 
     * 0.5*(1.0 + erf( (tnow - Ton )/DeltaT ))
     * 0.5*(1.0 - erf( (tnow - Toff)/DeltaT )) ;
@@ -134,8 +124,6 @@ void UserBar::determine_acceration_and_potential_cuda()
   cuFP_t ctr[3], dtmp;
   for (int k=0; k<3; k++) ctr[k] = cn[k];
 
-  cuFP_t dtmp;
-
   cuda_safe_call(cudaMemcpyToSymbol(userBarAmp, &(dtmp=amp), sizeof(cuFP_t),
 				    size_t(0), cudaMemcpyHostToDevice),
 		 __FILE__, __LINE__, "Error copying userBarAmp");