Changeset 11758

Timestamp:

03/20/12 16:51:50 (13 years ago)

Author:

Eric.Larour

Message:

Took out segfault, remnant of data references from Cielo

File:

• issm/trunk-jpl/src/c/io/Matlab/FetchMatlabData.cpp (modified) (2 diffs)

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

@@ -283 +283 @@
 
         if (mxIsClass(dataref,"double") ){
-
-                /*Check dataref is not pointing to NaN: */
-                if ( mxIsNaN(*(mxGetPr(dataref))) && (mxGetM(dataref)==1) && (mxGetN(dataref)==1) ){
-                        outmatrix=new Matrix(0,0);
-                }
-                else{
-
-                        /*Convert matlab matrix to petsc matrix: */
-                        outmatrix=MatlabMatrixToMatrix(dataref);
-                }
+                        
+                /*Convert matlab matrix to matrix: */
+                outmatrix=MatlabMatrixToMatrix(dataref);
+
         }
         else{
@@ -428 +422 @@
 /*FUNCTION FetchMatlabData(Vector** pvector,const mxArray* dataref){{{1*/
 void FetchMatlabData(Vector** pvector,const mxArray* dataref){
-
+        
         Vector* vector=NULL;
         int dummy;