Changeset 322 for trunk/src

Timestamp:

Mar 10, 2006 10:03:30 AM (18 years ago)

Author:

cxsong

Message:

added constructor for a 1d regular array
fixed xmlString to use <points> tag instead of <values>
modified constructor RpGrid1d(double,int) - removed memcpy

File:

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

trunk/src/mesh/grid1d.cc

@@ -41 +41 @@
 RpGrid1d::RpGrid1d(DataValType* val, int nitems)
 {
-        int sz = m_data.size();
-
         if (val == NULL) // invalid data pointer
                 return;
 
-        if (sz != nitems)
-                m_data.resize(nitems);
-
         // copy array val into m_data
-        sz = nitems;
-        void* ptr = &(m_data[0]);
-        memcpy(ptr, (void*)val, sizeof(DataValType)*sz);
-}
+        for (int i=0; i<nitems; i++)
+                m_data.push_back(val[i]);
+}
+
+//
+// constructor for a regular grid
+//
+RpGrid1d::RpGrid1d(DataValType startPoint, DataValType delta, int npts)
+{
+        m_data.resize(npts);
+
+        // expand array
+        for (int i=0; i < npts; i++)
+                m_data.push_back(startPoint + i*delta);
+}
+
 
 //
@@ -224 +231 @@
         textString.erase();
 
-        textString.append("<value>");
+        textString.append("<points>");
 
         for (i=0; i < npts; i++) {
@@ -230 +237 @@
                 textString.append(cstr);
         }
-        textString.append("</value>\n");
+        textString.append("</points>\n");
 }