source: issm/oecreview/Archive/16133-16554/ISSM-16294-16295.diff@ 16556

Last change on this file since 16556 was 16556, checked in by Mathieu Morlighem, 11 years ago

NEW: added Archive/16133-16554
File size: 9.7 KB
RevLine 
[16556]1Index: ../trunk-jpl/src/m/classes/mesh2d.m
2===================================================================
3--- ../trunk-jpl/src/m/classes/mesh2d.m (revision 16294)
4+++ ../trunk-jpl/src/m/classes/mesh2d.m (revision 16295)
5@@ -1,9 +1,9 @@
6-%MESH class definition
7+%MESH2D class definition
8 %
9 % Usage:
10-% mesh=mesh();
11+% mesh2d=mesh2d();
12
13-classdef mesh
14+classdef mesh2d
15 properties (SetAccess=public)
16 x = NaN;
17 y = NaN;
18@@ -29,7 +29,7 @@
19 extractedelements = NaN
20 end
21 methods
22- function obj = mesh(varargin) % {{{
23+ function obj = mesh2d(varargin) % {{{
24 switch nargin
25 case 0
26 obj=setdefaultparameters(obj);
27@@ -57,7 +57,6 @@
28 end
29 md = checkfield(md,'mesh.numberofelements','>',0);
30 md = checkfield(md,'mesh.numberofvertices','>',0);
31- md = checkfield(md,'mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]);
32 md = checkfield(md,'mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d');
33
34 switch(solution),
35@@ -95,12 +94,17 @@
36 fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' ');
37 end % }}}
38 function marshall(obj,md,fid) % {{{
39- WriteData(fid,'object',obj,'fieldname','x','format','DoubleMat','mattype',1);
40- WriteData(fid,'object',obj,'fieldname','y','format','DoubleMat','mattype',1);
41- WriteData(fid,'object',obj,'fieldname','elements','format','DoubleMat','mattype',2);
42- WriteData(fid,'object',obj,'fieldname','numberofelements','format','Integer');
43- WriteData(fid,'object',obj,'fieldname','numberofvertices','format','Integer');
44- WriteData(fid,'object',obj,'fieldname','average_vertex_connectivity','format','Integer');
45+ WriteData(fid,'enum',MeshTypeEnum(),'data',StringToEnum(['Mesh' meshtype(obj)]),'format','Integer');
46+ WriteData(fid,'object',obj,'class','mesh','fieldname','x','format','DoubleMat','mattype',1);
47+ WriteData(fid,'object',obj,'class','mesh','fieldname','y','format','DoubleMat','mattype',1);
48+ WriteData(fid,'enum',MeshZEnum(),'data',zeros(obj.numberofvertices,1),'format','DoubleMat','mattype',1);
49+ WriteData(fid,'object',obj,'class','mesh','fieldname','elements','format','DoubleMat','mattype',2);
50+ WriteData(fid,'object',obj,'class','mesh','fieldname','numberofelements','format','Integer');
51+ WriteData(fid,'object',obj,'class','mesh','fieldname','numberofvertices','format','Integer');
52+ WriteData(fid,'object',obj,'class','mesh','fieldname','average_vertex_connectivity','format','Integer');
53 end % }}}
54+ function t = meshtype(obj) % {{{
55+ t = '2Dhorizontal';
56+ end % }}}
57 end
58 end
59Index: ../trunk-jpl/src/m/classes/stressbalance.py
60===================================================================
61--- ../trunk-jpl/src/m/classes/stressbalance.py (revision 16294)
62+++ ../trunk-jpl/src/m/classes/stressbalance.py (revision 16295)
63@@ -111,7 +111,7 @@
64
65 md = checkfield(md,'stressbalance.spcvx','forcing',1)
66 md = checkfield(md,'stressbalance.spcvy','forcing',1)
67- if md.mesh.dimension==3:
68+ if strcmp(md.mesh.meshtype(),'3D'):
69 md = checkfield(md,'stressbalance.spcvz','forcing',1)
70 md = checkfield(md,'stressbalance.restol','size',[1],'>',0)
71 md = checkfield(md,'stressbalance.reltol','size',[1])
72@@ -144,8 +144,7 @@
73 if numpy.abs(numpy.inner(item[0:2],item[3:5]))>sys.float_info.epsilon:
74 md.checkmessage("Vectors in stressbalance.referential (columns 1 to 3 and 4 to 6) must be orthogonal")
75 #CHECK THAT NO rotation specified for FS Grounded ice at base
76-# if md.mesh.dimension==3 & md.flowequation.isFS,
77- if md.mesh.dimension==3 and md.flowequation.isFS:
78+ if strcmp(md.mesh.meshtype(),'3D') and md.flowequation.isFS:
79 pos=numpy.nonzero(numpy.logical_and(md.mask.groundedice_levelset,md.mesh.vertexonbed))
80 if numpy.any(numpy.logical_not(numpy.isnan(md.stressbalance.referential[pos,:]))):
81 md.checkmessage("no referential should be specified for basal vertices of grounded ice")
82Index: ../trunk-jpl/src/m/classes/stressbalance.m
83===================================================================
84--- ../trunk-jpl/src/m/classes/stressbalance.m (revision 16294)
85+++ ../trunk-jpl/src/m/classes/stressbalance.m (revision 16295)
86@@ -80,7 +80,7 @@
87
88 md = checkfield(md,'stressbalance.spcvx','forcing',1);
89 md = checkfield(md,'stressbalance.spcvy','forcing',1);
90- if md.mesh.dimension==3, md = checkfield(md,'stressbalance.spcvz','forcing',1); end
91+ if strcmp(meshtype(md.mesh),'3D'), md = checkfield(md,'stressbalance.spcvz','forcing',1); end
92 md = checkfield(md,'stressbalance.restol','size',[1 1],'>',0,'NaN',1);
93 md = checkfield(md,'stressbalance.reltol','size',[1 1]);
94 md = checkfield(md,'stressbalance.abstol','size',[1 1]);
95@@ -110,7 +110,7 @@
96 end
97 end
98 %CHECK THAT NO rotation specified for FS Grounded ice at base
99- if md.mesh.dimension==3 & md.flowequation.isFS,
100+ if strcmp(meshtype(md.mesh),'3D') & md.flowequation.isFS,
101 pos=find(md.mask.groundedice_levelset>0. & md.mesh.vertexonbed);
102 if any(~isnan(md.stressbalance.referential(pos,:))),
103 md = checkmessage(md,['no referential should be specified for basal vertices of grounded ice']);
104Index: ../trunk-jpl/src/m/classes/flowequation.py
105===================================================================
106--- ../trunk-jpl/src/m/classes/flowequation.py (revision 16294)
107+++ ../trunk-jpl/src/m/classes/flowequation.py (revision 16295)
108@@ -78,12 +78,14 @@
109 md = checkfield(md,'flowequation.borderSSA','size',[md.mesh.numberofvertices],'values',[0,1])
110 md = checkfield(md,'flowequation.borderHO','size',[md.mesh.numberofvertices],'values',[0,1])
111 md = checkfield(md,'flowequation.borderFS','size',[md.mesh.numberofvertices],'values',[0,1])
112- if md.mesh.dimension==2:
113+ if strcmp(md.mesh.meshtype(),'2Dhorizontal'):
114 md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',[1,2])
115 md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',[1,2])
116- else:
117+ elif strcmp(md.mesh.meshtype(),'3D'):
118 md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,8+1))
119 md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,8+1))
120+ else:
121+ raise RuntimeError('mesh type not supported yet')
122 if not (self.isSIA or self.isSSA or self.isL1L2 or self.isHO or self.isFS):
123 md.checkmessage("no element types set for this model")
124
125Index: ../trunk-jpl/src/m/classes/flowequation.m
126===================================================================
127--- ../trunk-jpl/src/m/classes/flowequation.m (revision 16294)
128+++ ../trunk-jpl/src/m/classes/flowequation.m (revision 16295)
129@@ -90,12 +90,14 @@
130 md = checkfield(md,'flowequation.borderSSA','size',[md.mesh.numberofvertices 1],'values',[0 1]);
131 md = checkfield(md,'flowequation.borderHO','size',[md.mesh.numberofvertices 1],'values',[0 1]);
132 md = checkfield(md,'flowequation.borderFS','size',[md.mesh.numberofvertices 1],'values',[0 1]);
133- if (md.mesh.dimension==2),
134+ if strcmp(meshtype(md.mesh),'2Dhorizontal')
135 md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[1:2]);
136 md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[1:2]);
137- else
138+ elseif strcmp(meshtype(md.mesh),'3D'),
139 md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[0:8]);
140 md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[0:8]);
141+ else
142+ error('Case not supported yet');
143 end
144 if ~(obj.isSIA || obj.isSSA || obj.isL1L2 || obj.isHO || obj.isFS),
145 md = checkmessage(md,['no element types set for this model']);
146Index: ../trunk-jpl/src/m/classes/mesh2d.py
147===================================================================
148--- ../trunk-jpl/src/m/classes/mesh2d.py (revision 16294)
149+++ ../trunk-jpl/src/m/classes/mesh2d.py (revision 16295)
150@@ -4,12 +4,12 @@
151 from checkfield import *
152 from MatlabFuncs import *
153
154-class mesh(object):
155+class mesh2d(object):
156 """
157- MESH class definition
158+ MESH2D class definition
159
160 Usage:
161- mesh=mesh();
162+ mesh2d=mesh2d();
163 """
164
165 def __init__(self): # {{{
166@@ -97,11 +97,16 @@
167
168 return md
169 # }}}
170+ def meshtype(self): # {{{
171+ return "2Dhorizontal"
172+ #}}}
173 def marshall(self,md,fid): # {{{
174- WriteData(fid,'object',self,'fieldname','x','format','DoubleMat','mattype',1)
175- WriteData(fid,'object',self,'fieldname','y','format','DoubleMat','mattype',1)
176- WriteData(fid,'object',self,'fieldname','elements','format','DoubleMat','mattype',2)
177- WriteData(fid,'object',self,'fieldname','numberofelements','format','Integer')
178- WriteData(fid,'object',self,'fieldname','numberofvertices','format','Integer')
179- WriteData(fid,'object',self,'fieldname','average_vertex_connectivity','format','Integer')
180+ WriteData(fid,'enum',MeshTypeEnum(),'data',StringToEnum("Mesh"+self.meshtype())[0],'format','Integer');
181+ WriteData(fid,'object',self,'class','mesh','fieldname','x','format','DoubleMat','mattype',1)
182+ WriteData(fid,'object',self,'class','mesh','fieldname','y','format','DoubleMat','mattype',1)
183+ WriteData(fid,'enum',MeshZEnum(),'data',numpy.zeros(self.numberofvertices),'format','DoubleMat','mattype',1);
184+ WriteData(fid,'object',self,'class','mesh','fieldname','elements','format','DoubleMat','mattype',2)
185+ WriteData(fid,'object',self,'class','mesh','fieldname','numberofelements','format','Integer')
186+ WriteData(fid,'object',self,'class','mesh','fieldname','numberofvertices','format','Integer')
187+ WriteData(fid,'object',self,'class','mesh','fieldname','average_vertex_connectivity','format','Integer')
188 # }}}
Note: See TracBrowser for help on using the repository browser.