Changeset 241 for trunk/src

Timestamp:

Mar 1, 2006 10:41:00 AM (18 years ago)

Author:

cxsong

Message:

modified getNodesList, getNode, etc.

Location:

trunk/src/mesh

Files:

• mesh.cc (modified) (4 diffs)
• mesh.h (modified) (1 diff)

trunk/src/mesh/mesh.cc

@@ -57 +57 @@
 //
 RP_ERROR 
-//RpMesh3d::addAllNodes(int numNodes, int nodes[][3])
 RpMesh3d::addAllNodes(int numNodes, int* nodes)
 {
@@ -127 +126 @@
 //   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
+//              {0,1,5,6},
+//              {1,2,6,7},
+//              {2,3,7,1},
+//              {3,4,1,2},
+//              {5,6,2,3},
+//              {6,7,3,4}
 //      };
 //
@@ -157 +156 @@
 // retrieve nodes 
 void 
-RpMesh3d::getNode(int nodeSeqNum, int& x, int& y, int& z)
+RpMesh3d::getNode(int nodeSeqNum, int* x, int* y, int* z)
 {
         if (nodeSeqNum < m_numNodes)
@@ -173 +172 @@
 }
 
-RP_ERROR 
-RpMesh3d::getNodesList(int* nodesList, int& num)
-{
+//
+// Returns nodes in a list of int (nodesList)
+// Input:
+//      nodesList: length should be 3*numNodes
+//      numNodes: number of nodes
+// Returns:
+//      numnodes = number of nodes returned
+//      nodesList = all the nodes in mesh
+//
+RP_ERROR 
+RpMesh3d::getNodesList(int* nodesList, int& numNodes)
+{
+        if (nodesList == NULL)
+                return RP_ERR_NULL_PTR;
+        if (numNodes > m_numNodes)
+                numNodes = m_numNodes;
+
+        int j;
+        for (int i=0; i<numNodes; i++) {
+                j = i * 3;
+                getNode(i, &(nodesList[j]), &(nodesList[j+1]), &(nodesList[j+2]));
+        }
+
         return RP_SUCCESS;
 }

trunk/src/mesh/mesh.h

@@ -36 +36 @@
 
         // retrieve nodes 
-        void getNode(int nodeSeqNum, int& x, int& y, int& z);
+        void getNode(int nodeSeqNum, int* x, int* y, int* z);
         RP_ERROR getNode(int nodeSeqNum, RpNode3d& node);
         RP_ERROR getNodesList(int* nodesList, int& num);