source: issm/oecreview/Archive/19101-20495/ISSM-20281-20282.diff@ 20498

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 2.8 KB
RevLine 
[20498]1Index: ../trunk-jpl/src/m/classes/flowequation.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/flowequation.py (revision 20281)
4+++ ../trunk-jpl/src/m/classes/flowequation.py (revision 20282)
5@@ -137,26 +137,28 @@
6 WriteData(fid,'object',self,'fieldname','borderHO','format','DoubleMat','mattype',1)
7 WriteData(fid,'object',self,'fieldname','borderFS','format','DoubleMat','mattype',1)
8 #convert approximations to enums
9- data=copy.deepcopy(self.vertex_equation)
10- data[numpy.nonzero(data==0)]=NoneApproximationEnum()
11- data[numpy.nonzero(data==1)]=SIAApproximationEnum()
12- data[numpy.nonzero(data==2)]=SSAApproximationEnum()
13- data[numpy.nonzero(data==3)]=L1L2ApproximationEnum()
14- data[numpy.nonzero(data==4)]=HOApproximationEnum()
15- data[numpy.nonzero(data==5)]=FSApproximationEnum()
16- data[numpy.nonzero(data==6)]=SSAHOApproximationEnum()
17- data[numpy.nonzero(data==7)]=HOFSApproximationEnum()
18- data[numpy.nonzero(data==8)]=SSAFSApproximationEnum()
19+ data=copy.deepcopy(self.vertex_equation);
20+ if numpy.isnan(data)==0:
21+ data[numpy.nonzero(data==0)]=NoneApproximationEnum()
22+ data[numpy.nonzero(data==1)]=SIAApproximationEnum()
23+ data[numpy.nonzero(data==2)]=SSAApproximationEnum()
24+ data[numpy.nonzero(data==3)]=L1L2ApproximationEnum()
25+ data[numpy.nonzero(data==4)]=HOApproximationEnum()
26+ data[numpy.nonzero(data==5)]=FSApproximationEnum()
27+ data[numpy.nonzero(data==6)]=SSAHOApproximationEnum()
28+ data[numpy.nonzero(data==7)]=HOFSApproximationEnum()
29+ data[numpy.nonzero(data==8)]=SSAFSApproximationEnum()
30 WriteData(fid,'data',data,'enum',FlowequationVertexEquationEnum(),'format','DoubleMat','mattype',1)
31 data=copy.deepcopy(self.element_equation)
32- data[numpy.nonzero(data==0)]=NoneApproximationEnum()
33- data[numpy.nonzero(data==1)]=SIAApproximationEnum()
34- data[numpy.nonzero(data==2)]=SSAApproximationEnum()
35- data[numpy.nonzero(data==3)]=L1L2ApproximationEnum()
36- data[numpy.nonzero(data==4)]=HOApproximationEnum()
37- data[numpy.nonzero(data==5)]=FSApproximationEnum()
38- data[numpy.nonzero(data==6)]=SSAHOApproximationEnum()
39- data[numpy.nonzero(data==7)]=SSAFSApproximationEnum()
40- data[numpy.nonzero(data==8)]=HOFSApproximationEnum()
41+ if numpy.isnan(data)==0:
42+ data[numpy.nonzero(data==0)]=NoneApproximationEnum()
43+ data[numpy.nonzero(data==1)]=SIAApproximationEnum()
44+ data[numpy.nonzero(data==2)]=SSAApproximationEnum()
45+ data[numpy.nonzero(data==3)]=L1L2ApproximationEnum()
46+ data[numpy.nonzero(data==4)]=HOApproximationEnum()
47+ data[numpy.nonzero(data==5)]=FSApproximationEnum()
48+ data[numpy.nonzero(data==6)]=SSAHOApproximationEnum()
49+ data[numpy.nonzero(data==7)]=SSAFSApproximationEnum()
50+ data[numpy.nonzero(data==8)]=HOFSApproximationEnum()
51 WriteData(fid,'data',data,'enum',FlowequationElementEquationEnum(),'format','DoubleMat','mattype',2)
52 # }}}
Note: See TracBrowser for help on using the repository browser.