[Yt-svn] yt-commit r1294 - trunk/yt/lagos/hop

[sskory at wrangler.dreamhost.com]

Author: sskory
Date: Wed May  6 09:22:29 2009
New Revision: 1294
URL: http://yt.spacepope.org/changeset/1294

Log:
This appears to have been omitted.

Added:
   trunk/yt/lagos/hop/hop_numpy.h
Modified:
   trunk/yt/lagos/hop/hop_hop.c
   trunk/yt/lagos/hop/hop_regroup.c

Modified: trunk/yt/lagos/hop/hop_hop.c
==============================================================================
--- trunk/yt/lagos/hop/hop_hop.c	(original)
+++ trunk/yt/lagos/hop/hop_hop.c	Wed May  6 09:22:29 2009
@@ -64,7 +64,7 @@
 	
    	nBucket = 16;
 	nSmooth = 64;
-	nDens = 64;
+	nDens = 32;
 	nHop = -1;
 /*    fDensThresh = 3.0; */
     fDensThresh = -1.0;

Added: trunk/yt/lagos/hop/hop_numpy.h
==============================================================================
--- (empty file)
+++ trunk/yt/lagos/hop/hop_numpy.h	Wed May  6 09:22:29 2009
@@ -0,0 +1,12 @@
+#ifndef _NUMPY_HOP_H
+#include "Python.h"
+#include "numpy/ndarrayobject.h"
+
+#define NP_DENS(kd, in) \
+    *(npy_float64*)PyArray_GETPTR1(kd->np_densities, kd->p[in].np_index)
+#define NP_POS(kd, in, dim) \
+    *(npy_float64*)PyArray_GETPTR1(kd->np_pos[dim], kd->p[in].np_index)
+#define NP_MASS(kd, in) \
+    (*(npy_float64*)PyArray_GETPTR1(kd->np_masses, kd->p[in].np_index))/kd->totalmass
+
+#endif

Modified: trunk/yt/lagos/hop/hop_regroup.c
==============================================================================
--- trunk/yt/lagos/hop/hop_regroup.c	(original)
+++ trunk/yt/lagos/hop/hop_regroup.c	Wed May  6 09:22:29 2009
@@ -194,8 +194,8 @@
     if (c->mingroupsize >= 0 && !c->qsort)
 	myerror("Imposition of a certain group size occurs within the sort routine.");
     if (c->qsort && c->mingroupsize < 0) {
-	mywarn("No minimum group size specified.  Assuming 10 particles.");
-	c->mingroupsize = 10;
+	mywarn("No minimum group size specified.  Assuming 2 particles.");
+	c->mingroupsize = 2;
     }
  
     if (c->densthresh<MINDENS) c->densthresh=MINDENS;