Changeset 37659

Timestamp:

Nov 22, 2014, 1:06:01 PM (12 years ago)

Author:

eugene

Message:

icrfobj now has embedded arrays

File:

• branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/share_icrf_obj.c (modified) (3 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/share_icrf_obj.c

@@ -34 +34 @@
   ICRFobj *icrfobj = NULL;
   ALLOCATE (icrfobj, ICRFobj, 1);
+  ALLOCATE (icrfobj->Rave,  double, 1);
+  ALLOCATE (icrfobj->Dave,  double, 1);
+  ALLOCATE (icrfobj->dRoff, double, 1);
+  ALLOCATE (icrfobj->dDoff, double, 1);
+  icrfobj->Nicrfobj = 0;
 
   fprintf (stderr, "grabbing icrf objects from remote hosts...\n");
@@ -56 +61 @@
   off_t i;
 
-  REALLOCATE (target, ICRFobj, target->Nicrfobj + source->Nicrfobj);
+  REALLOCATE (target->Rave,  double, target->Nicrfobj + source->Nicrfobj);
+  REALLOCATE (target->Dave,  double, target->Nicrfobj + source->Nicrfobj);
+  REALLOCATE (target->dRoff, double, target->Nicrfobj + source->Nicrfobj);
+  REALLOCATE (target->dDoff, double, target->Nicrfobj + source->Nicrfobj);
+
   for (i = 0; i < source->Nicrfobj; i++) {
     off_t n = i + target->Nicrfobj;
@@ -107 +116 @@
     icrfobj->Dave[Npts]  = average->D;
     icrfobj->dRoff[Npts] = dR;
-    icrfobj->dRoff[Npts] = dD;
+    icrfobj->dDoff[Npts] = dD;
     Npts ++;
   }