Changeset 13740

Timestamp:

10/18/12 15:43:37 (12 years ago)

Author:

jschierm

Message:

BUG: Python's habit of copying pointers rather than data can be very frustrating to debug.

Location:

issm/trunk-jpl/src/m/classes

Files:

• diagnostic.py (modified) (2 diffs)
• flowequation.py (modified) (5 diffs)
• inversion.py (modified) (2 diffs)
• verbose.py (modified) (1 diff)

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

@@ -2 +2 @@
 import numpy
 import sys
+import copy
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
@@ -186 +187 @@
 
                 #marshall ice front
-                data=self.icefront
+                data=copy.deepcopy(self.icefront)
                 data[numpy.nonzero(data[:,-1]==0),-1]=AirEnum()
                 data[numpy.nonzero(data[:,-1]==1),-1]=WaterEnum()

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

@@ -1 +1 @@
 #module imports
+import numpy
 import copy
-import numpy
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
@@ -82 +82 @@
 
         def marshall(self,fid):    # {{{
-                #print "marshalling flowequation-1"
-                #print self.vertex_equation
                 WriteData(fid,'object',self,'fieldname','ismacayealpattyn','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','ishutter','format','Boolean')
@@ -92 +90 @@
                 WriteData(fid,'object',self,'fieldname','borderstokes','format','DoubleMat','mattype',1)
                 #convert approximations to enums
-                ## data=list(self.vertex_equation)
                 data=copy.deepcopy(self.vertex_equation)
                 data[numpy.nonzero(data==0)]=NoneApproximationEnum()
@@ -104 +101 @@
                 data[numpy.nonzero(data==8)]=L1L2ApproximationEnum()
                 WriteData(fid,'data',data,'enum',FlowequationVertexEquationEnum(),'format','DoubleMat','mattype',1)
-                ########data=self.element_equation
                 data=copy.deepcopy(self.element_equation)
                 data[numpy.nonzero(data==0)]=NoneApproximationEnum()
@@ -116 +112 @@
                 data[numpy.nonzero(data==8)]=L1L2ApproximationEnum()
                 WriteData(fid,'data',data,'enum',FlowequationElementEquationEnum(),'format','DoubleMat','mattype',2)
-                #print "marshalling flowequation-4"
-                #print self.vertex_equation
         # }}}
 

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

@@ -1 +1 @@
 #module imports
 import numpy
+import copy
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
@@ -178 +179 @@
                 #process cost functions
                 num_cost_functions=numpy.size(self.cost_functions,axis=1)
-                data=self.cost_functions
+                data=copy.deepcopy(self.cost_functions)
                 data[numpy.nonzero(data==101)]=SurfaceAbsVelMisfitEnum()
                 data[numpy.nonzero(data==102)]=SurfaceRelVelMisfitEnum()

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

@@ -125 +125 @@
 
         def marshall(self,fid):    # {{{
-                        WriteData(fid,'data',self.VerboseToBinary(),'enum',VerboseEnum(),'format','Integer')
+                WriteData(fid,'data',self.VerboseToBinary(),'enum',VerboseEnum(),'format','Integer')
         # }}}