source: issm/oecreview/Archive/19101-20495/ISSM-19897-19898.diff

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

CHG: done with Archive/19101-20495
File size: 42.1 KB
RevLine 
[20498]1Index: ../trunk-jpl/src/py3/classes/SMBforcing.py
2===================================================================
3--- ../trunk-jpl/src/py3/classes/SMBforcing.py (revision 19897)
4+++ ../trunk-jpl/src/py3/classes/SMBforcing.py (revision 19898)
5@@ -42,10 +42,10 @@
6 def checkconsistency(self,md,solution,analyses): # {{{
7
8 if MasstransportAnalysisEnum() in analyses:
9- md = checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1)
10+ md = checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1,'Inf',1)
11
12 if BalancethicknessAnalysisEnum() in analyses:
13- md = checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices],'NaN',1)
14+ md = checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
15
16 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)
17 return md
18Index: ../trunk-jpl/src/py3/classes/calvinglevermann.py
19===================================================================
20--- ../trunk-jpl/src/py3/classes/calvinglevermann.py (revision 19897)
21+++ ../trunk-jpl/src/py3/classes/calvinglevermann.py (revision 19898)
22@@ -55,7 +55,7 @@
23 md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1)
24 md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
25 md = checkfield(md,'fieldname','calving.coeff','size',[md.mesh.numberofvertices],'>',0)
26- md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices],'>=',0)
27+ md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>=',0)
28 return md
29 # }}}
30 def marshall(self,md,fid): # {{{
31Index: ../trunk-jpl/src/py3/classes/m1qn3inversion.py
32===================================================================
33--- ../trunk-jpl/src/py3/classes/m1qn3inversion.py (revision 19897)
34+++ ../trunk-jpl/src/py3/classes/m1qn3inversion.py (revision 19898)
35@@ -144,7 +144,7 @@
36 md = checkfield(md,'fieldname','inversion.iscontrol','values',[0,1])
37 md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0,1])
38 md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',supportedcontrols())
39- md = checkfield(md,'fieldname','inversion.control_scaling_factors','size',[num_controls],'>',0,'NaN',1)
40+ md = checkfield(md,'fieldname','inversion.control_scaling_factors','size',[num_controls],'>',0,'NaN',1,'Inf',1)
41 md = checkfield(md,'fieldname','inversion.maxsteps','numel',[1],'>=',0)
42 md = checkfield(md,'fieldname','inversion.maxiter','numel',[1],'>=',0)
43 md = checkfield(md,'fieldname','inversion.dxmin','numel',[1],'>',0.)
44@@ -155,10 +155,10 @@
45 md = checkfield(md,'fieldname','inversion.max_parameters','size',[md.mesh.numberofvertices,num_controls])
46
47 if solution==BalancethicknessSolutionEnum():
48- md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1)
49+ md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
50 else:
51- md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1)
52- md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1)
53+ md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
54+ md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
55
56 return md
57 # }}}
58Index: ../trunk-jpl/src/py3/classes/frictioncoulomb.py
59===================================================================
60--- ../trunk-jpl/src/py3/classes/frictioncoulomb.py (revision 19897)
61+++ ../trunk-jpl/src/py3/classes/frictioncoulomb.py (revision 19898)
62@@ -47,10 +47,10 @@
63 if StressbalanceAnalysisEnum() not in analyses and ThermalAnalysisEnum() not in analyses:
64 return md
65
66- md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1)
67- md = checkfield(md,'fieldname','friction.coefficientcoulomb','timeseries',1,'NaN',1)
68- md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements])
69- md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements])
70+ md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',1)
71+ md = checkfield(md,'fieldname','friction.coefficientcoulomb','timeseries',1,'NaN',1,'Inf',1)
72+ md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
73+ md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
74
75 return md
76 # }}}
77Index: ../trunk-jpl/src/py3/classes/gia.py
78===================================================================
79--- ../trunk-jpl/src/py3/classes/gia.py (revision 19897)
80+++ ../trunk-jpl/src/py3/classes/gia.py (revision 19898)
81@@ -47,8 +47,8 @@
82 if (GiaAnalysisEnum() not in analyses):
83 return md
84
85- md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
86- md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
87+ md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0)
88+ md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0)
89 md = checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2])
90
91 #be sure that if we are running a masstransport ice flow model coupled with gia, that thickness forcings
92Index: ../trunk-jpl/src/py3/classes/balancethickness.py
93===================================================================
94--- ../trunk-jpl/src/py3/classes/balancethickness.py (revision 19897)
95+++ ../trunk-jpl/src/py3/classes/balancethickness.py (revision 19898)
96@@ -42,7 +42,7 @@
97 return md
98
99 md = checkfield(md,'fieldname','balancethickness.spcthickness')
100- md = checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices],'NaN',1)
101+ md = checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
102 md = checkfield(md,'fieldname','balancethickness.stabilization','size',[1],'values',[0,1,2,3])
103
104 return md
105Index: ../trunk-jpl/src/py3/classes/SMBd18opdd.py
106===================================================================
107--- ../trunk-jpl/src/py3/classes/SMBd18opdd.py (revision 19897)
108+++ ../trunk-jpl/src/py3/classes/SMBd18opdd.py (revision 19898)
109@@ -90,15 +90,15 @@
110
111 if MasstransportAnalysisEnum() in analyses:
112 md = checkfield(md,'fieldname','smb.desfac','<=',1,'numel',[1])
113- md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'size',[md.mesh.numberofvertices,1])
114- md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'size',[md.mesh.numberofvertices,1])
115+ md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
116+ md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
117 md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',[1])
118 md = checkfield(md,'fieldname','smb.rlapslgm','>=',0,'numel',[1])
119
120 if self.isd18opd:
121- md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
122- md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
123- md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
124+ md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
125+ md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
126+ md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
127 md = checkfield(md,'fieldname','smb.dpermil','>=',0,'numel',[1])
128
129 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)
130Index: ../trunk-jpl/src/py3/classes/linearbasalforcings.py
131===================================================================
132--- ../trunk-jpl/src/py3/classes/linearbasalforcings.py (revision 19897)
133+++ ../trunk-jpl/src/py3/classes/linearbasalforcings.py (revision 19898)
134@@ -68,23 +68,23 @@
135 def checkconsistency(self,md,solution,analyses): # {{{
136
137 if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport):
138- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
139+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
140 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0);
141 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<',md.basalforcings.upperwater_elevation);
142 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0);
143
144 if BalancethicknessAnalysisEnum() in analyses:
145- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
146+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
147 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0);
148 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<',md.basalforcings.upperwater_elevation);
149 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0);
150
151 if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal):
152- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
153+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
154 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0);
155 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<',md.basalforcings.upperwater_elevation);
156 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0);
157- md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0)
158+ md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0)
159
160 return md
161 # }}}
162Index: ../trunk-jpl/src/py3/classes/SMBpdd.py
163===================================================================
164--- ../trunk-jpl/src/py3/classes/SMBpdd.py (revision 19897)
165+++ ../trunk-jpl/src/py3/classes/SMBpdd.py (revision 19898)
166@@ -119,31 +119,31 @@
167
168 if MasstransportAnalysisEnum() in analyses:
169 md = checkfield(md,'fieldname','smb.desfac','<=',1,'numel',[1])
170- md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'size',[md.mesh.numberofvertices,1])
171- md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'size',[md.mesh.numberofvertices,1])
172+ md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
173+ md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
174 md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',[1])
175 md = checkfield(md,'fieldname','smb.rlapslgm','>=',0,'numel',[1])
176
177 if (self.isdelta18o==0 and self.ismungsm==0):
178- md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'timeseries',1)
179- md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'timeseries',1)
180+ md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'Inf',1,'timeseries',1)
181+ md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'Inf',1,'timeseries',1)
182 elif self.isdelta18o:
183- md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
184- md = checkfield(md,'fieldname','smb.delta18o_surface','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
185- md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
186- md = checkfield(md,'fieldname','smb.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
187- md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
188- md = checkfield(md,'fieldname','smb.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
189- md = checkfield(md,'fieldname','smb.Tdiff','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
190- md = checkfield(md,'fieldname','smb.sealev','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
191+ md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
192+ md = checkfield(md,'fieldname','smb.delta18o_surface','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
193+ md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
194+ md = checkfield(md,'fieldname','smb.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
195+ md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
196+ md = checkfield(md,'fieldname','smb.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
197+ md = checkfield(md,'fieldname','smb.Tdiff','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
198+ md = checkfield(md,'fieldname','smb.sealev','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
199 elif self.ismungsm:
200- md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
201- md = checkfield(md,'fieldname','smb.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
202- md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
203- md = checkfield(md,'fieldname','smb.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
204- md = checkfield(md,'fieldname','smb.Pfac','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
205- md = checkfield(md,'fieldname','smb.Tdiff','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
206- md = checkfield(md,'fieldname','smb.sealev','NaN',1,'size',[2,numpy.nan],'singletimeseries',1)
207+ md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
208+ md = checkfield(md,'fieldname','smb.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
209+ md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
210+ md = checkfield(md,'fieldname','smb.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
211+ md = checkfield(md,'fieldname','smb.Pfac','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
212+ md = checkfield(md,'fieldname','smb.Tdiff','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
213+ md = checkfield(md,'fieldname','smb.sealev','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',1)
214
215 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)
216 return md
217Index: ../trunk-jpl/src/py3/classes/taoinversion.py
218===================================================================
219--- ../trunk-jpl/src/py3/classes/taoinversion.py (revision 19897)
220+++ ../trunk-jpl/src/py3/classes/taoinversion.py (revision 19898)
221@@ -155,12 +155,12 @@
222
223
224 if solution==BalancethicknessSolutionEnum():
225- md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1)
226+ md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1)
227 elif solution==BalancethicknessSoftSolutionEnum():
228- md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1)
229+ md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1)
230 else:
231- md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices, 1],'NaN',1)
232- md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices, 1],'NaN',1)
233+ md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1)
234+ md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1)
235
236 def marshall(self, md, fid):
237
238Index: ../trunk-jpl/src/py3/classes/frictionweertman.py
239===================================================================
240--- ../trunk-jpl/src/py3/classes/frictionweertman.py (revision 19897)
241+++ ../trunk-jpl/src/py3/classes/frictionweertman.py (revision 19898)
242@@ -36,8 +36,8 @@
243 if StressbalanceAnalysisEnum() not in analyses and ThermalAnalysisEnum() not in analyses:
244 return md
245
246- md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1)
247- md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements])
248+ md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1,'Inf',1)
249+ md = checkfield(md,'fieldname','friction.m','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
250
251 return md
252 # }}}
253Index: ../trunk-jpl/src/py3/classes/mesh3dprisms.py
254===================================================================
255--- ../trunk-jpl/src/py3/classes/mesh3dprisms.py (revision 19897)
256+++ ../trunk-jpl/src/py3/classes/mesh3dprisms.py (revision 19898)
257@@ -105,10 +105,10 @@
258 #}}}
259 def checkconsistency(self,md,solution,analyses): # {{{
260
261- md = checkfield(md,'fieldname','mesh.x','NaN',1,'size',[md.mesh.numberofvertices])
262- md = checkfield(md,'fieldname','mesh.y','NaN',1,'size',[md.mesh.numberofvertices])
263- md = checkfield(md,'fieldname','mesh.z','NaN',1,'size',[md.mesh.numberofvertices])
264- md = checkfield(md,'fieldname','mesh.elements','NaN',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
265+ md = checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
266+ md = checkfield(md,'fieldname','mesh.y','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
267+ md = checkfield(md,'fieldname','mesh.z','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
268+ md = checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
269 md = checkfield(md,'fieldname','mesh.elements','size',[md.mesh.numberofelements,6])
270 if numpy.any(numpy.logical_not(m.ismember(numpy.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))):
271 md.checkmessage("orphan nodes have been found. Check the mesh3dprisms outline")
272Index: ../trunk-jpl/src/py3/classes/SMBgradients.py
273===================================================================
274--- ../trunk-jpl/src/py3/classes/SMBgradients.py (revision 19897)
275+++ ../trunk-jpl/src/py3/classes/SMBgradients.py (revision 19898)
276@@ -48,10 +48,10 @@
277 def checkconsistency(self,md,solution,analyses): # {{{
278
279 if MasstransportAnalysisEnum() in analyses:
280- md = checkfield(md,'fieldname','smb.href','timeseries',1,'NaN',1)
281- md = checkfield(md,'fieldname','smb.smbref','timeseries',1,'NaN',1)
282- md = checkfield(md,'fieldname','smb.b_pos','timeseries',1,'NaN',1)
283- md = checkfield(md,'fieldname','smb.b_neg','timeseries',1,'NaN',1)
284+ md = checkfield(md,'fieldname','smb.href','timeseries',1,'NaN',1,'Inf',1)
285+ md = checkfield(md,'fieldname','smb.smbref','timeseries',1,'NaN',1,'Inf',1)
286+ md = checkfield(md,'fieldname','smb.b_pos','timeseries',1,'NaN',1,'Inf',1)
287+ md = checkfield(md,'fieldname','smb.b_neg','timeseries',1,'NaN',1,'Inf',1)
288
289 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)
290 return md
291Index: ../trunk-jpl/src/py3/classes/calving.py
292===================================================================
293--- ../trunk-jpl/src/py3/classes/calving.py (revision 19897)
294+++ ../trunk-jpl/src/py3/classes/calving.py (revision 19898)
295@@ -54,8 +54,8 @@
296
297 md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1)
298 md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
299- md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'timeseries',1,'NaN',1);
300- md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'timeseries',1,'NaN',1);
301+ md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'timeseries',1,'NaN',1,'Inf',1);
302+ md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'timeseries',1,'NaN',1,'Inf',1);
303
304 return md
305 # }}}
306Index: ../trunk-jpl/src/py3/classes/SMBcomponents.py
307===================================================================
308--- ../trunk-jpl/src/py3/classes/SMBcomponents.py (revision 19897)
309+++ ../trunk-jpl/src/py3/classes/SMBcomponents.py (revision 19898)
310@@ -55,22 +55,22 @@
311 def checkconsistency(self,md,solution,analyses): # {{{
312
313 if MasstransportAnalysisEnum() in analyses:
314- md = checkfield(md,'fieldname','smb.accumulation','timeseries',1,'NaN',1)
315+ md = checkfield(md,'fieldname','smb.accumulation','timeseries',1,'NaN',1,'Inf',1)
316
317 if BalancethicknessAnalysisEnum() in analyses:
318- md = checkfield(md,'fieldname','smb.accumulation','size',[md.mesh.numberofvertices],'NaN',1)
319+ md = checkfield(md,'fieldname','smb.accumulation','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
320
321 if MasstransportAnalysisEnum() in analyses:
322- md = checkfield(md,'fieldname','smb.runoff','timeseries',1,'NaN',1)
323+ md = checkfield(md,'fieldname','smb.runoff','timeseries',1,'NaN',1,'Inf',1)
324
325 if BalancethicknessAnalysisEnum() in analyses:
326- md = checkfield(md,'fieldname','smb.runoff','size',[md.mesh.numberofvertices],'NaN',1)
327+ md = checkfield(md,'fieldname','smb.runoff','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
328
329 if MasstransportAnalysisEnum() in analyses:
330- md = checkfield(md,'fieldname','smb.evaporation','timeseries',1,'NaN',1)
331+ md = checkfield(md,'fieldname','smb.evaporation','timeseries',1,'NaN',1,'Inf',1)
332
333 if BalancethicknessAnalysisEnum() in analyses:
334- md = checkfield(md,'fieldname','smb.evaporation','size',[md.mesh.numberofvertices],'NaN',1)
335+ md = checkfield(md,'fieldname','smb.evaporation','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
336
337 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)
338
339Index: ../trunk-jpl/src/py3/classes/stressbalance.py
340===================================================================
341--- ../trunk-jpl/src/py3/classes/stressbalance.py (revision 19897)
342+++ ../trunk-jpl/src/py3/classes/stressbalance.py (revision 19898)
343@@ -140,8 +140,8 @@
344 md = checkfield(md,'fieldname','stressbalance.reltol','size',[1])
345 md = checkfield(md,'fieldname','stressbalance.abstol','size',[1])
346 md = checkfield(md,'fieldname','stressbalance.isnewton','numel',[1],'values',[0,1,2])
347- md = checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1],'NaN',1)
348- md = checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1],'NaN',1)
349+ md = checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1],'NaN',1,'Inf',1)
350+ md = checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1],'NaN',1,'Inf',1)
351 md = checkfield(md,'fieldname','stressbalance.maxiter','size',[1],'>=',1)
352 md = checkfield(md,'fieldname','stressbalance.referential','size',[md.mesh.numberofvertices,6])
353 md = checkfield(md,'fieldname','stressbalance.loadingforce','size',[md.mesh.numberofvertices,3])
354Index: ../trunk-jpl/src/py3/classes/geometry.py
355===================================================================
356--- ../trunk-jpl/src/py3/classes/geometry.py (revision 19897)
357+++ ../trunk-jpl/src/py3/classes/geometry.py (revision 19898)
358@@ -45,13 +45,13 @@
359 #}}}
360 def checkconsistency(self,md,solution,analyses): # {{{
361
362- md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'size',[md.mesh.numberofvertices])
363- md = checkfield(md,'fieldname','geometry.base' ,'NaN',1,'size',[md.mesh.numberofvertices])
364- md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'timeseries',1)
365+ md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
366+ md = checkfield(md,'fieldname','geometry.base' ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
367+ md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0,'timeseries',1)
368 if any(abs(self.thickness-self.surface+self.base)>10**-9):
369 md.checkmessage("equality thickness=surface-base violated")
370 if solution==TransientSolutionEnum() and md.transient.isgroundingline:
371- md = checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices])
372+ md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
373
374 return md
375 # }}}
376Index: ../trunk-jpl/src/py3/classes/mismipbasalforcings.py
377===================================================================
378--- ../trunk-jpl/src/py3/classes/mismipbasalforcings.py (revision 19897)
379+++ ../trunk-jpl/src/py3/classes/mismipbasalforcings.py (revision 19898)
380@@ -57,25 +57,25 @@
381 #Early return
382 if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and md.transient.ismasstransport==0):
383
384- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
385+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
386 md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
387 md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
388 md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',[1])
389
390 if BalancethicknessAnalysisEnum() in analyses:
391
392- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
393+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
394 md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
395 md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
396 md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',[1])
397
398 if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and md.transient.isthermal==0):
399
400- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
401+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
402 md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
403 md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
404 md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',[1])
405- md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0)
406+ md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0)
407 return md
408 # }}}
409 def marshall(self,md,fid): # {{{
410Index: ../trunk-jpl/src/py3/classes/matice.py
411===================================================================
412--- ../trunk-jpl/src/py3/classes/matice.py (revision 19897)
413+++ ../trunk-jpl/src/py3/classes/matice.py (revision 19898)
414@@ -122,7 +122,7 @@
415 md = checkfield(md,'fieldname','materials.rho_water','>',0)
416 md = checkfield(md,'fieldname','materials.rho_freshwater','>',0)
417 md = checkfield(md,'fieldname','materials.mu_water','>',0)
418- md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1)
419+ md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1,'Inf',1)
420 md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements])
421 md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','Paterson','Arrhenius','LliboutryDuval'])
422 md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',[1]);
423Index: ../trunk-jpl/src/py3/classes/timestepping.py
424===================================================================
425--- ../trunk-jpl/src/py3/classes/timestepping.py (revision 19897)
426+++ ../trunk-jpl/src/py3/classes/timestepping.py (revision 19898)
427@@ -52,9 +52,9 @@
428 #}}}
429 def checkconsistency(self,md,solution,analyses): # {{{
430
431- md = checkfield(md,'fieldname','timestepping.start_time','numel',[1],'NaN',1)
432- md = checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1)
433- md = checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1)
434+ md = checkfield(md,'fieldname','timestepping.start_time','numel',[1],'NaN',1,'Inf',1)
435+ md = checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1,'Inf',1)
436+ md = checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1,'Inf',1)
437 md = checkfield(md,'fieldname','timestepping.time_adapt','numel',[1],'values',[0,1])
438 md = checkfield(md,'fieldname','timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1)
439 if self.final_time-self.start_time<0:
440Index: ../trunk-jpl/src/py3/classes/SMBmeltcomponents.py
441===================================================================
442--- ../trunk-jpl/src/py3/classes/SMBmeltcomponents.py (revision 19897)
443+++ ../trunk-jpl/src/py3/classes/SMBmeltcomponents.py (revision 19898)
444@@ -61,28 +61,28 @@
445 def checkconsistency(self,md,solution,analyses): # {{{
446
447 if MasstransportAnalysisEnum() in analyses:
448- md = checkfield(md,'fieldname','smb.accumulation','timeseries',1,'NaN',1)
449+ md = checkfield(md,'fieldname','smb.accumulation','timeseries',1,'NaN',1,'Inf',1)
450
451 if BalancethicknessAnalysisEnum() in analyses:
452- md = checkfield(md,'fieldname','smb.accumulation','size',[md.mesh.numberofvertices],'NaN',1)
453+ md = checkfield(md,'fieldname','smb.accumulation','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
454
455 if MasstransportAnalysisEnum() in analyses:
456- md = checkfield(md,'fieldname','smb.melt','timeseries',1,'NaN',1)
457+ md = checkfield(md,'fieldname','smb.melt','timeseries',1,'NaN',1,'Inf',1)
458
459 if BalancethicknessAnalysisEnum() in analyses:
460- md = checkfield(md,'fieldname','smb.melt','size',[md.mesh.numberofvertices],'NaN',1)
461+ md = checkfield(md,'fieldname','smb.melt','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
462
463 if MasstransportAnalysisEnum() in analyses:
464- md = checkfield(md,'fieldname','smb.refreeze','timeseries',1,'NaN',1)
465+ md = checkfield(md,'fieldname','smb.refreeze','timeseries',1,'NaN',1,'Inf',1)
466
467 if BalancethicknessAnalysisEnum() in analyses:
468- md = checkfield(md,'fieldname','smb.refreeze','size',[md.mesh.numberofvertices],'NaN',1)
469+ md = checkfield(md,'fieldname','smb.refreeze','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
470
471 if MasstransportAnalysisEnum() in analyses:
472- md = checkfield(md,'fieldname','smb.evaporation','timeseries',1,'NaN',1)
473+ md = checkfield(md,'fieldname','smb.evaporation','timeseries',1,'NaN',1,'Inf',1)
474
475 if BalancethicknessAnalysisEnum() in analyses:
476- md = checkfield(md,'fieldname','smb.evaporation','size',[md.mesh.numberofvertices],'NaN',1)
477+ md = checkfield(md,'fieldname','smb.evaporation','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
478
479 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)
480 return md
481Index: ../trunk-jpl/src/py3/classes/inversion.py
482===================================================================
483--- ../trunk-jpl/src/py3/classes/inversion.py (revision 19897)
484+++ ../trunk-jpl/src/py3/classes/inversion.py (revision 19898)
485@@ -150,10 +150,10 @@
486 md.checkmessage("'inversion can only be performed for SSA, HO or FS ice flow models");
487
488 if solution==BalancethicknessSolutionEnum():
489- md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1)
490+ md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
491 else:
492- md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1)
493- md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1)
494+ md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
495+ md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
496
497 return md
498 # }}}
499Index: ../trunk-jpl/src/py3/classes/friction.py
500===================================================================
501--- ../trunk-jpl/src/py3/classes/friction.py (revision 19897)
502+++ ../trunk-jpl/src/py3/classes/friction.py (revision 19898)
503@@ -44,9 +44,9 @@
504 if StressbalanceAnalysisEnum() not in analyses and ThermalAnalysisEnum() not in analyses:
505 return md
506
507- md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1)
508- md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements])
509- md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements])
510+ md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',1)
511+ md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
512+ md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
513
514 return md
515 # }}}
516Index: ../trunk-jpl/src/py3/classes/basalforcings.py
517===================================================================
518--- ../trunk-jpl/src/py3/classes/basalforcings.py (revision 19897)
519+++ ../trunk-jpl/src/py3/classes/basalforcings.py (revision 19898)
520@@ -54,17 +54,17 @@
521 def checkconsistency(self,md,solution,analyses): # {{{
522
523 if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport):
524- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
525- md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1)
526+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
527+ md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
528
529 if BalancethicknessAnalysisEnum() in analyses:
530- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
531- md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
532+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
533+ md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
534
535 if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal):
536- md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
537- md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1)
538- md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0)
539+ md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
540+ md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
541+ md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0)
542
543 return md
544 # }}}
545Index: ../trunk-jpl/src/py3/classes/mesh2d.py
546===================================================================
547--- ../trunk-jpl/src/py3/classes/mesh2d.py (revision 19897)
548+++ ../trunk-jpl/src/py3/classes/mesh2d.py (revision 19898)
549@@ -83,9 +83,9 @@
550 #}}}
551 def checkconsistency(self,md,solution,analyses): # {{{
552
553- md = checkfield(md,'fieldname','mesh.x','NaN',1,'size',[md.mesh.numberofvertices])
554- md = checkfield(md,'fieldname','mesh.y','NaN',1,'size',[md.mesh.numberofvertices])
555- md = checkfield(md,'fieldname','mesh.elements','NaN',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
556+ md = checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
557+ md = checkfield(md,'fieldname','mesh.y','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
558+ md = checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
559 md = checkfield(md,'fieldname','mesh.elements','size',[md.mesh.numberofelements,3])
560 # if numpy.any(numpy.logical_not(m.ismember(numpy.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))):
561 if any(numpy.logical_not(m.ismember(numpy.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))):
562Index: ../trunk-jpl/src/py3/classes/initialization.py
563===================================================================
564--- ../trunk-jpl/src/py3/classes/initialization.py (revision 19897)
565+++ ../trunk-jpl/src/py3/classes/initialization.py (revision 19898)
566@@ -70,39 +70,39 @@
567 def checkconsistency(self,md,solution,analyses): # {{{
568 if StressbalanceAnalysisEnum() in analyses:
569 if not numpy.any(numpy.logical_or(numpy.isnan(md.initialization.vx),numpy.isnan(md.initialization.vy))):
570- md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
571- md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
572+ md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
573+ md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
574 if MasstransportAnalysisEnum() in analyses:
575- md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
576- md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
577+ md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
578+ md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
579 if BalancethicknessAnalysisEnum() in analyses:
580- md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
581- md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
582+ md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
583+ md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
584 #Triangle with zero velocity
585 if numpy.any(numpy.logical_and(numpy.sum(numpy.abs(md.initialization.vx[md.mesh.elements-1]),axis=1)==0,\
586 numpy.sum(numpy.abs(md.initialization.vy[md.mesh.elements-1]),axis=1)==0)):
587 md.checkmessage("at least one triangle has all its vertices with a zero velocity")
588 if ThermalAnalysisEnum() in analyses:
589- md = checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
590- md = checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
591- md = checkfield(md,'fieldname','initialization.temperature','NaN',1,'size',[md.mesh.numberofvertices])
592+ md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
593+ md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
594+ md = checkfield(md,'fieldname','initialization.temperature','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
595 if md.mesh.dimension()==3:
596- md = checkfield(md,'fieldname','initialization.vz','NaN',1,'size',[md.mesh.numberofvertices])
597- md = checkfield(md,'fieldname','initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices])
598+ md = checkfield(md,'fieldname','initialization.vz','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
599+ md = checkfield(md,'fieldname','initialization.pressure','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
600 if (EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy):
601 md = checkfield(md,'fieldname','initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices])
602 md = checkfield(md,'fieldname','initialization.watercolumn' ,'>=',0,'size',[md.mesh.numberofvertices])
603 if HydrologyShreveAnalysisEnum() in analyses:
604 if hasattr(md.hydrology,'hydrologyshreve'):
605- md = checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices])
606+ md = checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
607 if HydrologyDCInefficientAnalysisEnum() in analyses:
608 if hasattr(md.hydrology,'hydrologydc'):
609- md = checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices,1])
610+ md = checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
611 if HydrologyDCEfficientAnalysisEnum() in analyses:
612 if hasattr(md.hydrology,'hydrologydc'):
613 if md.hydrology.isefficientlayer==1:
614- md = checkfield(md,'fieldname','initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices,1])
615- md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'size',[md.mesh.numberofvertices,1])
616+ md = checkfield(md,'fieldname','initialization.epl_head','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
617+ md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
618
619 return md
620 # }}}
621Index: ../trunk-jpl/src/py3/classes/hydrologydc.py
622===================================================================
623--- ../trunk-jpl/src/py3/classes/hydrologydc.py (revision 19897)
624+++ ../trunk-jpl/src/py3/classes/hydrologydc.py (revision 19898)
625@@ -162,7 +162,7 @@
626 if self.transfer_flag==1:
627 md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0.,'numel',[1])
628
629- md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'timeseries',1)
630+ md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'Inf',1,'timeseries',1)
631 md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1)
632 md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0.,'numel',[1])
633 md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0.,'numel',[1])
Note: See TracBrowser for help on using the repository browser.