Changeset 300 for trunk/src

Timestamp:

Mar 9, 2006 1:10:14 PM (18 years ago)

Author:

cxsong

Message:

updated with new read methods.

File:

• trunk/src/mesh/grid1d.cc (modified) (6 diffs)

trunk/src/mesh/grid1d.cc

@@ -93 +93 @@
         int nbytes = numBytes();
 
-        // total length = tagEncode + tagCompress + num + array data 
-        if ( (buf = (char*) malloc(nbytes)) == NULL) {
-                RpAppendErr("RpGrid1d::serialize: malloc failed");
+        if ( (buf = new char[nbytes]) == NULL) {
+                RpAppendErr("RpGrid1d::serialize: new char[] failed");
                 RpPrintErr();
                 return buf;
@@ -122 +121 @@
         char * ptr = buf;
 
-        writeHeader(ptr, RpGrid1d_current_version, nbytes);
+        // write object header (version and typename)
+        writeRpHeader(ptr, RpGrid1d_current_version, nbytes);
         ptr += HEADER_SIZE + sizeof(int);
         
-        writeObjectName(ptr, m_name);
+        // write object name and its length
+        writeString(ptr, m_name);
         ptr += m_name.size() + sizeof(int);
 
-        // copy int (number of points)
-
+        // write number of points and array data
         writeArrayDouble(ptr, m_data, m_data.size());
 
@@ -148 +148 @@
         int nbytes;
 
-        readHeader(ptr, header, nbytes);
+        readRpHeader(ptr, header, nbytes);
         ptr += HEADER_SIZE + sizeof(int);
         
@@ -169 +169 @@
         // parse object name and store name in m_name
 
-        readObjectName(ptr, m_name);
+        readString(ptr, m_name);
         ptr += sizeof(int) + m_name.size();
         
         int npts;
-        readArrayDouble(ptr, &m_data, npts);
+        readArrayDouble(ptr, m_data, npts);
 
         return RP_SUCCESS;
@@ -196 +196 @@
 
         DataValType* xy;
-        if ( (xy = new DataValType(npts)) == NULL) {
+        if ( (xy = new DataValType[npts]) == NULL) {
                 RpAppendErr("RpGrid1d::data: mem alloc failed");
                 RpPrintErr();
@@ -282 +282 @@
                 + m_data.size() * sizeof(DataValType);
 
+#ifdef DEBUG
+        printf("RpGrid1d::numBytes returns %d\n", nbytes);
+#endif
         return nbytes;
 }