Changeset 38447 for branches/eam_branches/ipp-20150419/Ohana/src/dvosplit/src/split_missings.c

Timestamp:

Jun 12, 2015, 9:44:51 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150419/Ohana/src

Files:

• . (modified) (1 prop)
• dvosplit/src/split_missings.c (modified) (2 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/dvosplit/src/split_missings.c

@@ -15 +15 @@
 
   // split out the missing entries:
-  incatalog[0].catflags = LOAD_MISS;
-  Nblocks = incatalog[0].Nmiss_disk / NROWS;
-  if (incatalog[0].Nmiss_disk % NROWS) Nblocks ++;
+  incatalog[0].catflags = DVO_LOAD_MISSING;
+  Nblocks = incatalog[0].Nmissing_disk / NROWS;
+  if (incatalog[0].Nmissing_disk % NROWS) Nblocks ++;
   for (block = 0; block < Nblocks; block++) {
 
@@ -35 +35 @@
 
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
-      outcatalogs[cat].catflags = LOAD_MISS;
+      outcatalogs[cat].catflags = DVO_LOAD_MISSING;
       dvo_catalog_save_segment (&outcatalog[cat], VERBOSE);
 
-      outcatalog[cat].Nmiss_disk += outcatalog[cat].Nmissing;
-      outcatalog[cat].Nmiss_off  += outcatalog[cat].Nmissing;
+      outcatalog[cat].Nmissing_disk += outcatalog[cat].Nmissing;
+      outcatalog[cat].Nmissing_off  += outcatalog[cat].Nmissing;
       outcatalog[cat].Nmissing    = 0;