source: issm/oecreview/Archive/13977-14063/ISSM-14015-14016.diff

Index: ../trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.h
===================================================================
--- ../trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.h    (revision 14015)
+++ ../trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.h    (revision 14016)
@@ -6,6 +6,6 @@
 #define _NODECONNECTIVITYX_H
 
 /* 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 */
Index: ../trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp
===================================================================
--- ../trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp  (revision 14015)
+++ ../trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp  (revision 14016)
@@ -17,7 +17,7 @@
 #include "../../toolkits/toolkits.h"
 #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;
        const int maxels=25;
@@ -28,26 +28,23 @@
        int     index;
        int     num_elements;
        int     already_plugged=0;
-       double  element;
+       int element;
 
-       /*output: */
-       double* connectivity=NULL;
-
        /*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;
                        for(j=0;j<num_elements;j++){
@@ -59,8 +56,8 @@
                        if(already_plugged)break;
 
                        /*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;
 
                }
        }
@@ -68,7 +65,8 @@
        /*Last check: is the number of elements on last column of the connectivity superior to maxels? If so, then error out and 
         * 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");
        }
 
        /*Assign output pointers: */
Index: ../trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp
===================================================================
--- ../trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp     (revision 14015)
+++ ../trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp     (revision 14016)
@@ -12,13 +12,13 @@
 WRAPPER(NodeConnectivity){
 
        /*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: */
        MODULEBOOT();
@@ -27,11 +27,11 @@
        CHECKARGUMENTS(NLHS,NRHS,&NodeConnectivityUsage);
         
        /*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: */
        WriteData(CONNECTIVITY,connectivity,nods,width);