Changeset 13867

Timestamp:

11/01/12 11:44:02 (12 years ago)

Author:

jschierm

Message:

CHG: Changed checks in WriteData.py to allow lists and tuples.

File:

• issm/trunk-jpl/src/m/solve/WriteData.py (modified) (5 diffs)

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -101 +101 @@
         elif strcmpi(format,'BooleanMat'):    # {{{
 
-                if isinstance(data,bool):
+                if not isinstance(data,numpy.ndarray):
                         data=numpy.array([data])
                 if len(data.shape) == 1:
@@ -132 +132 @@
         elif strcmpi(format,'IntMat'):    # {{{
 
-                if isinstance(data,(int,long)):
+                if not isinstance(data,numpy.ndarray):
                         data=numpy.array([data])
                 if len(data.shape) == 1:
@@ -163 +163 @@
         elif strcmpi(format,'DoubleMat'):    # {{{
 
-                if isinstance(data,(bool,int,long,float)):
+                if not isinstance(data,numpy.ndarray):
                         data=numpy.array([data])
                 if len(data.shape) == 1:
@@ -197 +197 @@
                 recordlength=4+4    #number of records + code
                 for matrix in data:
-                        if isinstance(matrix,(bool,int,long,float)):
+                        if not isinstance(matrix,numpy.ndarray):
                                 matrix=numpy.array([matrix])
                         if len(matrix.shape) == 1:
@@ -219 +219 @@
                 #write each matrix: 
                 for matrix in data:
-                        if isinstance(matrix,(bool,int,long,float)):
+                        if not isinstance(matrix,numpy.ndarray):
                                 matrix=numpy.array([matrix])
                         if len(matrix.shape) == 1: