[Yt-svn] yt-commit r612 - branches/yt-generalization/yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Mon Jun 23 17:15:30 2008
New Revision: 612
URL: http://yt.spacepope.org/changeset/612

Log:
Turning back on the ValueError in the projection code ... because ... Orion
projection now works!!


Mathematical correctness!



Modified:
   branches/yt-generalization/yt/lagos/BaseDataTypes.py
   branches/yt-generalization/yt/lagos/PointCombine.c

Modified: branches/yt-generalization/yt/lagos/BaseDataTypes.py
==============================================================================
--- branches/yt-generalization/yt/lagos/BaseDataTypes.py	(original)
+++ branches/yt-generalization/yt/lagos/BaseDataTypes.py	Mon Jun 23 17:15:30 2008
@@ -921,7 +921,7 @@
                 mylog.error("Something messed up, and %s still has %s points of data",
                             grid1, self.__retval_coords[grid1.id][0].size)
                 mylog.error("You might try setting the ReconstructHierarchy option in [lagos]")
-                #raise ValueError(grid1, self.__retval_coords[grid1.id])
+                raise ValueError(grid1, self.__retval_coords[grid1.id])
         pbar.finish()
 
     #@time_execution

Modified: branches/yt-generalization/yt/lagos/PointCombine.c
==============================================================================
--- branches/yt-generalization/yt/lagos/PointCombine.c	(original)
+++ branches/yt-generalization/yt/lagos/PointCombine.c	Mon Jun 23 17:15:30 2008
@@ -199,7 +199,7 @@
     int num_found = 0;
 
     for (si = 0; si < src_len; si++) {
-      if (src_x[si] < 0) continue;
+      if (src_used_mask[si] == 0) continue;
       init_x = refinement_factor * src_x[si];
       init_y = refinement_factor * src_y[si];
       for (x_off = 0; x_off < refinement_factor; x_off++) {
@@ -207,7 +207,6 @@
           fine_x = init_x + x_off;
           fine_y = init_y + y_off;
           for (di = 0; di < dst_len; di++) {
-            if (dst_x[di] < 0) continue;
             if ((fine_x == dst_x[di]) &&
                 (fine_y == dst_y[di])) {
               num_found++;