source: issm/oecreview/Archive/20545-21336/ISSM-20895-20896.diff@ 21337

Last change on this file since 21337 was 21337, checked in by Mathieu Morlighem, 8 years ago

CHG: added Archive/20545-21336

File size: 38.9 KB
RevLine 
[21337]1Index: ../trunk-jpl/src/m/classes/SMBhenning.m
2===================================================================
3--- ../trunk-jpl/src/m/classes/SMBhenning.m (revision 20895)
4+++ ../trunk-jpl/src/m/classes/SMBhenning.m (revision 20896)
5@@ -49,7 +49,7 @@
6 end % }}}
7 function marshall(self,prefix,md,fid) % {{{
8
9- yts=365.0*24.0*3600.0;
10+ yts=md.constants.yts;
11
12 WriteData(fid,prefix,'name','md.smb.model','data',7,'format','Integer');
13 WriteData(fid,prefix,'object',self,'class','smb','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
14Index: ../trunk-jpl/src/m/classes/SMBd18opdd.py
15===================================================================
16--- ../trunk-jpl/src/m/classes/SMBd18opdd.py (revision 20895)
17+++ ../trunk-jpl/src/m/classes/SMBd18opdd.py (revision 20896)
18@@ -107,7 +107,7 @@
19 # }}}
20 def marshall(self,prefix,md,fid): # {{{
21
22- yts=365.0*24.0*3600.0
23+ yts=md.constants.yts
24
25 WriteData(fid,prefix,'name','md.smb.model','data',5,'format','Integer')
26
27Index: ../trunk-jpl/src/m/classes/basalforcings.py
28===================================================================
29--- ../trunk-jpl/src/m/classes/basalforcings.py (revision 20895)
30+++ ../trunk-jpl/src/m/classes/basalforcings.py (revision 20896)
31@@ -70,7 +70,7 @@
32 # }}}
33 def marshall(self,prefix,md,fid): # {{{
34
35- yts=365.0*24.0*3600.0
36+ yts=md.constants.yts
37
38 WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer');
39 WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
40Index: ../trunk-jpl/src/m/classes/friction.m
41===================================================================
42--- ../trunk-jpl/src/m/classes/friction.m (revision 20895)
43+++ ../trunk-jpl/src/m/classes/friction.m (revision 20896)
44@@ -43,7 +43,7 @@
45 fielddisplay(self,'q','q exponent');
46 end % }}}
47 function marshall(self,prefix,md,fid) % {{{
48- yts=365.0*24.0*3600.0;
49+ yts=md.constants.yts;
50
51 WriteData(fid,prefix,'name','md.friction.law','data',1,'format','Integer');
52 WriteData(fid,prefix,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
53Index: ../trunk-jpl/src/m/classes/SMBgradients.py
54===================================================================
55--- ../trunk-jpl/src/m/classes/SMBgradients.py (revision 20895)
56+++ ../trunk-jpl/src/m/classes/SMBgradients.py (revision 20896)
57@@ -58,7 +58,7 @@
58 # }}}
59 def marshall(self,prefix,md,fid): # {{{
60
61- yts=365.0*24.0*3600.0
62+ yts=md.constants.yts
63
64 WriteData(fid,prefix,'name','md.smb.model','data',6,'format','Integer');
65 WriteData(fid,prefix,'object',self,'class','smb','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
66Index: ../trunk-jpl/src/m/classes/frictionweertman.m
67===================================================================
68--- ../trunk-jpl/src/m/classes/frictionweertman.m (revision 20895)
69+++ ../trunk-jpl/src/m/classes/frictionweertman.m (revision 20896)
70@@ -42,7 +42,7 @@
71 fielddisplay(self,'m','m exponent');
72 end % }}}
73 function marshall(self,prefix,md,fid) % {{{
74- yts=365.0*24.0*3600.0;
75+ yts=md.constants.yts;
76
77 WriteData(fid,prefix,'name','md.friction.law','data',2,'format','Integer');
78 WriteData(fid,prefix,'class','friction','object',self,'fieldname','C','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
79Index: ../trunk-jpl/src/m/classes/SMBcomponents.m
80===================================================================
81--- ../trunk-jpl/src/m/classes/SMBcomponents.m (revision 20895)
82+++ ../trunk-jpl/src/m/classes/SMBcomponents.m (revision 20896)
83@@ -77,7 +77,7 @@
84 end % }}}
85 function marshall(self,prefix,md,fid) % {{{
86
87- yts=365.0*24.0*3600.0;
88+ yts=md.constants.yts;
89
90 WriteData(fid,prefix,'name','md.smb.model','data',2,'format','Integer');
91 WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
92Index: ../trunk-jpl/src/m/classes/timestepping.js
93===================================================================
94--- ../trunk-jpl/src/m/classes/timestepping.js (revision 20895)
95+++ ../trunk-jpl/src/m/classes/timestepping.js (revision 20896)
96@@ -51,7 +51,7 @@
97 this.marshall=function(md,prefix,fid) { //{{{
98
99 var scale;
100- scale = 365.0*24.0*3600.0;
101+ scale = md.constants.yts;
102
103 WriteData(fid,prefix,'object',this,'fieldname','start_time','format','Double','scale',scale);
104 WriteData(fid,prefix,'object',this,'fieldname','final_time','format','Double','scale',scale);
105Index: ../trunk-jpl/src/m/classes/stressbalance.m
106===================================================================
107--- ../trunk-jpl/src/m/classes/stressbalance.m (revision 20895)
108+++ ../trunk-jpl/src/m/classes/stressbalance.m (revision 20896)
109@@ -176,7 +176,7 @@
110
111 WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','vertex_pairing','format','DoubleMat','mattype',3);
112
113- yts=365.0*24.0*3600.0;
114+ yts=md.constants.yts;
115
116 WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
117 WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
118Index: ../trunk-jpl/src/m/classes/friction.js
119===================================================================
120--- ../trunk-jpl/src/m/classes/friction.js (revision 20895)
121+++ ../trunk-jpl/src/m/classes/friction.js (revision 20896)
122@@ -35,7 +35,7 @@
123
124 } // }}}
125 this.marshall=function(md,prefix,fid) { //{{{
126- var yts=365.0*24.0*3600.0;
127+ var yts=md.constants.yts;
128
129 WriteData(fid,prefix,'name','md.friction.law','data',1,'format','Integer');
130 WriteData(fid,prefix,'object',this,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
131Index: ../trunk-jpl/src/m/classes/masstransport.js
132===================================================================
133--- ../trunk-jpl/src/m/classes/masstransport.js (revision 20895)
134+++ ../trunk-jpl/src/m/classes/masstransport.js (revision 20896)
135@@ -59,7 +59,7 @@
136 } // }}}
137 this.marshall=function(md,prefix,fid) { //{{{
138
139- var yts=365.*24.*3600.;
140+ var yts=md.constants.yts;
141
142 WriteData(fid,prefix,'object',this,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
143 WriteData(fid,prefix,'object',this,'fieldname','isfreesurface','format','Boolean');
144Index: ../trunk-jpl/src/m/classes/SMBd18opdd.m
145===================================================================
146--- ../trunk-jpl/src/m/classes/SMBd18opdd.m (revision 20895)
147+++ ../trunk-jpl/src/m/classes/SMBd18opdd.m (revision 20896)
148@@ -103,7 +103,7 @@
149 end % }}}
150 function marshall(self,prefix,md,fid) % {{{
151
152- yts=365.0*24.0*3600.0;
153+ yts=md.constants.yts;
154
155 WriteData(fid,prefix,'name','md.smb.model','data',5,'format','Integer');
156
157Index: ../trunk-jpl/src/m/classes/linearbasalforcings.m
158===================================================================
159--- ../trunk-jpl/src/m/classes/linearbasalforcings.m (revision 20895)
160+++ ../trunk-jpl/src/m/classes/linearbasalforcings.m (revision 20896)
161@@ -72,7 +72,7 @@
162 end % }}}
163 function marshall(self,prefix,md,fid) % {{{
164
165- yts=365.0*24.0*3600.0;
166+ yts=md.constants.yts;
167
168 floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
169 floatingice_melting_rate(find(md.geometry.base<=md.basalforcings.deepwater_elevation))=md.basalforcings.deepwater_melting_rate;
170Index: ../trunk-jpl/src/m/classes/SMBpdd.m
171===================================================================
172--- ../trunk-jpl/src/m/classes/SMBpdd.m (revision 20895)
173+++ ../trunk-jpl/src/m/classes/SMBpdd.m (revision 20896)
174@@ -142,7 +142,7 @@
175 end % }}}
176 function marshall(self,prefix,md,fid) % {{{
177
178- yts=365.0*24.0*3600.0;
179+ yts=md.constants.yts;
180
181 WriteData(fid,prefix,'name','md.smb.model','data',4,'format','Integer');
182
183Index: ../trunk-jpl/src/m/classes/basalforcings.m
184===================================================================
185--- ../trunk-jpl/src/m/classes/basalforcings.m (revision 20895)
186+++ ../trunk-jpl/src/m/classes/basalforcings.m (revision 20896)
187@@ -65,7 +65,7 @@
188 end % }}}
189 function marshall(self,prefix,md,fid) % {{{
190
191- yts=365.0*24.0*3600.0;
192+ yts=md.constants.yts;
193
194 WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer');
195 WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
196Index: ../trunk-jpl/src/m/classes/SMBcomponents.py
197===================================================================
198--- ../trunk-jpl/src/m/classes/SMBcomponents.py (revision 20895)
199+++ ../trunk-jpl/src/m/classes/SMBcomponents.py (revision 20896)
200@@ -78,7 +78,7 @@
201 # }}}
202 def marshall(self,prefix,md,fid): # {{{
203
204- yts=365.0*24.0*3600.0
205+ yts=md.constants.yts
206
207 WriteData(fid,prefix,'name','md.smb.model','data',2,'format','Integer');
208 WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
209Index: ../trunk-jpl/src/m/classes/snowpack.m
210===================================================================
211--- ../trunk-jpl/src/m/classes/snowpack.m (revision 20895)
212+++ ../trunk-jpl/src/m/classes/snowpack.m (revision 20896)
213@@ -452,7 +452,7 @@
214 end % }}}
215 function marshall(self,prefix,md,fid) % {{{
216
217- yts=365.0*24.0*3600.0;
218+ yts=md.constants.yts;
219
220 WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
221 WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
222Index: ../trunk-jpl/src/m/classes/SMBforcing.py
223===================================================================
224--- ../trunk-jpl/src/m/classes/SMBforcing.py (revision 20895)
225+++ ../trunk-jpl/src/m/classes/SMBforcing.py (revision 20896)
226@@ -52,7 +52,7 @@
227 # }}}
228 def marshall(self,prefix,md,fid): # {{{
229
230- yts=365.0*24.0*3600.0
231+ yts=md.constants.yts
232
233 WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
234 WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
235Index: ../trunk-jpl/src/m/classes/mismipbasalforcings.m
236===================================================================
237--- ../trunk-jpl/src/m/classes/mismipbasalforcings.m (revision 20895)
238+++ ../trunk-jpl/src/m/classes/mismipbasalforcings.m (revision 20896)
239@@ -79,7 +79,10 @@
240 end % }}}
241 function marshall(self,prefix,md,fid) % {{{
242
243- yts=365.2422*24.0*3600.0;
244+ yts=md.constants.yts;
245+ if yts~=365.2422*24.*3600.
246+ disp('WARNING: value of yts for MISMIP+ runs different from ISSM default!');
247+ end
248
249 floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
250 floatingice_melting_rate=md.basalforcings.meltrate_factor*tanh((md.geometry.base-md.geometry.bed)./md.basalforcings.threshold_thickness).*max(md.basalforcings.upperdepth_melt-md.geometry.base,0);
251Index: ../trunk-jpl/src/m/classes/balancethickness.py
252===================================================================
253--- ../trunk-jpl/src/m/classes/balancethickness.py (revision 20895)
254+++ ../trunk-jpl/src/m/classes/balancethickness.py (revision 20896)
255@@ -49,7 +49,7 @@
256 # }}}
257 def marshall(self,prefix,md,fid): # {{{
258
259- yts=365.0*24.0*3600.0
260+ yts=md.constants.yts
261
262 WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1)
263 WriteData(fid,prefix,'object',self,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts)
264Index: ../trunk-jpl/src/m/classes/basalforcings.js
265===================================================================
266--- ../trunk-jpl/src/m/classes/basalforcings.js (revision 20895)
267+++ ../trunk-jpl/src/m/classes/basalforcings.js (revision 20896)
268@@ -61,7 +61,7 @@
269 } // }}}
270 this.marshall=function(md,prefix,fid) { //{{{
271
272- var yts=365.0*24.0*3600.0;
273+ var yts=md.constants.yts;
274
275 WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer');
276 WriteData(fid,prefix,'object',this,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
277Index: ../trunk-jpl/src/m/classes/calvingminthickness.m
278===================================================================
279--- ../trunk-jpl/src/m/classes/calvingminthickness.m (revision 20895)
280+++ ../trunk-jpl/src/m/classes/calvingminthickness.m (revision 20896)
281@@ -49,7 +49,7 @@
282
283 end % }}}
284 function marshall(self,prefix,md,fid) % {{{
285- yts=365.0*24.0*3600.0;
286+ yts=md.constants.yts;
287 WriteData(fid,prefix,'name','md.calving.law','data',CalvingMinthicknessEnum(),'format','Integer');
288 WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double');
289 WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
290Index: ../trunk-jpl/src/m/classes/SMBmeltcomponents.py
291===================================================================
292--- ../trunk-jpl/src/m/classes/SMBmeltcomponents.py (revision 20895)
293+++ ../trunk-jpl/src/m/classes/SMBmeltcomponents.py (revision 20896)
294@@ -89,7 +89,7 @@
295 # }}}
296 def marshall(self,prefix,md,fid): # {{{
297
298- yts=365.0*24.0*3600.0
299+ yts=md.constants.yts
300
301 WriteData(fid,prefix,'name','md.smb.model','data',3,'format','Integer');
302 WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
303Index: ../trunk-jpl/src/m/classes/constants.py
304===================================================================
305--- ../trunk-jpl/src/m/classes/constants.py (revision 20895)
306+++ ../trunk-jpl/src/m/classes/constants.py (revision 20896)
307@@ -35,7 +35,7 @@
308 self.g=9.81
309
310 #converstion from year to seconds
311- self.yts=365*24*3600
312+ self.yts=365.*24.*3600.
313
314 #the reference temperature for enthalpy model (cf Aschwanden)
315 self.referencetemperature=223.15
316Index: ../trunk-jpl/src/m/classes/taoinversion.m
317===================================================================
318--- ../trunk-jpl/src/m/classes/taoinversion.m (revision 20895)
319+++ ../trunk-jpl/src/m/classes/taoinversion.m (revision 20896)
320@@ -160,7 +160,7 @@
321 end % }}}
322 function marshall(self,prefix,md,fid) % {{{
323
324- yts=365.0*24.0*3600.0;
325+ yts=md.constants.yts;
326
327 WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean');
328 WriteData(fid,prefix,'name','md.inversion.type','data',1,'format','Integer');
329Index: ../trunk-jpl/src/m/classes/adinversion.m
330===================================================================
331--- ../trunk-jpl/src/m/classes/adinversion.m (revision 20895)
332+++ ../trunk-jpl/src/m/classes/adinversion.m (revision 20896)
333@@ -126,7 +126,7 @@
334 end % }}}
335 function marshall(self,prefix,md,fid) % {{{
336
337- yts=365.0*24.0*3600.0;
338+ yts=md.constants.yts;
339
340 WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean');
341 WriteData(fid,prefix,'name','md.inversion.type','data',4,'format','Integer');
342Index: ../trunk-jpl/src/m/classes/inversionvalidation.m
343===================================================================
344--- ../trunk-jpl/src/m/classes/inversionvalidation.m (revision 20895)
345+++ ../trunk-jpl/src/m/classes/inversionvalidation.m (revision 20896)
346@@ -111,7 +111,7 @@
347 end % }}}
348 function marshall(self,prefix,md,fid) % {{{
349
350- yts=365.0*24.0*3600.0;
351+ yts=md.constants.yts;
352
353 WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean');
354 WriteData(fid,prefix,'name','md.inversion.type','data',3,'format','Integer');
355Index: ../trunk-jpl/src/m/classes/linearbasalforcings.py
356===================================================================
357--- ../trunk-jpl/src/m/classes/linearbasalforcings.py (revision 20895)
358+++ ../trunk-jpl/src/m/classes/linearbasalforcings.py (revision 20896)
359@@ -90,7 +90,7 @@
360 # }}}
361 def marshall(self,prefix,md,fid): # {{{
362
363- yts=365.0*24.0*3600.0
364+ yts=md.constants.yts
365
366 floatingice_melting_rate = numpy.zeros((md.mesh.numberofvertices,1))
367 pos=numpy.nonzero(md.geometry.base<=md.basalforcings.deepwater_elevation)
368Index: ../trunk-jpl/src/m/classes/SMBforcing.js
369===================================================================
370--- ../trunk-jpl/src/m/classes/SMBforcing.js (revision 20895)
371+++ ../trunk-jpl/src/m/classes/SMBforcing.js (revision 20896)
372@@ -44,7 +44,7 @@
373 } // }}}
374 this.marshall=function(md,prefix,fid) { //{{{
375
376- var yts=365.0*24.0*3600.0;
377+ var yts=md.constants.yts;
378
379 WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
380 WriteData(fid,prefix,'object',this,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
381Index: ../trunk-jpl/src/m/classes/SMBgemb.m
382===================================================================
383--- ../trunk-jpl/src/m/classes/SMBgemb.m (revision 20895)
384+++ ../trunk-jpl/src/m/classes/SMBgemb.m (revision 20896)
385@@ -257,7 +257,7 @@
386 end % }}}
387 function marshall(self,prefix,md,fid) % {{{
388
389- yts=365.25*24.0*3600.0;
390+ yts=md.constants.yts;
391
392 WriteData(fid,prefix,'name','md.smb.model','data',8,'format','Integer');
393
394Index: ../trunk-jpl/src/m/classes/calving.py
395===================================================================
396--- ../trunk-jpl/src/m/classes/calving.py (revision 20895)
397+++ ../trunk-jpl/src/m/classes/calving.py (revision 20896)
398@@ -51,7 +51,7 @@
399 # }}}
400 def marshall(self,prefix,md,fid): # {{{
401
402- yts=365.*24.*3600.
403+ yts=md.constants.yts
404
405 WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer');
406 WriteData(fid,prefix,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
407Index: ../trunk-jpl/src/m/classes/balancethickness.js
408===================================================================
409--- ../trunk-jpl/src/m/classes/balancethickness.js (revision 20895)
410+++ ../trunk-jpl/src/m/classes/balancethickness.js (revision 20896)
411@@ -34,7 +34,7 @@
412 } //}}}
413 this.marshall=function(md,prefix,fid) { //{{{
414
415- var yts=365.0*24.0*3600.0;
416+ var yts=md.constants.yts;
417
418 WriteData(fid,prefix,'object',this,'fieldname','spcthickness','format','DoubleMat','mattype',1);
419 WriteData(fid,prefix,'object',this,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1/yts);
420Index: ../trunk-jpl/src/m/classes/frictionsommers.m
421===================================================================
422--- ../trunk-jpl/src/m/classes/frictionsommers.m (revision 20895)
423+++ ../trunk-jpl/src/m/classes/frictionsommers.m (revision 20896)
424@@ -35,7 +35,7 @@
425 fielddisplay(self,'coefficient','friction coefficient [SI]');
426 end % }}}
427 function marshall(self,prefix,md,fid) % {{{
428- yts=365.0*24.0*3600.0;
429+ yts=md.constants.yts;
430
431 WriteData(fid,prefix,'name','md.friction.law','data',8,'format','Integer');
432 WriteData(fid,prefix,'class','friction','object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
433Index: ../trunk-jpl/src/m/classes/stressbalance.py
434===================================================================
435--- ../trunk-jpl/src/m/classes/stressbalance.py (revision 20895)
436+++ ../trunk-jpl/src/m/classes/stressbalance.py (revision 20896)
437@@ -177,7 +177,7 @@
438
439 WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','vertex_pairing','format','DoubleMat','mattype',3)
440
441- yts=365.0*24.0*3600.0
442+ yts=md.constants.yts
443
444 WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
445 WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
446Index: ../trunk-jpl/src/m/classes/hydrologysommers.m
447===================================================================
448--- ../trunk-jpl/src/m/classes/hydrologysommers.m (revision 20895)
449+++ ../trunk-jpl/src/m/classes/hydrologysommers.m (revision 20896)
450@@ -61,7 +61,7 @@
451 end % }}}
452 function marshall(self,prefix,md,fid) % {{{
453
454- yts=365.0*24.0*3600.0;
455+ yts=md.constants.yts;
456
457 WriteData(fid,prefix,'name','md.hydrology.model','data',HydrologysommersEnum(),'format','Integer');
458 WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','head','format','DoubleMat','mattype',1);
459Index: ../trunk-jpl/src/m/classes/calvinglevermann.py
460===================================================================
461--- ../trunk-jpl/src/m/classes/calvinglevermann.py (revision 20895)
462+++ ../trunk-jpl/src/m/classes/calvinglevermann.py (revision 20896)
463@@ -49,7 +49,7 @@
464 return md
465 # }}}
466 def marshall(self,prefix,md,fid): # {{{
467- yts=365.*24.*3600.
468+ yts=md.constants.yts
469 WriteData(fid,prefix,'name','md.calving.law','data',CalvingLevermannEnum(),'format','Integer');
470 WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1)
471 WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
472Index: ../trunk-jpl/src/m/classes/m1qn3inversion.py
473===================================================================
474--- ../trunk-jpl/src/m/classes/m1qn3inversion.py (revision 20895)
475+++ ../trunk-jpl/src/m/classes/m1qn3inversion.py (revision 20896)
476@@ -164,7 +164,7 @@
477 # }}}
478 def marshall(self,prefix,md,fid): # {{{
479
480- yts=365.0*24.0*3600.0
481+ yts=md.constants.yts
482
483 WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean')
484 WriteData(fid,prefix,'name','md.inversion.type','data',2,'format','Integer')
485Index: ../trunk-jpl/src/m/classes/constants.js
486===================================================================
487--- ../trunk-jpl/src/m/classes/constants.js (revision 20895)
488+++ ../trunk-jpl/src/m/classes/constants.js (revision 20896)
489@@ -14,7 +14,7 @@
490 this.omega = 7.292*1e-5;
491
492 //converstion from year to seconds
493- this.yts=365*24*3600;
494+ this.yts=365.*24.*3600.;
495
496 //the reference temperature for enthalpy model (cf Aschwanden)
497 this.referencetemperature=223.15;
498Index: ../trunk-jpl/src/m/classes/SMBpdd.py
499===================================================================
500--- ../trunk-jpl/src/m/classes/SMBpdd.py (revision 20895)
501+++ ../trunk-jpl/src/m/classes/SMBpdd.py (revision 20896)
502@@ -150,7 +150,7 @@
503 #}}}
504 def marshall(self,prefix,md,fid): # {{{
505
506- yts=365.0*24.0*3600.0
507+ yts=md.constants.yts
508
509 WriteData(fid,prefix,'name','md.smb.model','data',4,'format','Integer')
510
511Index: ../trunk-jpl/src/m/classes/inversion.py
512===================================================================
513--- ../trunk-jpl/src/m/classes/inversion.py (revision 20895)
514+++ ../trunk-jpl/src/m/classes/inversion.py (revision 20896)
515@@ -159,7 +159,7 @@
516 # }}}
517 def marshall(self,prefix,md,fid): # {{{
518
519- yts=365.0*24.0*3600.0
520+ yts=md.constants.yts
521
522 WriteData(fid,prefix,'name','md.inversion.type','data',0,'format','Integer')
523 WriteData(fid,prefix,'object',self,'fieldname','iscontrol','format','Boolean')
524Index: ../trunk-jpl/src/m/classes/constants.m
525===================================================================
526--- ../trunk-jpl/src/m/classes/constants.m (revision 20895)
527+++ ../trunk-jpl/src/m/classes/constants.m (revision 20896)
528@@ -28,7 +28,7 @@
529 self.omega = 7.292*1e-5;
530
531 %converstion from year to seconds
532- self.yts=365*24*3600;
533+ self.yts=365.*24.*3600.;
534
535 %the reference temperature for enthalpy model (cf Aschwanden)
536 self.referencetemperature=223.15;
537Index: ../trunk-jpl/src/m/classes/taoinversion.py
538===================================================================
539--- ../trunk-jpl/src/m/classes/taoinversion.py (revision 20895)
540+++ ../trunk-jpl/src/m/classes/taoinversion.py (revision 20896)
541@@ -164,7 +164,7 @@
542
543 def marshall(self, md, fid):
544
545- yts=365.0*24.0*3600.0;
546+ yts=md.constants.yts;
547 WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean')
548 WriteData(fid,prefix,'name','md.inversion.type','data',1,'format','Integer')
549 if not self.iscontrol:
550Index: ../trunk-jpl/src/m/classes/calvingdev.m
551===================================================================
552--- ../trunk-jpl/src/m/classes/calvingdev.m (revision 20895)
553+++ ../trunk-jpl/src/m/classes/calvingdev.m (revision 20896)
554@@ -50,7 +50,7 @@
555
556 end % }}}
557 function marshall(self,prefix,md,fid) % {{{
558- yts=365.0*24.0*3600.0;
559+ yts=md.constants.yts;
560 WriteData(fid,prefix,'name','md.calving.law','data',CalvingDevEnum(),'format','Integer');
561 WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1);
562 WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
563Index: ../trunk-jpl/src/m/classes/SMBgradients.m
564===================================================================
565--- ../trunk-jpl/src/m/classes/SMBgradients.m (revision 20895)
566+++ ../trunk-jpl/src/m/classes/SMBgradients.m (revision 20896)
567@@ -61,7 +61,7 @@
568 end % }}}
569 function marshall(self,prefix,md,fid) % {{{
570
571- yts=365.0*24.0*3600.0;
572+ yts=md.constants.yts;
573
574 WriteData(fid,prefix,'name','md.smb.model','data',6,'format','Integer');
575 WriteData(fid,prefix,'object',self,'class','smb','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
576Index: ../trunk-jpl/src/m/classes/initialization.m
577===================================================================
578--- ../trunk-jpl/src/m/classes/initialization.m (revision 20895)
579+++ ../trunk-jpl/src/m/classes/initialization.m (revision 20896)
580@@ -113,7 +113,7 @@
581 end % }}}
582 function marshall(self,prefix,md,fid) % {{{
583
584- yts=365.0*24.0*3600.0;
585+ yts=md.constants.yts;
586
587 WriteData(fid,prefix,'object',self,'fieldname','vx','format','DoubleMat','mattype',1,'scale',1./yts);
588 WriteData(fid,prefix,'object',self,'fieldname','vy','format','DoubleMat','mattype',1,'scale',1./yts);
589Index: ../trunk-jpl/src/m/classes/calving.js
590===================================================================
591--- ../trunk-jpl/src/m/classes/calving.js (revision 20895)
592+++ ../trunk-jpl/src/m/classes/calving.js (revision 20896)
593@@ -31,7 +31,7 @@
594 checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
595 } //}}}
596 this.marshall=function(md,prefix,fid) { //{{{
597- var yts=365.0*24.0*3600.0;
598+ var yts=md.constants.yts;
599 WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer');
600 WriteData(fid,prefix,'object',this,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
601 WriteData(fid,prefix,'object',this,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
602Index: ../trunk-jpl/src/m/classes/frictionweertmantemp.m
603===================================================================
604--- ../trunk-jpl/src/m/classes/frictionweertmantemp.m (revision 20895)
605+++ ../trunk-jpl/src/m/classes/frictionweertmantemp.m (revision 20896)
606@@ -37,7 +37,7 @@
607 fielddisplay(self,'m','m exponent');
608 end % }}}
609 function marshall(self,prefix,md,fid) % {{{
610- yts=365.0*24.0*3600.0;
611+ yts=md.constants.yts;
612
613 WriteData(fid,prefix,'name','md.friction.law','data',6,'format','Integer');
614 WriteData(fid,prefix,'class','friction','object',self,'fieldname','gamma','format','Double');
615Index: ../trunk-jpl/src/m/classes/timestepping.m
616===================================================================
617--- ../trunk-jpl/src/m/classes/timestepping.m (revision 20895)
618+++ ../trunk-jpl/src/m/classes/timestepping.m (revision 20896)
619@@ -62,7 +62,7 @@
620 end % }}}
621 function marshall(self,prefix,md,fid) % {{{
622
623- scale = 365.0*24.0*3600.0;
624+ scale = md.constants.yts;
625 WriteData(fid,prefix,'object',self,'fieldname','start_time','format','Double','scale',scale);
626 WriteData(fid,prefix,'object',self,'fieldname','final_time','format','Double','scale',scale);
627 WriteData(fid,prefix,'object',self,'fieldname','time_step','format','Double','scale',scale);
628Index: ../trunk-jpl/src/m/classes/stressbalance.js
629===================================================================
630--- ../trunk-jpl/src/m/classes/stressbalance.js (revision 20895)
631+++ ../trunk-jpl/src/m/classes/stressbalance.js (revision 20896)
632@@ -147,7 +147,7 @@
633
634 WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','vertex_pairing','format','DoubleMat','mattype',3);
635
636- var yts=365.0*24.0*3600.0;
637+ var yts=md.constants.yts;
638
639 WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
640 WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
641Index: ../trunk-jpl/src/m/classes/adinversion.py
642===================================================================
643--- ../trunk-jpl/src/m/classes/adinversion.py (revision 20895)
644+++ ../trunk-jpl/src/m/classes/adinversion.py (revision 20896)
645@@ -139,7 +139,7 @@
646
647 def marshall(self):
648
649- yts=365.0*24.0*3600.0;
650+ yts=md.constants.yts;
651
652 WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean');
653 WriteData(fid,prefix,'name','md.inversion.type','data',4,'format','Integer');
654Index: ../trunk-jpl/src/m/classes/plumebasalforcings.m
655===================================================================
656--- ../trunk-jpl/src/m/classes/plumebasalforcings.m (revision 20895)
657+++ ../trunk-jpl/src/m/classes/plumebasalforcings.m (revision 20896)
658@@ -110,7 +110,7 @@
659 end % }}}
660 function marshall(self,prefix,md,fid) % {{{
661
662- yts=365.2422*24.0*3600.0;
663+ yts=md.constants.yts;
664
665 WriteData(fid,prefix,'name','md.basalforcings.model','data',MantlePlumeGeothermalFluxEnum(),'format','Integer');
666 WriteData(fid,prefix,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
667Index: ../trunk-jpl/src/m/classes/masstransport.m
668===================================================================
669--- ../trunk-jpl/src/m/classes/masstransport.m (revision 20895)
670+++ ../trunk-jpl/src/m/classes/masstransport.m (revision 20896)
671@@ -112,7 +112,7 @@
672 end % }}}
673 function marshall(self,prefix,md,fid) % {{{
674
675- yts=365.*24.*3600.;
676+ yts=md.constants.yts;
677
678 WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
679 WriteData(fid,prefix,'object',self,'fieldname','isfreesurface','format','Boolean');
680Index: ../trunk-jpl/src/m/classes/initialization.py
681===================================================================
682--- ../trunk-jpl/src/m/classes/initialization.py (revision 20895)
683+++ ../trunk-jpl/src/m/classes/initialization.py (revision 20896)
684@@ -108,7 +108,7 @@
685 # }}}
686 def marshall(self,prefix,md,fid): # {{{
687
688- yts=365.0*24.0*3600.0
689+ yts=md.constants.yts
690
691 WriteData(fid,prefix,'object',self,'fieldname','vx','format','DoubleMat','mattype',1,'scale',1./yts)
692 WriteData(fid,prefix,'object',self,'fieldname','vy','format','DoubleMat','mattype',1,'scale',1./yts)
693Index: ../trunk-jpl/src/m/classes/inversion.js
694===================================================================
695--- ../trunk-jpl/src/m/classes/inversion.js (revision 20895)
696+++ ../trunk-jpl/src/m/classes/inversion.js (revision 20896)
697@@ -134,7 +134,7 @@
698 } // }}}
699 this.marshall=function(md,prefix,fid) { //{{{
700
701- var yts=365.0*24.0*3600.0;
702+ var yts=md.constants.yts;
703
704 WriteData(fid,prefix,'name','md.inversion.type','data',0,'format','Integer');
705 WriteData(fid,prefix,'object',this,'fieldname','iscontrol','format','Boolean');
706Index: ../trunk-jpl/src/m/classes/m1qn3inversion.m
707===================================================================
708--- ../trunk-jpl/src/m/classes/m1qn3inversion.m (revision 20895)
709+++ ../trunk-jpl/src/m/classes/m1qn3inversion.m (revision 20896)
710@@ -137,7 +137,7 @@
711 end % }}}
712 function marshall(self,prefix,md,fid) % {{{
713
714- yts=365.0*24.0*3600.0;
715+ yts=md.constants.yts;
716
717 WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean');
718 WriteData(fid,prefix,'name','md.inversion.type','data',2,'format','Integer');
719Index: ../trunk-jpl/src/m/classes/inversion.m
720===================================================================
721--- ../trunk-jpl/src/m/classes/inversion.m (revision 20895)
722+++ ../trunk-jpl/src/m/classes/inversion.m (revision 20896)
723@@ -149,7 +149,7 @@
724 end % }}}
725 function marshall(self,prefix,md,fid) % {{{
726
727- yts=365.0*24.0*3600.0;
728+ yts=md.constants.yts;
729
730 WriteData(fid,prefix,'name','md.inversion.type','data',0,'format','Integer');
731 WriteData(fid,prefix,'object',self,'fieldname','iscontrol','format','Boolean');
732Index: ../trunk-jpl/src/m/classes/calving.m
733===================================================================
734--- ../trunk-jpl/src/m/classes/calving.m (revision 20895)
735+++ ../trunk-jpl/src/m/classes/calving.m (revision 20896)
736@@ -47,7 +47,7 @@
737 fielddisplay(self,'meltingrate','melting rate at given location [m/a]');
738 end % }}}
739 function marshall(self,prefix,md,fid) % {{{
740- yts=365.0*24.0*3600.0;
741+ yts=md.constants.yts;
742 WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer');
743 WriteData(fid,prefix,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
744 WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
745Index: ../trunk-jpl/src/m/classes/SMBforcing.m
746===================================================================
747--- ../trunk-jpl/src/m/classes/SMBforcing.m (revision 20895)
748+++ ../trunk-jpl/src/m/classes/SMBforcing.m (revision 20896)
749@@ -64,7 +64,7 @@
750 end % }}}
751 function marshall(self,prefix,md,fid) % {{{
752
753- yts=365.0*24.0*3600.0;
754+ yts=md.constants.yts;
755
756 WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
757 WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
758Index: ../trunk-jpl/src/m/classes/calvinglevermann.m
759===================================================================
760--- ../trunk-jpl/src/m/classes/calvinglevermann.m (revision 20895)
761+++ ../trunk-jpl/src/m/classes/calvinglevermann.m (revision 20896)
762@@ -50,7 +50,7 @@
763
764 end % }}}
765 function marshall(self,prefix,md,fid) % {{{
766- yts=365.0*24.0*3600.0;
767+ yts=md.constants.yts;
768 WriteData(fid,prefix,'name','md.calving.law','data',CalvingLevermannEnum(),'format','Integer');
769 WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1);
770 WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
771Index: ../trunk-jpl/src/m/classes/balancethickness.m
772===================================================================
773--- ../trunk-jpl/src/m/classes/balancethickness.m (revision 20895)
774+++ ../trunk-jpl/src/m/classes/balancethickness.m (revision 20896)
775@@ -46,7 +46,7 @@
776 end % }}}
777 function marshall(self,prefix,md,fid) % {{{
778
779- yts=365.0*24.0*3600.0;
780+ yts=md.constants.yts;
781
782 WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1);
783 WriteData(fid,prefix,'object',self,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts);
784Index: ../trunk-jpl/src/m/classes/timestepping.py
785===================================================================
786--- ../trunk-jpl/src/m/classes/timestepping.py (revision 20895)
787+++ ../trunk-jpl/src/m/classes/timestepping.py (revision 20896)
788@@ -65,8 +65,7 @@
789 # }}}
790 def marshall(self,prefix,md,fid): # {{{
791
792- yts=md.constants.yts
793-
794+ yts=md.constants.yts
795 WriteData(fid,prefix,'object',self,'fieldname','start_time','format','Double','scale',yts)
796 WriteData(fid,prefix,'object',self,'fieldname','final_time','format','Double','scale',yts)
797 WriteData(fid,prefix,'object',self,'fieldname','time_step','format','Double','scale',yts)
798Index: ../trunk-jpl/src/m/classes/initialization.js
799===================================================================
800--- ../trunk-jpl/src/m/classes/initialization.js (revision 20895)
801+++ ../trunk-jpl/src/m/classes/initialization.js (revision 20896)
802@@ -98,7 +98,7 @@
803 } //}}}
804 this.marshall=function(md,prefix,fid) { //{{{
805
806- var yts=365.0*24.0*3600.0;
807+ var yts=md.constants.yts;
808
809 WriteData(fid,prefix,'object',this,'fieldname','vx','format','DoubleMat','mattype',1,'scale',1./yts);
810 WriteData(fid,prefix,'object',this,'fieldname','vy','format','DoubleMat','mattype',1,'scale',1./yts);
811Index: ../trunk-jpl/src/m/classes/SMBmeltcomponents.m
812===================================================================
813--- ../trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 20895)
814+++ ../trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 20896)
815@@ -88,7 +88,7 @@
816 end % }}}
817 function marshall(self,prefix,md,fid) % {{{
818
819- yts=365.0*24.0*3600.0;
820+ yts=md.constants.yts;
821
822 WriteData(fid,prefix,'name','md.smb.model','data',3,'format','Integer');
823 WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
824Index: ../trunk-jpl/src/m/classes/masstransport.py
825===================================================================
826--- ../trunk-jpl/src/m/classes/masstransport.py (revision 20895)
827+++ ../trunk-jpl/src/m/classes/masstransport.py (revision 20896)
828@@ -82,7 +82,7 @@
829 # }}}
830 def marshall(self,prefix,md,fid): # {{{
831
832- yts=365.*24.*3600.
833+ yts=md.constants.yts
834
835 WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
836 WriteData(fid,prefix,'object',self,'fieldname','isfreesurface','format','Boolean')
Note: See TracBrowser for help on using the repository browser.