Changeset 14016

Timestamp:

11/27/12 12:04:54 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: NodeConnectivity uses integers

Location:

issm/trunk-jpl/src

Files:

• c/modules/NodeConnectivityx/NodeConnectivityx.cpp (modified) (4 diffs)
• c/modules/NodeConnectivityx/NodeConnectivityx.h (modified) (1 diff)
• wrappers/NodeConnectivity/NodeConnectivity.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp

@@ -18 +18 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void    NodeConnectivityx( double** pconnectivity, int* pwidth, double* elements, int nel, int nods){
+void    NodeConnectivityx(int** pconnectivity,int* pwidth,int* elements, int nels, int nods){
 
         int i,j,n;
@@ -29 +29 @@
         int     num_elements;
         int     already_plugged=0;
-        double  element;
-
-        /*output: */
-        double* connectivity=NULL;
+        int element;
 
         /*Allocate connectivity: */
-        connectivity=xNewZeroInit<double>(nods*width);
+        int* connectivity=xNewZeroInit<int>(nods*width);
 
         /*Go through all elements, and for each elements, plug into the connectivity, all the nodes. 
          * If nodes are already plugged into the connectivity, skip them.: */
-        for(n=0;n<nel;n++){
+        for(n=0;n<nels;n++){
 
-                element=(double)(n+1); //matlab indexing
+                element=n+1; //matlab indexing
 
                 for(i=0;i<3;i++){
 
-                        node=(int)*(elements+n*3+i); //already matlab indexed, elements comes directly from the workspace.
+                        node=elements[n*3+i]; //already matlab indexed, elements comes directly from the workspace.
                         index=node-1;
 
-                        num_elements=(int)*(connectivity+width*index+maxels); //retrieve number of elements already  plugged into the connectivity of this node.
+                        num_elements=connectivity[width*index+maxels]; //retrieve number of elements already  plugged into the connectivity of this node.
 
                         already_plugged=0;
@@ -60 +57 @@
 
                         /*this elements is not yet plugged  into the connectivity for this node, do it, and increase counter: */
-                        *(connectivity+width*index+num_elements)=element;
-                        *(connectivity+width*index+maxels)=(double)(num_elements+1);
+                        connectivity[width*index+num_elements]=element;
+                        connectivity[width*index+maxels]=num_elements+1;
 
                 }
@@ -69 +66 @@
          * warn the user to increase the connectivity width: */
         for(i=0;i<nods;i++){
-                if (*(connectivity+width*i+maxels)>maxels)_error_("max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table");
+                if (*(connectivity+width*i+maxels)>maxels)
+                 _error_("max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table");
         }
 

issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.h

@@ -7 +7 @@
 
 /* local prototypes: */
-void    NodeConnectivityx( double** pconnectivity, int* pwidth,double* elements, int nel, int nods);
+void    NodeConnectivityx(int** pconnectivity,int* pwidth,int* elements,int nels, int nods);
 
 #endif  /* _NODECONNECTIVITYX_H */

issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp

@@ -13 +13 @@
 
         /*inputs: */
-        double* elements=NULL;
-        int     nel;
-        int     nods;
+        int* elements=NULL;
+        int  nels;
+        int  nods;
 
         /*outputs: */
-        double* connectivity=NULL;
-        int     width;
+        int* connectivity=NULL;
+        int  width;
 
         /*Boot module: */
@@ -28 +28 @@
         
         /*Input datasets: */
-        FetchData(&elements,&nel,NULL,ELEMENTS);
+        FetchData(&elements,&nels,NULL,ELEMENTS);
         FetchData(&nods,NUMNODES);
 
         /*!Generate internal degree of freedom numbers: */
-        NodeConnectivityx(&connectivity, &width,elements,nel, nods);
+        NodeConnectivityx(&connectivity,&width,elements,nels,nods);
 
         /*write output datasets: */