Changeset 246 for trunk/src/mesh

Timestamp:

Mar 1, 2006 11:59:54 AM (18 years ago)

Author:

cxsong

Message:

added erase, getElement, etc.

Location:

trunk/src/mesh

Files:

• mesh.cc (modified) (7 diffs)
• mesh.h (modified) (3 diffs)

trunk/src/mesh/mesh.cc

@@ -85 +85 @@
 {
         if (m_nodeIndex < m_numNodes) {
+                m_nodeList[m_nodeIndex].id(m_nodeIndex);
                 m_nodeList[m_nodeIndex++].set(nodeVal);
                 return RP_SUCCESS;
@@ -110 +111 @@
 
         if (m_elemIndex < m_numElements) {
+                (*m_elemList)[m_elemIndex].id(m_elemIndex);
                 (*m_elemList)[m_elemIndex++].addNodes(nodes, numNodes);
+
                 return RP_SUCCESS;
         }
@@ -148 +151 @@
         int numNodes = (*m_elemList)[0].numNodes();
         for (int i=0; i < m_numElements; i++) {
+                (*m_elemList)[i].id(i);
                 (*m_elemList)[i].addNodes(&(elemArray[i*numNodes]), numNodes);
         }
@@ -182 +186 @@
 //
 RP_ERROR 
-RpMesh3d::getNodesList(int* nodesList, int& numNodes)
+RpMesh3d::getNodesList(int& numNodes, int* nodesList)
 {
         if (nodesList == NULL)
@@ -198 +202 @@
 }
 
+//
+// Returns the nodes in element in outList
+//
+RP_ERROR
+RpMesh3d::getElement(int seqnum, int* outList)
+{
+        if (outList == NULL)
+                return RP_ERR_NULL_PTR;
+
+        if (seqnum > m_numElements)
+                return RP_ERR_INVALID_INDEX;
+
+        int nn = (*m_elemList)[seqnum].numNodes();
+        (*m_elemList)[seqnum].getNodeIdList(outList, nn);
+
+        return RP_SUCCESS;
+}
+
+//
+// Returns all elements in a mesh and store in an int array
+//
+//
+RP_ERROR
+RpMesh3d::getAllElements(int numElements, int* outList)
+{
+        if (outList == NULL)
+                return RP_ERR_NULL_PTR;
+
+        if (numElements > m_numElements)
+                return RP_ERR_INVALID_INDEX;
+
+        // get number of nodes in each element
+        int numNodes = (*m_elemList)[0].numNodes();
+
+        for (int i=0; i < m_numElements; i++) {
+                getElement(i, &(outList[i*numNodes]));
+        }
+
+        return RP_SUCCESS;
+}
+
+
 RpElement 
-RpMesh3d::getElement(int elemSeqNum)
-{
-        return RP_SUCCESS;
-}
-
-RP_ERROR 
-RpMesh3d::getElement(int elemSeqNum, int* nodesBuf)
-{
-        return RP_SUCCESS;
+RpMesh3d::getElement(int seqnum)
+{
+        if (seqnum > m_numElements)
+                return RP_ERR_INVALID_INDEX;
+
+        return (*m_elemList)[seqnum];
 }
 
@@ -233 +276 @@
 RpMesh3d::xmlString(std::string& textString)
 {
+        if (!m_numNodes)
+                return;
+
         // temp char string
         char cstr[256];
@@ -266 +312 @@
 }
 
+void
+RpMesh3d::erase()
+{
+        int i; 
+
+        m_id.erase();
+        m_numNodes = m_numElements = m_nodeIndex = m_elemIndex = 0;
+
+        // zero out element list
+        for (i=0; i < m_numElements; i++)
+                (*m_elemList)[i].erase();
+
+        // zero out nodes list
+        for (i=0; i < m_numNodes; i++)
+                m_nodeList[i].erase();
+}
+
 RpMesh3d::~RpMesh3d()
 {
-        delete [] m_elemList;
-}
-
+        delete m_elemList;
+}
+

trunk/src/mesh/mesh.h

@@ -16 +16 @@
         int numNodes() { return m_numNodes; };
         int numElements() { return m_numElements; };
+        int elementSize() { return (*m_elemList)[0].numNodes(); };
         const char* id() { return m_id.c_str(); };
 
@@ -38 +39 @@
         void getNode(int nodeSeqNum, int* x, int* y, int* z);
         RP_ERROR getNode(int nodeSeqNum, RpNode3d& node);
-        RP_ERROR getNodesList(int* nodesList, int& num);
+        RP_ERROR getNodesList(int& num, int* nodesList);
 
         RpElement getElement(int elemSeqNum);
         RP_ERROR getElement(int elemSeqNum, int* nodesBuf);
+        RP_ERROR getAllElements(int num, int* buf);
 
         // serialization
@@ -50 +52 @@
         void xmlString(std::string& str);
         void print();
+
+        // erase all nodes and elements, capacity not changed.
+        void erase();
 
         virtual ~RpMesh3d();