Changeset 13740
- Timestamp:
- 10/18/12 15:43:37 (12 years ago)
- Location:
- issm/trunk-jpl/src/m/classes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/diagnostic.py
r13171 r13740 2 2 import numpy 3 3 import sys 4 import copy 4 5 from fielddisplay import fielddisplay 5 6 from EnumDefinitions import * … … 186 187 187 188 #marshall ice front 188 data= self.icefront189 data=copy.deepcopy(self.icefront) 189 190 data[numpy.nonzero(data[:,-1]==0),-1]=AirEnum() 190 191 data[numpy.nonzero(data[:,-1]==1),-1]=WaterEnum() -
issm/trunk-jpl/src/m/classes/flowequation.py
r13455 r13740 1 1 #module imports 2 import numpy 2 3 import copy 3 import numpy4 4 from fielddisplay import fielddisplay 5 5 from EnumDefinitions import * … … 82 82 83 83 def marshall(self,fid): # {{{ 84 #print "marshalling flowequation-1"85 #print self.vertex_equation86 84 WriteData(fid,'object',self,'fieldname','ismacayealpattyn','format','Boolean') 87 85 WriteData(fid,'object',self,'fieldname','ishutter','format','Boolean') … … 92 90 WriteData(fid,'object',self,'fieldname','borderstokes','format','DoubleMat','mattype',1) 93 91 #convert approximations to enums 94 ## data=list(self.vertex_equation)95 92 data=copy.deepcopy(self.vertex_equation) 96 93 data[numpy.nonzero(data==0)]=NoneApproximationEnum() … … 104 101 data[numpy.nonzero(data==8)]=L1L2ApproximationEnum() 105 102 WriteData(fid,'data',data,'enum',FlowequationVertexEquationEnum(),'format','DoubleMat','mattype',1) 106 ########data=self.element_equation107 103 data=copy.deepcopy(self.element_equation) 108 104 data[numpy.nonzero(data==0)]=NoneApproximationEnum() … … 116 112 data[numpy.nonzero(data==8)]=L1L2ApproximationEnum() 117 113 WriteData(fid,'data',data,'enum',FlowequationElementEquationEnum(),'format','DoubleMat','mattype',2) 118 #print "marshalling flowequation-4"119 #print self.vertex_equation120 114 # }}} 121 115 -
issm/trunk-jpl/src/m/classes/inversion.py
r13642 r13740 1 1 #module imports 2 2 import numpy 3 import copy 3 4 from fielddisplay import fielddisplay 4 5 from EnumDefinitions import * … … 178 179 #process cost functions 179 180 num_cost_functions=numpy.size(self.cost_functions,axis=1) 180 data= self.cost_functions181 data=copy.deepcopy(self.cost_functions) 181 182 data[numpy.nonzero(data==101)]=SurfaceAbsVelMisfitEnum() 182 183 data[numpy.nonzero(data==102)]=SurfaceRelVelMisfitEnum() -
issm/trunk-jpl/src/m/classes/verbose.py
r13098 r13740 125 125 126 126 def marshall(self,fid): # {{{ 127 127 WriteData(fid,'data',self.VerboseToBinary(),'enum',VerboseEnum(),'format','Integer') 128 128 # }}} 129 129
Note:
See TracChangeset
for help on using the changeset viewer.