Index: /issm/trunk-jpl/src/c/classes/matrix/Vector.h =================================================================== --- /issm/trunk-jpl/src/c/classes/matrix/Vector.h (revision 13228) +++ /issm/trunk-jpl/src/c/classes/matrix/Vector.h (revision 13229) @@ -26,10 +26,9 @@ public: + int type; #ifdef _HAVE_PETSC_ PetscVec* pvector; #endif SeqVec* svector; - int type; - /*Vector constructors, destructors */ @@ -82,4 +81,5 @@ #else Vector(doubletype* serial_vec,int M,int in_type=SeqVecType){ + //} for vim #endif Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp (revision 13229) @@ -11,5 +11,5 @@ #include "./ContourToMeshx.h" -int ContourToMeshx( Vector** pin_nod,Vector** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue) { +int ContourToMeshx(SeqVec** pin_nod,SeqVec** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue) { int noerr=1; @@ -30,9 +30,8 @@ /*output: */ - Vector* in_nod=NULL; - Vector* in_elem=NULL; - - in_nod=new Vector(nods); - in_elem=new Vector(nel); + SeqVec* in_nod=NULL; + SeqVec* in_elem=NULL; + in_nod = new SeqVec(nods); + in_elem = new SeqVec(nel); /*initialize thread parameters: */ Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.h (revision 13228) +++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.h (revision 13229) @@ -13,10 +13,10 @@ typedef struct{ - DataSet* contours; - int nods; - int edgevalue; - Vector* in_nod; - double* x; - double* y; + DataSet *contours; + int nods; + int edgevalue; + SeqVec *in_nod; + double *x; + double *y; } ContourToMeshxThreadStruct; @@ -24,9 +24,7 @@ /* local prototypes: */ -int ContourToMeshx( Vector** pin_nods,Vector** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue); +int ContourToMeshx(SeqVec** pin_nods,SeqVec** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue); void* ContourToMeshxt(void* vContourToMeshxThreadStruct); - #endif /* _CONTOURTOMESHX_H */ - Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp (revision 13229) @@ -33,6 +33,5 @@ double* x=NULL; double* y=NULL; - Vector* in_nod=NULL; - + SeqVec* in_nod=NULL; /*recover handle and gate: */ @@ -60,4 +59,3 @@ return NULL; - } Index: /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13229) @@ -4,5 +4,5 @@ #include "./ContourToNodesx.h" -int ContourToNodesx( Vector** pflags,double* x, double* y, int nods, Contour** contours,int numcontours,int edgevalue){ +int ContourToNodesx(SeqVec** pflags,double* x, double* y, int nods, Contour** contours,int numcontours,int edgevalue){ int i; @@ -17,7 +17,6 @@ /*output: */ - Vector* flags=NULL; - - flags=new Vector(nods); + SeqVec* flags=NULL; + flags=new SeqVec(nods); /*Loop through all contours: */ @@ -39,5 +38,5 @@ } -int ContourToNodesx( Vector** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue){ +int ContourToNodesx(SeqVec** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue){ int i; @@ -52,7 +51,6 @@ /*output: */ - Vector* flags=NULL; - - flags=new Vector(nods); + SeqVec* flags=NULL; + flags=new SeqVec(nods); /*Loop through all contours: */ @@ -69,5 +67,4 @@ /*Assign output pointers: */ *pflags=flags; - return 1; } Index: /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.h (revision 13228) +++ /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.h (revision 13229) @@ -2,5 +2,4 @@ ContourToNodesx.h */ - #ifndef _CONTOURTONODESX_H @@ -11,7 +10,6 @@ /* local prototypes: */ -int ContourToNodesx( Vector** pflags,double* x, double* y, int nods, Contour** contours,int numcontours,int edgevalue); -int ContourToNodesx( Vector** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue); +int ContourToNodesx(SeqVec** pflags,double* x, double* y, int nods, Contour** contours,int numcontours,int edgevalue); +int ContourToNodesx(SeqVec** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue); #endif /* _CONTOURTONODESX_H */ - Index: /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13229) @@ -17,8 +17,8 @@ /*InterpFromGridToMeshx{{{*/ -int InterpFromGridToMeshx( Vector** pdata_mesh,double* x_in, int x_rows, double* y_in, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods,double default_value, int interpenum){ +int InterpFromGridToMeshx(SeqVec** pdata_mesh,double* x_in, int x_rows, double* y_in, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods,double default_value, int interpenum){ /*output: */ - Vector* data_mesh=NULL; + SeqVec* data_mesh=NULL; /*Intermediary*/ @@ -47,5 +47,5 @@ /*Allocate output vector: */ - data_mesh=new Vector(nods); + data_mesh=new SeqVec(nods); /*Find out what kind of coordinates (x_in,y_in) have been given is input*/ @@ -120,17 +120,17 @@ /*recover parameters :*/ - double *x_mesh = gate->x_mesh; - double *y_mesh = gate->y_mesh; - int x_rows = gate->x_rows; - int y_rows = gate->y_rows; - double *x = gate->x; - double *y = gate->y; - int nods = gate->nods; - Vector*data_mesh = gate->data_mesh; - double *data = gate->data; - double default_value = gate->default_value; - int interpenum = gate->interp; - int M = gate->M; - int N = gate->N; + double *x_mesh = gate->x_mesh; + double *y_mesh = gate->y_mesh; + int x_rows = gate->x_rows; + int y_rows = gate->y_rows; + double *x = gate->x; + double *y = gate->y; + int nods = gate->nods; + SeqVec*data_mesh = gate->data_mesh; + double *data = gate->data; + double default_value = gate->default_value; + int interpenum = gate->interp; + int M = gate->M; + int N = gate->N; bool debug = M*N>1? true:false; Index: /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h (revision 13228) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h (revision 13229) @@ -12,20 +12,20 @@ /*threading: */ typedef struct{ - double* x; - int x_rows; - double* y; - int y_rows; - double* data; - double default_value; - int interp; - int M; - int N; - int nods; - double* x_mesh; - double* y_mesh; - Vector* data_mesh; + double* x; + int x_rows; + double* y; + int y_rows; + double* data; + double default_value; + int interp; + int M; + int N; + int nods; + double* x_mesh; + double* y_mesh; + SeqVec* data_mesh; } InterpFromGridToMeshxThreadStruct; -int InterpFromGridToMeshx( Vector** pdata_mesh,double* x, int x_rows, double* y, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods, double default_value, int interpenum=BilinearInterpEnum); +int InterpFromGridToMeshx(SeqVec** pdata_mesh,double* x, int x_rows, double* y, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods, double default_value, int interpenum=BilinearInterpEnum); void* InterpFromGridToMeshxt(void* vInterpFromGridToMeshxThreadStruct); bool findindices(int* pn,int* pm,double* x,int x_rows, double* y,int y_rows, double xgrid,double ygrid); Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 13229) @@ -10,14 +10,16 @@ #include "../modules.h" -int InterpFromMesh2dx( Vector** pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime, - double* default_values,int num_default_values,Contour** contours,int numcontours){ +int InterpFromMesh2dx(SeqVec** pdata_prime, + double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, + double* x_prime, double* y_prime, int nods_prime, + double* default_values,int num_default_values,Contour** contours,int numcontours){ /*Output*/ - Vector* data_prime=NULL; + SeqVec* data_prime=NULL; /*Intermediary*/ - int i,j; - int interpolation_type; - bool debug; + int i,j; + int interpolation_type; + bool debug; double area; double area_1,area_2,area_3; @@ -27,6 +29,6 @@ /*contours: */ - Vector* vec_incontour=NULL; - double* incontour=NULL; + SeqVec *vec_incontour = NULL; + double *incontour = NULL; /*threading: */ @@ -71,5 +73,5 @@ /*Initialize output*/ - data_prime=new Vector(nods_prime,false,SeqVecType); + data_prime=new SeqVec(nods_prime); if(num_default_values){ if(num_default_values==1)for (i=0;iSetValue(i,default_values[0],INS_VAL); Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.h (revision 13228) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.h (revision 13229) @@ -9,29 +9,28 @@ #include "../../toolkits/toolkits.h" - /*threading: */ typedef struct{ - int interpolation_type; - bool debug; - int nels_data; - double* index_data; - double* x_data; - double* y_data; - double* data; - double xmin,xmax; - double ymin,ymax; - int nods_prime; - Vector* data_prime; - double* x_prime; - double* y_prime; - double* default_values; - int num_default_values; - double* incontour; + int interpolation_type; + bool debug; + int nels_data; + double *index_data; + double *x_data; + double *y_data; + double *data; + double xmin,xmax; + double ymin,ymax; + int nods_prime; + SeqVec *data_prime; + double *x_prime; + double *y_prime; + double *default_values; + int num_default_values; + double *incontour; } InterpFromMesh2dxThreadStruct; -int InterpFromMesh2dx( Vector** pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime, +int InterpFromMesh2dx(SeqVec** pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime, double* default_values,int num_default_values,Contour** contours,int numcontours); @@ -39,3 +38,2 @@ #endif /* _INTERPFROMMESH2DX_H */ - Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp (revision 13229) @@ -20,22 +20,22 @@ /*recover parameters :*/ - int interpolation_type = gate->interpolation_type; - bool debug = gate->debug; - int nels_data = gate->nels_data; - double *index_data = gate->index_data; - double *x_data = gate->x_data; - double *y_data = gate->y_data; - double *data = gate->data; - double xmin = gate->xmin; - double xmax = gate->xmax; - double ymin = gate->ymin; - double ymax = gate->ymax; - int nods_prime = gate->nods_prime; - Vector* data_prime = gate->data_prime; - double *x_prime = gate->x_prime; - double *y_prime = gate->y_prime; - double *default_values = gate->default_values; - int num_default_values = gate->num_default_values; - double *incontour = gate->incontour; + int interpolation_type = gate->interpolation_type; + bool debug = gate->debug; + int nels_data = gate->nels_data; + double *index_data = gate->index_data; + double *x_data = gate->x_data; + double *y_data = gate->y_data; + double *data = gate->data; + double xmin = gate->xmin; + double xmax = gate->xmax; + double ymin = gate->ymin; + double ymax = gate->ymax; + int nods_prime = gate->nods_prime; + SeqVec* data_prime = gate->data_prime; + double *x_prime = gate->x_prime; + double *y_prime = gate->y_prime; + double *default_values = gate->default_values; + int num_default_values = gate->num_default_values; + double *incontour = gate->incontour; /*partition loop across threads: */ Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp (revision 13229) @@ -7,8 +7,8 @@ #include "../../include/include.h" -int InterpFromMeshToMesh3dx( Vector** pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value) { +int InterpFromMeshToMesh3dx( SeqVec** pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value) { /*Output*/ - Vector* data_prime=NULL; + SeqVec* data_prime=NULL; /*Intermediary*/ @@ -54,5 +54,5 @@ /*Initialize output*/ - data_prime=new Vector(nods_prime); + data_prime=new SeqVec(nods_prime); for (i=0;iSetValue(i,default_value,INS_VAL); Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h (revision 13228) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h (revision 13229) @@ -9,6 +9,5 @@ #include "../../classes/objects/objects.h" -int InterpFromMeshToMesh3dx( Vector** pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value); +int InterpFromMeshToMesh3dx(SeqVec** pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value); #endif /* _INTERPFROMMESHTOMESH3DX_H */ - Index: /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp (revision 13229) @@ -4,9 +4,9 @@ #include "./PointCloudFindNeighborsx.h" -int PointCloudFindNeighborsx( Vector** pflags,double* x, double* y, int nods, double mindistance,double multithread){ +int PointCloudFindNeighborsx(SeqVec** pflags,double* x, double* y, int nods, double mindistance,double multithread){ /*output: */ - Vector* flags=NULL; - flags=new Vector(nods); + SeqVec* flags=NULL; + flags=new SeqVec(nods); /*threading: */ Index: /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.h (revision 13228) +++ /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.h (revision 13229) @@ -11,5 +11,5 @@ /* local prototypes: */ -int PointCloudFindNeighborsx( Vector** pflags,double* x, double* y, int nods, double mindistance,double multithread); +int PointCloudFindNeighborsx(SeqVec** pflags,double* x, double* y, int nods, double mindistance,double multithread); /*threading: */ @@ -20,6 +20,5 @@ int nods; double mindistance; - Vector* flags; - + SeqVec* flags; } PointCloudFindNeighborsThreadStruct; Index: /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp (revision 13228) +++ /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp (revision 13229) @@ -17,5 +17,5 @@ int nods; double mindistance; - Vector* flags; + SeqVec* flags; /*recover handle and gate: */ Index: /issm/trunk-jpl/src/c/shared/Exp/exp.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/exp.h (revision 13228) +++ /issm/trunk-jpl/src/c/shared/Exp/exp.h (revision 13229) @@ -3,5 +3,4 @@ */ - #ifndef _EXP_H_ #define _EXP_H_ @@ -15,8 +14,7 @@ int pnpoly(int npol, double *xp, double *yp, double x, double y, int edgevalue); - /*IsInPoly {{{*/ template -int IsInPoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){ +int IsInPoly(SeqVec* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){ int i; @@ -57,46 +55,4 @@ } return 1; -}/*}}}*/ -/*IsOutsidePoly {{{*/ -template -int IsOutsidePoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){ - - int i,j; - double x0,y0; - doubletype value; - double xmin=xc[0]; - double xmax=xc[0]; - double ymin=yc[0]; - double ymax=yc[0]; - - /*Get extrema*/ - for (i=1;ixmax) xmax=xc[i]; - if(yc[i]ymax) ymax=yc[i]; - } - - /*Go through all vertices of the mesh:*/ - for (i=i0;i do not change it if != 0 - in->GetValue(&value,i); - if (reCast(value)){ - /*this vertex already is inside one of the contours, continue*/ - continue; - } - - /*pick up vertex (x[i],y[i]) and figure out if located inside contour (xc,yc)*/ - x0=x[i]; y0=y[i]; - if(x0xmax || y0ymax){ - value=1; - } - else{ - value=1-pnpoly(numvertices,xc,yc,x0,y0,edgevalue); - } - in->SetValue(i,value,INS_VAL); - } - return 1; }/*}}}*/ /*DomainOutlineRead{{{*/ @@ -244,6 +200,3 @@ } /*}}}*/ - - - #endif Index: sm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 13228) +++ (revision ) @@ -1,211 +1,0 @@ -/*!\file SeqMat.cpp - * \brief: implementation of the SeqMat object - */ - -/*Headers:*/ -/*{{{*/ -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include -#include -#include "../toolkits.h" -#include "../../shared/shared.h" - -/*}}}*/ - -/*SeqMat constructors and destructor*/ -/*FUNCTION SeqMat::SeqMat(){{{*/ -SeqMat::SeqMat(){ - - this->M=0; - this->N=0; - this->matrix=NULL; -} -/*}}}*/ -/*FUNCTION SeqMat::SeqMat(int M,int N){{{*/ -SeqMat::SeqMat(int pM,int pN){ - - this->M=pM; - this->N=pN; - this->matrix=NULL; - if(M*N) this->matrix=xNewZeroInit(pM*pN); -} -/*}}}*/ -/*FUNCTION SeqMat::SeqMat(int M,int N, IssmDouble sparsity){{{*/ -SeqMat::SeqMat(int pM,int pN, IssmDouble sparsity){ - - this->M=pM; - this->N=pN; - this->matrix=NULL; - if(M*N) this->matrix=xNewZeroInit(pM*pN); -} -/*}}}*/ -/*FUNCTION SeqMat::SeqMat(IssmDouble* serial_mat,int M,int N,IssmDouble sparsity){{{*/ -SeqMat::SeqMat(IssmDouble* serial_mat,int pM,int pN,IssmDouble sparsity){ - - int i,j; - - this->M=pM; - this->N=pN; - this->matrix=NULL; - if(M*N){ - this->matrix=xNewZeroInit(pM*pN); - xMemCpy(this->matrix,serial_mat,pM*pN); - } - -} -/*}}}*/ -/*FUNCTION SeqMat::SeqMat(int M,int N, int connectivity, int numberofdofspernode){{{*/ -SeqMat::SeqMat(int pM,int pN, int connectivity,int numberofdofspernode){ - - this->M=pM; - this->N=pN; - this->matrix=NULL; - if(M*N) this->matrix=xNewZeroInit(pM*pN); -} -/*}}}*/ -/*FUNCTION SeqMat::~SeqMat(){{{*/ -SeqMat::~SeqMat(){ - - xDelete(this->matrix); - M=0; - N=0; -} -/*}}}*/ - -/*SeqMat specific routines: */ -/*FUNCTION SeqMat::Echo{{{*/ -void SeqMat::Echo(void){ - - int i,j; - _printLine_("SeqMat size " << this->M << "-" << this->N); - for(i=0;imatrix[N*i+j] << " "); - } - _printLine_(""); - } -} -/*}}}*/ -/*FUNCTION SeqMat::Assemble{{{*/ -void SeqMat::Assemble(void){ - - /*do nothing*/ - -} -/*}}}*/ -/*FUNCTION SeqMat::Norm{{{*/ -IssmDouble SeqMat::Norm(NormMode mode){ - - IssmDouble norm; - IssmDouble absolute; - int i,j; - - switch(mode){ - case NORM_INF: - norm=0; - for(i=0;iM;i++){ - absolute=0; - for(j=0;jN;j++){ - absolute+=fabs(this->matrix[N*i+j]); - } - norm=max(norm,absolute); - } - return norm; - break; - default: - _error_("unknown norm !"); - break; - } -} -/*}}}*/ -/*FUNCTION SeqMat::GetSize{{{*/ -void SeqMat::GetSize(int* pM,int* pN){ - - *pM=this->M; - *pN=this->N; - -} -/*}}}*/ -/*FUNCTION SeqMat::GetLocalSize{{{*/ -void SeqMat::GetLocalSize(int* pM,int* pN){ - - *pM=this->M; - *pN=this->N; - -} -/*}}}*/ -/*FUNCTION SeqMat::MatMult{{{*/ -void SeqMat::MatMult(SeqVec* X,SeqVec* AX){ - - int i,j; - int XM,AXM; - IssmDouble dummy; - - X->GetSize(&XM); - AX->GetSize(&AXM); - - if(M!=AXM)_error_("A and AX should have the same number of rows!"); - if(N!=XM)_error_("A and X should have the same number of columns!"); - - for(i=0;imatrix[N*i+j]*X->vector[j]; - } - AX->vector[i]=dummy; - } - -} -/*}}}*/ -/*FUNCTION SeqMat::Duplicate{{{*/ -SeqMat* SeqMat::Duplicate(void){ - - IssmDouble dummy=0; - - return new SeqMat(this->matrix,this->M,this->N,dummy); - -} -/*}}}*/ -/*FUNCTION SeqMat::ToSerial{{{*/ -IssmDouble* SeqMat::ToSerial(void){ - - IssmDouble* buffer=NULL; - - if(this->M*this->N){ - buffer=xNew(this->M*this->N); - xMemCpy(buffer,this->matrix,this->M*this->N); - } - return buffer; - -} -/*}}}*/ -/*FUNCTION SeqMat::SetValues{{{*/ -void SeqMat::SetValues(int m,int* idxm,int n,int* idxn,IssmDouble* values,InsMode mode){ - - int i,j; - switch(mode){ - case ADD_VAL: - for(i=0;imatrix[N*idxm[i]+idxn[j]]+=values[n*i+j]; - break; - case INS_VAL: - for(i=0;imatrix[N*idxm[i]+idxn[j]]=values[n*i+j]; - break; - default: - _error_("unknown insert mode!"); - break; - } - -} -/*}}}*/ -/*FUNCTION SeqMat::Convert{{{*/ -void SeqMat::Convert(MatrixType type){ - - /*do nothing*/ - -} -/*}}}*/ Index: sm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 13228) +++ (revision ) @@ -1,237 +1,0 @@ -/*!\file SeqVec.cpp - * \brief: implementation of the SeqVec object - */ - -/*Headers:*/ -/*{{{*/ -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include -#include -#include "../toolkits.h" -#include "../../shared/shared.h" - -/*}}}*/ - -/*SeqVec constructors and destructor*/ -/*FUNCTION SeqVec::SeqVec(){{{*/ -SeqVec::SeqVec(){ - - this->M=0; - this->vector=NULL; -} -/*}}}*/ -/*FUNCTION SeqVec::SeqVec(int M,bool fromlocalsize){{{*/ -SeqVec::SeqVec(int pM,bool fromlocalsize){ - - this->M=pM; - this->vector=NULL; - if(this->M) this->vector=xNewZeroInit(pM); -} -/*}}}*/ -/*FUNCTION SeqVec::SeqVec(IssmDouble* serial_vec,int M){{{*/ -SeqVec::SeqVec(IssmDouble* buffer,int pM){ - - int i,j; - - this->M=pM; - this->vector=NULL; - if(this->M){ - this->vector=xNew(pM); - xMemCpy(this->vector,buffer,pM); - } -} -/*}}}*/ - /*FUNCTION SeqVec::~SeqVec(){{{*/ -SeqVec::~SeqVec(){ - xDelete(this->vector); - M=0; -} -/*}}}*/ - -/*SeqVec specific routines: */ -/*FUNCTION SeqVec::Echo{{{*/ -void SeqVec::Echo(void){ - - int i; - _printLine_("SeqVec size " << this->M); - for(i=0;ivector[list[i]]+=values[i]; - break; - case INS_VAL: - for(i=0;ivector[list[i]]=values[i]; - break; - default: - _error_("unknown insert mode!"); - break; - } - -} -/*}}}*/ -/*FUNCTION SeqVec::SetValue{{{*/ -void SeqVec::SetValue(int dof, IssmDouble value, InsMode mode){ - - switch(mode){ - case ADD_VAL: - this->vector[dof]+=value; - break; - case INS_VAL: - this->vector[dof]=value; - break; - default: - _error_("unknown insert mode!"); - break; - } -} -/*}}}*/ -/*FUNCTION SeqVec::GetValue{{{*/ -void SeqVec::GetValue(IssmDouble* pvalue,int dof){ - - *pvalue=this->vector[dof]; - -} -/*}}}*/ - -/*FUNCTION SeqVec::GetSize{{{*/ -void SeqVec::GetSize(int* pM){ - - *pM=this->M; - -} -/*}}}*/ -/*FUNCTION SeqVec::GetLocalSize{{{*/ -void SeqVec::GetLocalSize(int* pM){ - - *pM=this->M; - -} -/*}}}*/ -/*FUNCTION SeqVec::Duplicate{{{*/ -SeqVec* SeqVec::Duplicate(void){ - - return new SeqVec(this->vector,this->M); - -} -/*}}}*/ -/*FUNCTION SeqVec::Set{{{*/ -void SeqVec::Set(IssmDouble value){ - - int i; - for(i=0;iM;i++)this->vector[i]=value; - -} -/*}}}*/ -/*FUNCTION SeqVec::AXPY{{{*/ -void SeqVec::AXPY(SeqVec* X, IssmDouble a){ - - int i; - - /*y=a*x+y where this->vector is y*/ - for(i=0;iM;i++)this->vector[i]=a*X->vector[i]+this->vector[i]; - -} -/*}}}*/ -/*FUNCTION SeqVec::AYPX{{{*/ -void SeqVec::AYPX(SeqVec* X, IssmDouble a){ - - int i; - - /*y=x+a*y where this->vector is y*/ - for(i=0;iM;i++)this->vector[i]=X->vector[i]+a*this->vector[i]; - -} -/*}}}*/ -/*FUNCTION SeqVec::ToMPISerial{{{*/ -IssmDouble* SeqVec::ToMPISerial(void){ - - IssmDouble* buffer=NULL; - - if(this->M){ - buffer=xNew(this->M); - xMemCpy(buffer,this->vector,this->M); - } - return buffer; - -} -/*}}}*/ -/*FUNCTION SeqVec::Copy{{{*/ -void SeqVec::Copy(SeqVec* to){ - - int i; - - to->M=this->M; - for(i=0;iM;i++)to->vector[i]=this->vector[i]; - -} -/*}}}*/ -/*FUNCTION SeqVec::Norm{{{*/ -IssmDouble SeqVec::Norm(NormMode mode){ - - IssmDouble norm; - int i; - - switch(mode){ - case NORM_INF: - norm=0; for(i=0;iM;i++)norm=max(norm,fabs(this->vector[i])); - return norm; - break; - case NORM_TWO: - norm=0; - for(i=0;iM;i++)norm+=pow(this->vector[i],2); - return sqrt(norm); - break; - default: - _error_("unknown norm !"); - break; - } -} -/*}}}*/ -/*FUNCTION SeqVec::Scale{{{*/ -void SeqVec::Scale(IssmDouble scale_factor){ - - int i; - for(i=0;iM;i++)this->vector[i]=scale_factor*this->vector[i]; - -} -/*}}}*/ -/*FUNCTION SeqVec::Dot{{{*/ -IssmDouble SeqVec::Dot(SeqVec* input){ - - int i; - - IssmDouble dot=0; - for(i=0;iM;i++)dot+=this->vector[i]*input->vector[i]; - return dot; - -} -/*}}}*/ -/*FUNCTION SeqVec::PointwiseDivide{{{*/ -void SeqVec::PointwiseDivide(SeqVec* x,SeqVec* y){ - - int i; - /*pointwise w=x/y where this->vector is w: */ - for(i=0;iM;i++)this->vector[i]=x->vector[i]/y->vector[i]; -} -/*}}}*/ Index: /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h (revision 13228) +++ /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h (revision 13229) @@ -41,4 +41,12 @@ } /*}}}*/ + /*FUNCTION SeqVec(int M){{{*/ + SeqVec(int pM){ + + this->M=pM; + this->vector=NULL; + if(this->M) this->vector=xNewZeroInit(pM); + } + /*}}}*/ /*FUNCTION SeqVec(int M,bool fromlocalsize){{{*/ SeqVec(int pM,bool fromlocalsize){ Index: /issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp =================================================================== --- /issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp (revision 13228) +++ /issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp (revision 13229) @@ -37,6 +37,6 @@ /* output: */ - Vector *in_nod = NULL; - Vector *in_elem = NULL; + SeqVec *in_nod = NULL; + SeqVec *in_elem = NULL; /*Boot module: */ Index: /issm/trunk-jpl/src/modules/ContourToNodes/ContourToNodes.cpp =================================================================== --- /issm/trunk-jpl/src/modules/ContourToNodes/ContourToNodes.cpp (revision 13228) +++ /issm/trunk-jpl/src/modules/ContourToNodes/ContourToNodes.cpp (revision 13229) @@ -29,18 +29,18 @@ /* required input: */ - double* x=NULL; - double* y=NULL; int edgevalue; - char* interptype=NULL; + double *x = NULL; + double *y = NULL; + char *interptype = NULL; /* output: */ - Vector* flags=NULL; + SeqVec *flags = NULL; int nods; - //contours - mxArray* matlabstructure=NULL; + /*contours*/ int numcontours; - Contour** contours=NULL; - Contour* contouri=NULL; + mxArray *matlabstructure = NULL; + Contour **contours = NULL; + Contour *contouri = NULL; /*Boot module: */ @@ -49,5 +49,4 @@ /*checks on arguments on the matlab side: */ CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToNodesUsage); - /*Fetch inputs: */ @@ -56,9 +55,8 @@ FetchData(&edgevalue,EDGEVALUEHANDLE); - //Fetch contours - + /*Fetch contours*/ if(mxIsChar(FILENAME)){ /*Call expread on filename to build a contour array in the matlab workspace: */ - mexCallMATLAB( 1, &matlabstructure, 1, (mxArray**)&FILENAME, "expread"); + mexCallMATLAB(1,&matlabstructure,1,(mxArray**)&FILENAME,"expread"); } else{ @@ -80,15 +78,4 @@ } - /* Debugging of contours :{{{1*/ - /*for(i=0;inods); - for (j=0;jnods;j++){ - _printLine_(" " << *(contouri->x+j) << "f " << *(contouri->y+j) << "f"); - } - }*/ - /*}}}*/ - /*Run interpolation routine: */ ContourToNodesx(&flags,x,y,nods,contours,numcontours,edgevalue); @@ -99,5 +86,4 @@ /*end module: */ MODULEEND(); - } Index: /issm/trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.cpp =================================================================== --- /issm/trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 13228) +++ /issm/trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 13229) @@ -25,11 +25,11 @@ /*input: */ - double* x=NULL; - double* y=NULL; + double *x = NULL; + double *y = NULL; int x_rows,y_rows; - double* data=NULL; + double *data = NULL; int data_rows,data_cols; - double* x_mesh=NULL; - double* y_mesh=NULL; + double *x_mesh = NULL; + double *y_mesh = NULL; int x_mesh_rows,y_mesh_rows; double default_value; @@ -37,5 +37,5 @@ /* output: */ - Vector* data_mesh=NULL; + SeqVec* data_mesh=NULL; /*Boot module: */ @@ -43,5 +43,4 @@ /*checks on arguments on the matlab side: */ - //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromGridToMeshUsage); if((nlhs!=NLHS) || (nrhs!=6 && nrhs!=7)){ InterpFromGridToMeshUsage(); Index: /issm/trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.cpp =================================================================== --- /issm/trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.cpp (revision 13228) +++ /issm/trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.cpp (revision 13229) @@ -1,20 +1,4 @@ /*!\file InterpFromMesh2d.c * \brief: data interpolation from a list of (x,y,values) into mesh vertices - - InterpFromMesh2d.c - - usage: - data_mesh=InterpFromMesh2d(index,x,y,data,x_mesh,y_mesh); - - where: - - input: - x,y: coordinates of matrix data - data - matrix holding the data to be interpolated onto the mesh. - x_mesh,y_mesh: coordinates of the mesh vertices onto which we interpolate. - - output: - data_mesh: vector of mesh interpolated data. - */ @@ -48,10 +32,10 @@ int num_default_values=0; - //contours - mxArray* matlabstructure=NULL; - Contour** contours=NULL; - int numcontours; - Contour* contouri=NULL; - int i; + /*contours*/ + int i; + mxArray *matlabstructure = NULL; + Contour **contours=NULL; + int numcontours; + Contour *contouri=NULL; /*Intermediary*/ @@ -61,5 +45,5 @@ /* output: */ - Vector* data_prime=NULL; + SeqVec *data_prime = NULL; /*Boot module: */ Index: /issm/trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp =================================================================== --- /issm/trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (revision 13228) +++ /issm/trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (revision 13229) @@ -55,5 +55,5 @@ /* output: */ - Vector* data_prime=NULL; + SeqVec* data_prime=NULL; /*Boot module: */ @@ -96,6 +96,5 @@ } -void InterpFromMeshToMesh3dUsage(void) -{ +void InterpFromMeshToMesh3dUsage(void){ _pprintLine_("INTERPFROMMESHTOMESH3D - interpolation from a 3d hexahedron mesh onto a list of point"); _pprintLine_(""); Index: /issm/trunk-jpl/src/modules/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp =================================================================== --- /issm/trunk-jpl/src/modules/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp (revision 13228) +++ /issm/trunk-jpl/src/modules/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp (revision 13229) @@ -10,6 +10,6 @@ /* required input: */ - double* x=NULL; - double* y=NULL; + double *x = NULL; + double *y = NULL; int nods; double mindistance; @@ -17,5 +17,5 @@ /* output: */ - Vector* flags=NULL; + SeqVec *flags = NULL; /*Boot module: */