Commits

Rio Yokota committed 54964a1

Changing back default parameters.

Comments (0)

Files changed (2)

 #EQUATION = Stokes (not available yet)
 
 ### choose basis of multipole/local expansion
-#BASIS	= Cartesian
-BASIS	= Spherical
+BASIS	= Cartesian
+#BASIS	= Spherical
 #BASIS	= Planewave (not available yet)
 
 ### choose device to use
 ### Base flags
 CXX	+= -I../include
 LFLAGS	+= -D$(BASIS)
-LFLAGS  += -DEXPANSION=15 # Specifcy expansion order
+LFLAGS  += -DEXPANSION=3 # Specifcy expansion order
 ifeq ($(BASIS),Cartesian)
-#LFLAGS	+= -DCOMcenter # Use center of mass as center of expansion
-#LFLAGS	+= -DCOMkernel # Use center of mass kernel that skips dipoles (Use with -DCOMcenter)
+LFLAGS	+= -DCOMcenter # Use center of mass as center of expansion
+LFLAGS	+= -DCOMkernel # Use center of mass kernel that skips dipoles (Use with -DCOMcenter)
 endif
-#LFLAGS	+= -DERROR_OPT # Use error optimized theta
-#LFLAGS	+= -DUSE_BMAX # Use Bmax in multipole acceptance criteria
-#LFLAGS	+= -DUSE_RMAX # Use Rmax in multipole acceptance criteria
+LFLAGS	+= -DERROR_OPT # Use error optimized theta
+LFLAGS	+= -DUSE_BMAX # Use Bmax in multipole acceptance criteria
+LFLAGS	+= -DUSE_RMAX # Use Rmax in multipole acceptance criteria
 LFLAGS	+= -DDUAL # Use dual tree traversal (turn off every option above before turning this off)
 #LFLAGS	+= -DAUTO # Use autotuned selection between P2P or M2L (needs improvement)
-LFLAGS	+= -DFP64 # Use double precision
+#LFLAGS	+= -DFP64 # Use double precision
 #LFLAGS	+= -DKAHAN # Use Kahan summation   
 
 ### Debugging flags

examples/Makefile

 # Test for serial FMM
 serial: serial.o $(OBJECTS)
 	$(CXX) $? $(LFLAGS)
-	./a.out --numBodies 1000
+	./a.out
 
 # Test for parallel FMM
 parallel: parallel.o $(OBJECTS)