Changeset 37100

Timestamp:

Jul 22, 2014, 2:53:13 PM (12 years ago)

Author:

eugene

Message:

if no output catalog exists, use input catalog format for output; use MARKTIME, INITTIME macros

Location:

branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src

Files:

• dvomergeUpdate.c (modified) (2 diffs)
• dvomergeUpdate_catalogs.c (modified) (1 diff)
• dvomergeUpdate_threaded.c (modified) (4 diffs)

branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -13 +13 @@
   int NsecfiltInput, NsecfiltOutput;
 
-  double dtime;
-  struct timeval start, stop;
-  gettimeofday (&start, NULL);
+  INITTIME;
 
   CONTINUE = FALSE;
@@ -121 +119 @@
   }
 
-  gettimeofday (&stop, NULL);
-  dtime = DTIME (stop, start);
-
   if (!status) {
-    fprintf (stderr, "ERROR: elapsed time %9.4f sec\n", dtime);
+    MARKTIME ("ERROR: elapsed time %9.4f sec\n", dtime);
     exit (3);
   }
 
-  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec\n", dtime);
+  MARKTIME ("SUCCESS: elapsed time %9.4f sec\n", dtime);
   exit (0);
 }

branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -163 +163 @@
       LoadCatalog (&outcatalog, outlist[0].regions[j], outcatalog.filename, "w", NsecfiltOutput);
 
+      // if no catalog already exists, use the input catalog to define the format
+      if (outcatalog.Naves_disk == 0) {
+        outcatalog.catformat = incatalog.catformat;
+      }
+
       merge_catalogs_old (outlist[0].regions[j], &outcatalog, &incatalog, RADIUS, secfiltMap);
 

branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c

@@ -113 +113 @@
   int NsecfiltInput, NsecfiltOutput;
 
-  double dtime;
-  struct timeval start, stop;
-  gettimeofday (&start, NULL);
+  INITTIME;
 
   CONTINUE = FALSE;
@@ -132 +130 @@
 
   fprintf (stderr, "WARNING / ERROR : multi-threaded dvomerge does not handle merge tracking yet\n");
+  fprintf (stderr, "WARNING / ERROR : multi-threaded dvomerge does work in a parallel context\n");
   exit (2);
 
@@ -291 +290 @@
   }
 
-  gettimeofday (&stop, NULL);
-  dtime = DTIME (stop, start);
-  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec\n", dtime);
-
+  MARKTIME ("SUCCESS: elapsed time %9.4f sec\n", dtime);
   exit (0);
 
@@ -316 +312 @@
     }
   }
+  MARKTIME ("ERROR: elapsed time %9.4f sec\n", dtime);
   exit (1);
 }