Changeset 13715

Timestamp:

10/17/12 13:29:15 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not marshall rifts if numrifts=0

File:

• issm/trunk-jpl/src/m/classes/rifts.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/rifts.py

@@ -71 +71 @@
 
                 numpairs=0
-                for rift in self.riftstruct:
-                        numpairs+=numpy.size(rift['penaltypairs'],axis=0)
+                if numrifts:
+                        for rift in self.riftstruct:
+                                numpairs+=numpy.size(rift['penaltypairs'],axis=0)
 
                 # 2 for nodes + 2 for elements+ 2 for  normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction + 1 for fractionincrement + 1 for state.
                 data=numpy.zeros((numpairs,12))
-                count=0
-                for rift in self.riftstruct:
-                        numpairsforthisrift=numpy.size(rift['penaltypairs'],0)
-                        data[count:count+numpairsforthisrift,0:7]=rift['penaltypairs']
-                        data[count:count+numpairsforthisrift,7]=rift['fill']
-                        data[count:count+numpairsforthisrift,8]=rift['friction']
-                        data[count:count+numpairsforthisrift,9]=rift['fraction']
-                        data[count:count+numpairsforthisrift,10]=rift['fractionincrement']
-                        data[count:count+numpairsforthisrift,11]=rift['state'].reshape(-1)
-                        count+=numpairsforthisrift
+                if numrifts:
+                        count=0
+                        for rift in self.riftstruct:
+                                numpairsforthisrift=numpy.size(rift['penaltypairs'],0)
+                                data[count:count+numpairsforthisrift,0:7]=rift['penaltypairs']
+                                data[count:count+numpairsforthisrift,7]=rift['fill']
+                                data[count:count+numpairsforthisrift,8]=rift['friction']
+                                data[count:count+numpairsforthisrift,9]=rift['fraction']
+                                data[count:count+numpairsforthisrift,10]=rift['fractionincrement']
+                                data[count:count+numpairsforthisrift,11]=rift['state'].reshape(-1)
+                                count+=numpairsforthisrift
 
                 WriteData(fid,'data',numrifts,'enum',RiftsNumriftsEnum(),'format','Integer')