Index: /issm/trunk-jpl/src/c/shared/Elements/GetGlobalDofList.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/GetGlobalDofList.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Elements/GetGlobalDofList.cpp (revision 12437) @@ -14,5 +14,5 @@ /*Allocate:*/ - ndof_list=(int*)xmalloc(numnodes*sizeof(int)); + ndof_list=xNew(numnodes); /*First, figure out size of doflist: */ @@ -25,5 +25,5 @@ if(numdof){ /*Allocate: */ - doflist=(int*)xmalloc(numdof*sizeof(int)); + doflist=xNew(numdof); /*Populate: */ @@ -37,5 +37,5 @@ } /*Free ressources:*/ - xfree((void**)&ndof_list); + xDelete(ndof_list); return doflist; Index: /issm/trunk-jpl/src/c/shared/Elements/GetLocalDofList.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/GetLocalDofList.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Elements/GetLocalDofList.cpp (revision 12437) @@ -13,6 +13,6 @@ if(numnodes){ /*allocate: */ - ndof_list=(int*)xmalloc(numnodes*sizeof(int)); - ngdof_list_cumulative=(int*)xmalloc(numnodes*sizeof(int)); + ndof_list=xNew(numnodes); + ngdof_list_cumulative=xNew(numnodes); @@ -33,5 +33,5 @@ if(numdof){ /*Allocate: */ - doflist=(int*)xmalloc(numdof*sizeof(int)); + doflist=xNew(numdof); /*Populate: */ @@ -55,6 +55,6 @@ /*Free ressources:*/ - xfree((void**)&ndof_list); - xfree((void**)&ngdof_list_cumulative); + xDelete(ndof_list); + xDelete(ngdof_list_cumulative); /*CLean-up and return*/ Index: /issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp (revision 12437) @@ -8,5 +8,5 @@ /*All nodes have the same Coordinate System*/ - cs_array=(int*)xmalloc(numnodes*sizeof(int)); + cs_array=xNew(numnodes); for(int i=0;i(cs_array); } @@ -35,5 +35,5 @@ /*Copy current load vector*/ - values=(double*)xmalloc(pe->nrows*sizeof(double)); + values=xNew(pe->nrows); for(i=0;inrows;i++) values[i]=pe->values[i]; @@ -46,6 +46,6 @@ &pe->values[0],0); - /*Free Matrix*/ - xfree((void**)&transform); - xfree((void**)&values); + /*Free Matrices*/ + xDelete(transform); + xDelete(values); } Index: /issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp (revision 12437) @@ -9,5 +9,5 @@ /*All nodes have the same Coordinate System*/ - cs_array=(int*)xmalloc(numnodes*sizeof(int)); + cs_array=xNew(numnodes); for(int i=0;i(cs_array); } @@ -36,5 +36,5 @@ /*Copy current solution vector*/ - values=(double*)xmalloc(numdofs*sizeof(double)); + values=xNew(numdofs); for(i=0;i(transform); + xDelete(values); } Index: /issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp (revision 12437) @@ -9,5 +9,5 @@ #include #include -#include "../Alloc/alloc.h" +#include "../Alloc/xNewDelete.h" char* exprintf(const char* format,...){ @@ -17,5 +17,5 @@ /*Assum nobody will print more that 1024 characters!*/ - string=(char*)xmalloc(1024*sizeof(char));//assume that nobody will print more than 1024 characters at once. + string=xNew(1024);//assume that nobody will print more than 1024 characters at once. //variable list of arguments Index: /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp (revision 12437) @@ -88,6 +88,6 @@ /*Allocate vertices: */ - x=(double*)xmalloc(n*sizeof(double)); - y=(double*)xmalloc(n*sizeof(double)); + x=xNew(n); + y=xNew(n); /*Read vertices: */ Index: /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 12437) @@ -69,14 +69,9 @@ if (idima*idimc*(idimb+idimd) <= idimb*idimd*(idima+idimc)) { - dtemp=(double *) xmalloc(idima*idimc*sizeof(double)); - - MatrixMultiply(a ,nrowa,ncola,itrna, - b ,nrowb,ncolb,itrnb, - dtemp,0); - MatrixMultiply(dtemp,idima,idimc,0 , - c ,nrowc,ncolc,itrnc, - d ,iaddd); - - xfree((void **)&dtemp); + dtemp=xNew(idima*idimc); + + MatrixMultiply(a,nrowa,ncola,itrna,b,nrowb,ncolb,itrnb,dtemp,0); + MatrixMultiply(dtemp,idima,idimc,0,c,nrowc,ncolc,itrnc,d,iaddd); + xDelete(dtemp); } @@ -84,14 +79,9 @@ else { - dtemp=(double *) xmalloc(idimb*idimd*sizeof(double)); - - MatrixMultiply(b ,nrowb,ncolb,itrnb, - c ,nrowc,ncolc,itrnc, - dtemp,0); - MatrixMultiply(a ,nrowa,ncola,itrna, - dtemp,idimb,idimd,0 , - d ,iaddd); - - xfree((void **)&dtemp); + dtemp=xNew(idimb*idimd); + + MatrixMultiply(b,nrowb,ncolb,itrnb,c,nrowc,ncolc,itrnc,dtemp,0); + MatrixMultiply(a,nrowa,ncola,itrna,dtemp,idimb,idimd,0,d,iaddd); + xDelete(dtemp); } @@ -198,7 +188,6 @@ ncol=nrow; det=1.; - - pivrc = (int (*)[2]) xmalloc((nrow*2)*sizeof(int)); - pindx = (int (*) ) xcalloc( nrow ,sizeof(int)); + pivrc =(int(*)[2])xNew(nrow*2); + pindx =xNew(nrow); /* loop over the rows/columns of the matrix */ @@ -221,6 +210,6 @@ if (fabs(pivot) < DBL_EPSILON) { - xfree((void **)&pivrc); - xfree((void **)&pindx); + xfree((void**)&pivrc); + xDelete(pindx); _error_("Pivot %f less than machine epsilon",pivot); noerr=0; @@ -339,6 +328,6 @@ *pdet=det; - xfree((void **)&pivrc); - xfree((void **)&pindx); + xfree((void**)&pivrc); + xDelete(pindx); return noerr; Index: /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 12437) @@ -65,12 +65,10 @@ /*Free ressources*/ - xfree((void**)&analyses); + xDelete(analyses); for(i=0;i(string); } - xfree((void**)&strings); - - + xDelete(strings); return outstring; } Index: /issm/trunk-jpl/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp (revision 12436) +++ /issm/trunk-jpl/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp (revision 12437) @@ -39,4 +39,4 @@ /*Free ressources:*/ - xfree((void**)&options); + xDelete(options); }