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(nods*width); + int* connectivity=xNewZeroInit(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;nmaxels)_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);