Changeset 11716

Timestamp:

03/14/12 17:09:20 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added support for empty vectors in serial mode

Location:

issm/trunk-jpl/src/c

Files:

• io/Matlab/FetchMatlabData.cpp (modified) (2 diffs)
• io/Matlab/WriteMatlabData.cpp (modified) (1 diff)
• modules/Solverx/Solverx.cpp (modified) (2 diffs)
• toolkits/petsc/patches/PetscVectorToMatlabVector.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/io/Matlab/FetchMatlabData.cpp

@@ -286 +286 @@
                 /*Check dataref is not pointing to NaN: */
                 if ( mxIsNaN(*(mxGetPr(dataref))) && (mxGetM(dataref)==1) && (mxGetN(dataref)==1) ){
-                        outmatrix=NULL;
+                        outmatrix=new Matrix(0,0);
                 }
                 else{
@@ -434 +434 @@
         if(mxIsEmpty(dataref)){
                 /*Nothing to pick up. Just initialize matrix pointer to NULL: */
-                vector=NULL;
+                vector=new Vector(0);
         }
         else if (mxIsClass(dataref,"double") ){

issm/trunk-jpl/src/c/io/Matlab/WriteMatlabData.cpp

@@ -114 +114 @@
         
         if(vector){
-                
                 /*call toolkit routine: */
                 dataref=vector->ToMatlabVector();

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

@@ -16 +16 @@
 void    Solverx(Vector** puf, Matrix* Kff, Vector* pf, Vector* uf0,Vector* df, Parameters* parameters){
 
-        /*output: */
-        Vector* uf=NULL;
-        uf=new Vector();
-
         /*Intermediary: */
         int analysis_type;
+
+        /*output: */
+        Vector *uf=new Vector();
+
+        /*In debugging mode, check that stiffness matrix and load vectors are not NULL (they can be empty)*/
+        _assert_(Kff);
+        _assert_(pf);
 
         #ifdef _HAVE_PETSC_
         Vec uf0_vector = NULL;
         Vec df_vector  = NULL;
-        if(uf0) uf0_vector=uf0->vector;
-        if(df)  df_vector = df->vector;
+        if(uf0) uf0_vector = uf0->vector;
+        if(df)  df_vector  = df->vector;
 
         /*In serial mode, the Petsc Options database has not been initialized properly: */
@@ -37 +40 @@
         SolverxPetsc(&uf->vector,Kff->matrix,pf->vector,uf0_vector,df_vector,parameters);
         if(uf->vector == NULL){
-                uf->M;
+                uf->M = 0;
         }
         else{

issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscVectorToMatlabVector.cpp

@@ -27 +27 @@
 int PetscVectorToMatlabVector(mxArray** pdataref,Vec vector){
 
-
-        int i;
-        int rows;
-        int* idxm=NULL;
-        double* values=NULL;
+        int     i;
+        int     rows;
+        int    *idxm   = NULL;
+        double *values = NULL;
 
         /*output: */
@@ -37 +36 @@
 
         /*Get size of vector: */
-        VecGetSize(vector,&rows);
+        if(vector){
+                VecGetSize(vector,&rows);
+                if(rows){
+                        idxm=(int*)xmalloc(rows*sizeof(int));
+                        values=(double*)xmalloc(rows*sizeof(double));
+                        for(i=0;i<rows;i++)idxm[i]=i;
 
-        if(rows){
-                idxm=(int*)xmalloc(rows*sizeof(int));
-                values=(double*)xmalloc(rows*sizeof(double));
-                for(i=0;i<rows;i++)idxm[i]=i;
-                 
-                VecGetValues(vector,rows,idxm,values);
+                        VecGetValues(vector,rows,idxm,values);
+                }
+        }
+        else{
+                rows=0;
         }
 
@@ -61 +64 @@
 }
 
-
 #endif  //#ifdef _SERIAL_
-