Changeset 15742

Timestamp:

Dec 5, 2007, 3:25:40 PM (18 years ago)

Author:

eugene

Message:

working on dvosplit

Location:

branches/eam_branch_20071130/Ohana

Files:

• Makefile.in (modified) (1 diff)
• src/dvosplit/src/split_averages.c (modified) (3 diffs)
• src/dvosplit/src/split_measures.c (modified) (2 diffs)
• src/dvosplit/src/split_missings.c (modified) (2 diffs)

branches/eam_branch_20071130/Ohana/Makefile.in

@@ -30 +30 @@
 addstar     \
 delstar     \
+dvosplit    \
 elixir      \
 gastro      \

branches/eam_branch_20071130/Ohana/src/dvosplit/src/split_averages.c

@@ -24 +24 @@
   incatalog[0].catflags = LOAD_AVES | LOAD_SECF;
   Nblocks = incatalog[0].Naves_disk / NROWS;
+  if (incatalog[0].Naves_disk % NROWS) Nblocks ++;
   for (block = 0; block < Nblocks; block++) {
 
@@ -73 +74 @@
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
       outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
+
+      fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecf_mem, outcatalogs[cat].Nsecf_disk, outcatalogs[cat].Nsecf_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
       dvo_catalog_save (&outcatalogs[cat], VERBOSE);
+      fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecf_mem, outcatalogs[cat].Nsecf_disk, outcatalogs[cat].Nsecf_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
 
       // XXX I need to advance the pointers and free the current data
@@ -79 +83 @@
       outcatalogs[cat].Naves_disk += outcatalogs[cat].Naverage;
       outcatalogs[cat].Naves_off  += outcatalogs[cat].Naverage;
+      outcatalogs[cat].Nsecf_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
+      outcatalogs[cat].Nsecf_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
+      outcatalogs[cat].Nsecfilt    = Nsecfilt;
+
       outcatalogs[cat].Naverage    = 0;
-
-      outcatalogs[cat].Nsecf_disk += Nsecfilt * outcatalogs[cat].Naverage;
-      outcatalogs[cat].Nsecf_off  += Nsecfilt * outcatalogs[cat].Naverage;
       outcatalogs[cat].Nsecf_mem   = 0;
     }

branches/eam_branch_20071130/Ohana/src/dvosplit/src/split_measures.c

@@ -18 +18 @@
   incatalog[0].catflags = LOAD_MEAS;
   Nblocks = incatalog[0].Nmeas_disk / NROWS;
+  if (incatalog[0].Nmeas_disk % NROWS) Nblocks ++;
   for (block = 0; block < Nblocks; block++) {
 
     // read up to NROWS at a time
-    dvo_catalog_load_segment (&incatalog, VERBOSE, block*NROWS, NROWS);
+    dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
 
     for (meas = 0; meas < incatalog[0].Nmeasure; meas++) {
@@ -35 +36 @@
 
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
-      outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
+      outcatalogs[cat].catflags = LOAD_MEAS;
       dvo_catalog_save (&outcatalogs[cat], VERBOSE);
 

branches/eam_branch_20071130/Ohana/src/dvosplit/src/split_missings.c

@@ -17 +17 @@
   incatalog[0].catflags = LOAD_MISS;
   Nblocks = incatalog[0].Nmiss_disk / NROWS;
+  if (incatalog[0].Nmiss_disk % NROWS) Nblocks ++;
   for (block = 0; block < Nblocks; block++) {
 
     // read up to NROWS at a time
-    dvo_catalog_load_segment (&incatalog, VERBOSE, block*NROWS, NROWS);
+    dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
 
     for (miss = 0; miss < incatalog[0].Nmissing; miss++) {
@@ -34 +35 @@
 
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
-      outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
+      outcatalogs[cat].catflags = LOAD_MISS;
       dvo_catalog_save_segment (&outcatalog[cat], VERBOSE);