Changeset 37814

Timestamp:

Jan 12, 2015, 6:02:16 AM (12 years ago)

Author:

eugene

Message:

init variables caught by opt build

Location:

trunk/Ohana/src

Files:

• dvomerge/src/build_links.c (modified) (1 diff)
• dvomerge/src/merge_catalogs_new.c (modified) (3 diffs)
• fakeastro/src/insert_fakestar.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/build_links.c

@@ -510 +510 @@
 
   /* fix order of StarPar (memory intensive, but fast) */
+  np = -1;
   N = 0; 
   ALLOCATE (tmpstarpar, StarPar, Nstarpar);

trunk/Ohana/src/dvomerge/src/merge_catalogs_new.c

@@ -16 +16 @@
   Nmeasure = output[0].Nmeasure;
   Nlensing = output[0].Nlensing;
+  Nstarpar = output[0].Nstarpar;
 
   NsecfiltOut = output[0].Nsecfilt;
@@ -23 +24 @@
   NMEASURE = Nmeasure + 1000;
   NLENSING = Nlensing + 1000;
+  NSTARPAR = Nstarpar + 1000;
 
   REALLOCATE (output[0].average, Average, NAVERAGE);
@@ -28 +30 @@
   REALLOCATE (output[0].measure, Measure, NMEASURE);
   REALLOCATE (output[0].lensing, Lensing, NLENSING);
+  REALLOCATE (output[0].starpar, StarPar, NSTARPAR);
 
   // add all of these entries to the existing catalog

trunk/Ohana/src/fakeastro/src/insert_fakestar.c

@@ -52 +52 @@
     }
 
-    double m_r, gr, ri, rz, zy;
+    double m_r = NAN;
+    double gr = NAN;
+    double ri = NAN;
+    double rz = NAN;
+    double zy = NAN;
 
     // valid stars do not have crazy FeH values