Changeset 233 for trunk/src/mesh

Timestamp:

Mar 1, 2006 9:46:19 AM (18 years ago)

Author:

cxsong

Message:

fixed allAll functions

Location:

trunk/src/mesh

Files:

• mesh.cc (modified) (9 diffs)
• mesh.h (modified) (2 diffs)

trunk/src/mesh/mesh.cc

@@ -50 +50 @@
 //                      0,0,1
 //              };
+//
 //    2. numNodes: total number of nodes 
 //
@@ -55 +56 @@
 //      error codes
 //
-RP_ERROR RpMesh3d::addAllNodes(int numNodes, int* nodes[])
+RP_ERROR 
+//RpMesh3d::addAllNodes(int numNodes, int nodes[][3])
+RpMesh3d::addAllNodes(int numNodes, int* nodes)
 {
         if (numNodes != m_numNodes)
@@ -61 +64 @@
 
         for (int i=0; i<numNodes; i++) {
-                m_nodeList[i].set(nodes[i]);
+                m_nodeList[i].set(&(nodes[i*3]));
                 m_nodeList[i].id(i);
         }
@@ -79 +82 @@
 //      error codes
 //
-RP_ERROR RpMesh3d::addNode(int* nodeVal)
+RP_ERROR 
+RpMesh3d::addNode(int* nodeVal)
 {
         if (m_nodeIndex < m_numNodes) {
@@ -100 +104 @@
 //      error codes
 //
-RP_ERROR RpMesh3d::addElement(int numNodes, const int* nodes)
+RP_ERROR
+RpMesh3d::addElement(int numNodes, const int* nodes)
 {
         if (numNodes != (*m_elemList)[0].numNodes())
@@ -116 +121 @@
 }
 
+//
+// add all elements to mesh
+//
+// Input:
+//   elemArray: a 2d array, e.g.:
+//      static int elem[6][4] = {
+//              0,1,5,6,
+//              1,2,6,7,
+//              2,3,7,1,
+//              3,4,1,2,
+//              5,6,2,3,
+//              6,7,3,4
+//      };
+//
+//   numElements: number of elements in mesh
+//   Note: number of nodes in an element must match the number when mesh object
+//              was instantiated.
+//
+//
+RP_ERROR
+RpMesh3d::addAllElements(int numElements, int* elemArray)
+{
+        if (numElements != m_numElements)
+                return RP_ERR_WRONG_NUM_NODES;
+
+        // number of nodes in an element
+        int numNodes = (*m_elemList)[0].numNodes();
+        for (int i=0; i < m_numElements; i++) {
+                (*m_elemList)[i].addNodes(&(elemArray[i*numNodes]), numNodes);
+        }
+
+        return RP_SUCCESS;
+}
+
 // retrieve nodes 
 void 
@@ -122 +161 @@
         if (nodeSeqNum < m_numNodes)
                 m_nodeList[nodeSeqNum].get(x, y, z);
-
 }
 
@@ -135 +173 @@
 }
 
-RP_ERROR RpMesh3d::getNodesList(int* nodesList, int& num)
-{
-}
-
-RpElement RpMesh3d::getElement(int elemSeqNum)
-{
-}
-
-RP_ERROR RpMesh3d::getElement(int elemSeqNum, int* nodesBuf)
-{
+RP_ERROR 
+RpMesh3d::getNodesList(int* nodesList, int& num)
+{
+        return RP_SUCCESS;
+}
+
+RpElement 
+RpMesh3d::getElement(int elemSeqNum)
+{
+        return RP_SUCCESS;
+}
+
+RP_ERROR 
+RpMesh3d::getElement(int elemSeqNum, int* nodesBuf)
+{
+        return RP_SUCCESS;
 }
 
 // serialization
-char* RpMesh3d::serialize()
-{
-
-}
-
-RP_ERROR RpMesh3d::serialize(char* buf, int buflen)
-{
-}
-
-RP_ERROR RpMesh3d::deserialize(const char* buf)
-{
+char* 
+RpMesh3d::serialize()
+{
+        return NULL;
+}
+
+RP_ERROR 
+RpMesh3d::serialize(char* buf, int buflen)
+{
+
+        return RP_SUCCESS;
+}
+
+RP_ERROR 
+RpMesh3d::deserialize(const char* buf)
+{
+        return RP_SUCCESS;
 }
 
@@ -202 +252 @@
 }
 
-

trunk/src/mesh/mesh.h

@@ -24 +24 @@
 
         // add all nodes to mesh
-        RP_ERROR addAllNodes(int numNodes, int* nodesList[]);
+        RP_ERROR addAllNodes(int numNodes, int* nodesList);
 
         // add one node to mesh
@@ -31 +31 @@
         // add an element to mesh
         RP_ERROR addElement(int numNodesInElem, const int* nodes);
+
+        // add all elements to mesh
+        RP_ERROR addAllElements(int numElements, int* elementArray);
 
         // retrieve nodes