Changeset 7188

Timestamp:

01/26/11 14:57:01 (14 years ago)

Author:

Mathieu Morlighem

Message:

Changed philosophy here: if a matlab empty matlab sparse matrix is to be converted to a petsc Mat, Create an empty Mat object instead of returning a NULL pointer

Location:

issm/trunk/src/c

Files:

• io/FetchData.cpp (modified) (1 diff)
• modules/Solverx/Solverx.cpp (modified) (1 diff)
• toolkits/petsc/patches/MatlabMatrixToPetscMatrix.cpp (modified) (1 diff)

issm/trunk/src/c/io/FetchData.cpp

@@ -95 +95 @@
         int dummy=0;
 
-        if(mxIsEmpty(dataref) ){
-                /*Nothing to pick up. Just initialize matrix pointer to NULL: */
-                outmatrix=NULL;
-        }
-        else if (mxIsDouble(dataref) ){
+        if (mxIsDouble(dataref) ){
 
                 /*Check dataref is not pointing to NaN: */

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

@@ -40 +40 @@
 
         /*First, check that f-set is not NULL, ie model is fully constrained: */
+        _assert_(Kff);
         MatGetSize(Kff,&global_m,&global_n); _assert_(global_m==global_m);
         if(!global_n){

issm/trunk/src/c/toolkits/petsc/patches/MatlabMatrixToPetscMatrix.cpp

@@ -54 +54 @@
                 cols=mxGetN(mxmatrix);
                 nnz=mxGetNzmax(mxmatrix);
-                nz=(int)((double)nnz/(double)rows);
+                if(rows){
+                        nz=(int)((double)nnz/(double)rows);
+                }
+                else{
+                        nz=0;
+                }
 
                 ierr=MatCreateSeqAIJ(PETSC_COMM_SELF,rows,cols,nz,PETSC_NULL,&matrix);CHKERRQ(ierr);