source: issm/oecreview/Archive/21337-21723/ISSM-21529-21530.diff@ 21726

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

CHG added Archive/21337-21723
File size: 30.4 KB
RevLine 
[21726]1Index: ../trunk-jpl/src/m/Makefile.am
2===================================================================
3--- ../trunk-jpl/src/m/Makefile.am (revision 21529)
4+++ ../trunk-jpl/src/m/Makefile.am (revision 21530)
5@@ -94,7 +94,7 @@
6 ${ISSM_DIR}/src/m/classes/flowequation.js \
7 ${ISSM_DIR}/src/m/classes/friction.js \
8 ${ISSM_DIR}/src/m/classes/geometry.js \
9- ${ISSM_DIR}/src/m/classes/gia.js \
10+ ${ISSM_DIR}/src/m/classes/giaivins.js \
11 ${ISSM_DIR}/src/m/classes/esa.js \
12 ${ISSM_DIR}/src/m/classes/groundingline.js \
13 ${ISSM_DIR}/src/m/classes/hydrologyshreve.js \
14Index: ../trunk-jpl/src/m/solve/solve.py
15===================================================================
16--- ../trunk-jpl/src/m/solve/solve.py (revision 21529)
17+++ ../trunk-jpl/src/m/solve/solve.py (revision 21530)
18@@ -27,7 +27,7 @@
19 - 'SurfaceSlope' or 'ssl'
20 - 'Hydrology' or 'hy'
21 - 'DamageEvolution' or 'da'
22- - 'Gia' or 'gia'
23+ - 'GiaIvins' or 'giaivins'
24 - 'Sealevelrise' or 'slr'
25
26 extra options:
27@@ -63,8 +63,8 @@
28 solutionstring = 'HydrologySolution';
29 elif solutionstring.lower() == 'da' or solutionstring.lower() == 'damageevolution':
30 solutionstring = 'DamageEvolutionSolution';
31- elif solutionstring.lower() == 'gia' or solutionstring.lower() == 'gia':
32- solutionstring = 'GiaSolution';
33+ elif solutionstring.lower() == 'giaivins' or solutionstring.lower() == 'giaivins':
34+ solutionstring = 'GiaIvinsSolution';
35 elif solutionstring.lower() == 'slr' or solutionstring.lower() == 'sealevelrise':
36 solutionstring = 'SealevelriseSolution';
37 else:
38Index: ../trunk-jpl/src/m/solve/solve.m
39===================================================================
40--- ../trunk-jpl/src/m/solve/solve.m (revision 21529)
41+++ ../trunk-jpl/src/m/solve/solve.m (revision 21530)
42@@ -17,7 +17,7 @@
43 % - 'SurfaceSlope' or 'ssl'
44 % - 'Hydrology' or 'hy'
45 % - 'DamageEvolution' or 'da'
46-% - 'Gia' or 'gia'
47+% - 'GiaIvins' or 'giaivins'
48 % - 'Esa' or 'esa'
49 % - 'Sealevelrise' or 'slr'
50 %
51@@ -61,8 +61,8 @@
52 solutionstring = 'HydrologySolution';
53 elseif strcmpi(solutionstring,'da') || strcmpi(solutionstring,'DamageEvolution')
54 solutionstring = 'DamageEvolutionSolution';
55-elseif strcmpi(solutionstring,'gia') || strcmpi(solutionstring,'Gia')
56- solutionstring = 'GiaSolution';
57+elseif strcmpi(solutionstring,'giaivins') || strcmpi(solutionstring,'GiaIvins')
58+ solutionstring = 'GiaIvinsSolution';
59 elseif strcmpi(solutionstring,'esa') || strcmpi(solutionstring,'Esa')
60 solutionstring = 'EsaSolution';
61 elseif strcmpi(solutionstring,'slr') || strcmpi(solutionstring,'Sealevelrise')
62Index: ../trunk-jpl/src/m/solve/solve.js
63===================================================================
64--- ../trunk-jpl/src/m/solve/solve.js (revision 21529)
65+++ ../trunk-jpl/src/m/solve/solve.js (revision 21530)
66@@ -17,7 +17,7 @@
67 // - 'SurfaceSlope' or 'ssl'
68 // - 'Hydrology' or 'hy'
69 // - 'DamageEvolution' or 'da'
70-// - 'Gia' or 'gia'
71+// - 'GiaIvins' or 'giaivins'
72 // - 'Sealevelrise' or 'slr'
73 //
74 // extra options:
75@@ -58,8 +58,8 @@
76 solutionstring = 'HydrologySolution';
77 }else if((solutionstring.toLowerCase() === 'da') || (solutionstring.toLowerCase() === 'damageevolution')){
78 solutionstring = 'DamageEvolutionSolution';
79- }else if((solutionstring.toLowerCase() === 'gia') || (solutionstring.toLowerCase() === 'gia')){
80- solutionstring = 'GiaSolution';
81+ }else if((solutionstring.toLowerCase() === 'giaivins') || (solutionstring.toLowerCase() === 'giaivins')){
82+ solutionstring = 'GiaIvinsSolution';
83 }else if((solutionstring.toLowerCase() === 'slr') || (solutionstring.toLowerCase() === 'sealevelrise')){
84 solutionstring = 'SealevelriseSolution';
85 }else{
86Index: ../trunk-jpl/src/m/consistency/ismodelselfconsistent.js
87===================================================================
88--- ../trunk-jpl/src/m/consistency/ismodelselfconsistent.js (revision 21529)
89+++ ../trunk-jpl/src/m/consistency/ismodelselfconsistent.js (revision 21530)
90@@ -74,8 +74,8 @@
91 }else if(solutiontype ==='BedSlopeSolution'){
92 analyses=['L2ProjectionBaseAnalysis'];
93
94- }else if(solutiontype ==='GiaSolution'){
95- analyses=['GiaAnalysis'];
96+ }else if(solutiontype ==='GiaIvinsSolution'){
97+ analyses=['GiaIvinsAnalysis'];
98
99 }else if(solutiontype ==='TransientSolution'){
100 analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologySommersAnalysis'];
101Index: ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m
102===================================================================
103--- ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 21529)
104+++ ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 21530)
105@@ -63,8 +63,8 @@
106 analyses={'L2ProjectionBaseAnalysis'};
107 elseif strcmp(solutiontype,'BedSlopeSolution')
108 analyses={'L2ProjectionBaseAnalysis'};
109- elseif strcmp(solutiontype,'GiaSolution')
110- analyses={'GiaAnalysis'};
111+ elseif strcmp(solutiontype,'GiaIvinsSolution')
112+ analyses={'GiaIvinsAnalysis'};
113 elseif strcmp(solutiontype,'EsaSolution')
114 analyses={'EsaAnalysis'};
115 elseif strcmp(solutiontype,'TransientSolution')
116Index: ../trunk-jpl/src/m/consistency/ismodelselfconsistent.py
117===================================================================
118--- ../trunk-jpl/src/m/consistency/ismodelselfconsistent.py (revision 21529)
119+++ ../trunk-jpl/src/m/consistency/ismodelselfconsistent.py (revision 21530)
120@@ -30,8 +30,8 @@
121 elif solutiontype == 'BedSlopeSolution':
122 analyses=['L2ProjectionBaseAnalysis']
123
124- elif solutiontype == 'GiaSolution':
125- analyses=['GiaAnalysis']
126+ elif solutiontype == 'GiaIvinsSolution':
127+ analyses=['GiaIvinsAnalysis']
128
129 elif solutiontype == 'TransientSolution':
130 analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis']
131Index: ../trunk-jpl/src/m/classes/geometry.py
132===================================================================
133--- ../trunk-jpl/src/m/classes/geometry.py (revision 21529)
134+++ ../trunk-jpl/src/m/classes/geometry.py (revision 21530)
135@@ -44,7 +44,7 @@
136 #}}}
137 def checkconsistency(self,md,solution,analyses): # {{{
138
139- if (solution=='TransientSolution' and md.transient.isgia) or (solution=='GiaSolution'):
140+ if (solution=='TransientSolution' and md.transient.isgiaivins) or (solution=='GiaIvinsSolution'):
141 md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'>=',0,'timeseries',1)
142 else:
143 md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
144Index: ../trunk-jpl/src/m/classes/model.m
145===================================================================
146--- ../trunk-jpl/src/m/classes/model.m (revision 21529)
147+++ ../trunk-jpl/src/m/classes/model.m (revision 21530)
148@@ -39,7 +39,7 @@
149 transient = 0;
150 levelset = 0;
151 calving = 0;
152- gia = 0;
153+ giaivins = 0;
154 esa = 0;
155
156 autodiff = 0;
157@@ -224,9 +224,9 @@
158 if ~isnan(md.initialization.epl_thickness),md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1);end;
159 if ~isnan(md.initialization.waterfraction),md.initialization.waterfraction=project2d(md,md.initialization.waterfraction,1);end;
160 if ~isnan(md.initialization.watercolumn),md.initialization.watercolumn=project2d(md,md.initialization.watercolumn,1);end;
161- %gia
162- if ~isnan(md.gia.mantle_viscosity), md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1); end
163- if ~isnan(md.gia.lithosphere_thickness), md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1); end
164+ %giaivins
165+ if ~isnan(md.giaivins.mantle_viscosity), md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1); end
166+ if ~isnan(md.giaivins.lithosphere_thickness), md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1); end
167
168 %elementstype
169 if ~isnan(md.flowequation.element_equation)
170@@ -1111,7 +1111,7 @@
171 md.transient = transient();
172 md.levelset = levelset();
173 md.calving = calving();
174- md.gia = gia();
175+ md.giaivins = giaivins();
176 md.esa = esa();
177 md.autodiff = autodiff();
178 md.inversion = inversion();
179@@ -1283,7 +1283,7 @@
180 disp(sprintf('%19s: %-22s -- %s','transient' ,['[1x1 ' class(self.transient) ']'],'parameters for transient solution'));
181 disp(sprintf('%19s: %-22s -- %s','levelset' ,['[1x1 ' class(self.levelset) ']'],'parameters for moving boundaries (level-set method)'));
182 disp(sprintf('%19s: %-22s -- %s','calving' ,['[1x1 ' class(self.calving) ']'],'parameters for calving'));
183- disp(sprintf('%19s: %-22s -- %s','gia' ,['[1x1 ' class(self.gia) ']'],'parameters for gia solution'));
184+ disp(sprintf('%19s: %-22s -- %s','giaivins' ,['[1x1 ' class(self.giaivins) ']'],'parameters for giaivins solution'));
185 disp(sprintf('%19s: %-22s -- %s','esa' ,['[1x1 ' class(self.esa) ']'],'parameters for elastic adjustment solution'));
186 disp(sprintf('%19s: %-22s -- %s','autodiff' ,['[1x1 ' class(self.autodiff) ']'],'automatic differentiation parameters'));
187 disp(sprintf('%19s: %-22s -- %s','inversion' ,['[1x1 ' class(self.inversion) ']'],'parameters for inverse methods'));
188Index: ../trunk-jpl/src/m/classes/model.js
189===================================================================
190--- ../trunk-jpl/src/m/classes/model.js (revision 21529)
191+++ ../trunk-jpl/src/m/classes/model.js (revision 21530)
192@@ -36,7 +36,7 @@
193 console.log(sprintf("//19s: //-22s -- //s","trans" ,"[1x1 " + typeof(this.trans) + "]","parameters for trans solution"));
194 console.log(sprintf("//19s: //-22s -- //s","levelset" ,"[1x1 " + typeof(this.levelset) + "]","parameters for moving boundaries (level-set method)"));
195 console.log(sprintf("//19s: //-22s -- //s","calving" ,"[1x1 " + typeof(this.calving) + "]","parameters for calving"));
196- console.log(sprintf("//19s: //-22s -- //s","gia" ,"[1x1 " + typeof(this.gia) + "]","parameters for gia solution"));
197+ console.log(sprintf("//19s: //-22s -- //s","giaivins" ,"[1x1 " + typeof(this.giaivins) + "]","parameters for giaivins solution"));
198 console.log(sprintf("//19s: //-22s -- //s","autodiff" ,"[1x1 " + typeof(this.autodiff) + "]","automatic differentiation parameters"));
199 console.log(sprintf("//19s: //-22s -- //s","inversion" ,"[1x1 " + typeof(this.inversion) + "]","parameters for inverse methods"));
200 console.log(sprintf("//19s: //-22s -- //s","qmu" ,"[1x1 " + typeof(this.qmu) + "]","dakota properties"));
201@@ -77,7 +77,7 @@
202 this.trans = new trans();
203 this.levelset = new levelset();
204 this.calving = new calving();
205- this.gia = new gia();
206+ this.giaivins = new giaivins();
207 this.autodiff = new autodiff();
208 this.inversion = new inversion();
209 this.qmu = new qmu();
210@@ -471,11 +471,11 @@
211 if (!isNaN(md.initialization.epl_thickness))
212 md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1);
213
214- // gia
215- if (!isNaN(md.gia.mantle_viscosity))
216- md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1);
217- if (!isNaN(md.gia.lithosphere_thickness))
218- md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1);
219+ // giaivins
220+ if (!isNaN(md.giaivins.mantle_viscosity))
221+ md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1);
222+ if (!isNaN(md.giaivins.lithosphere_thickness))
223+ md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1);
224
225 // elementstype
226 if (!isNaN(md.flowequation.element_equation)) {
227@@ -606,7 +606,7 @@
228 this.trans = 0;
229 this.levelset = 0;
230 this.calving = 0;
231- this.gia = 0;
232+ this.giaivins = 0;
233
234 this.autodiff = 0;
235 this.inversion = 0;
236Index: ../trunk-jpl/src/m/classes/geometry.js
237===================================================================
238--- ../trunk-jpl/src/m/classes/geometry.js (revision 21529)
239+++ ../trunk-jpl/src/m/classes/geometry.js (revision 21530)
240@@ -28,7 +28,7 @@
241 } //}}}
242 this.checkconsistency = function(md,solution,analyses) { //{{{
243
244- if ((solution=='TransientSolution' & md.trans.isgia) | (solution=='GiaSolution')){
245+ if ((solution=='TransientSolution' & md.trans.isgiaivins) | (solution=='GiaIvinsSolution')){
246 checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0);
247 }
248 else{
249Index: ../trunk-jpl/src/m/classes/matenhancedice.m
250===================================================================
251--- ../trunk-jpl/src/m/classes/matenhancedice.m (revision 21529)
252+++ ../trunk-jpl/src/m/classes/matenhancedice.m (revision 21530)
253@@ -22,7 +22,7 @@
254 rheology_n = NaN;
255 rheology_law = '';
256
257- %gia:
258+ %giaivins:
259 lithosphere_shear_modulus = 0.;
260 lithosphere_density = 0.;
261 mantle_shear_modulus = 0.;
262Index: ../trunk-jpl/src/m/classes/matice.m
263===================================================================
264--- ../trunk-jpl/src/m/classes/matice.m (revision 21529)
265+++ ../trunk-jpl/src/m/classes/matice.m (revision 21530)
266@@ -21,7 +21,7 @@
267 rheology_n = NaN;
268 rheology_law = '';
269
270- %gia:
271+ %giaivins:
272 lithosphere_shear_modulus = 0.;
273 lithosphere_density = 0.;
274 mantle_shear_modulus = 0.;
275Index: ../trunk-jpl/src/m/classes/matestar.m
276===================================================================
277--- ../trunk-jpl/src/m/classes/matestar.m (revision 21529)
278+++ ../trunk-jpl/src/m/classes/matestar.m (revision 21530)
279@@ -22,7 +22,7 @@
280 rheology_Es = NaN;
281 rheology_law = '';
282
283- %gia:
284+ %giaivins:
285 lithosphere_shear_modulus = 0.;
286 lithosphere_density = 0.;
287 mantle_shear_modulus = 0.;
288Index: ../trunk-jpl/src/m/classes/matice.py
289===================================================================
290--- ../trunk-jpl/src/m/classes/matice.py (revision 21529)
291+++ ../trunk-jpl/src/m/classes/matice.py (revision 21530)
292@@ -28,7 +28,7 @@
293 self.rheology_n = float('NaN')
294 self.rheology_law = ''
295
296- #gia:
297+ #giaivins:
298 self.lithosphere_shear_modulus = 0.
299 self.lithosphere_density = 0.
300 self.mantle_shear_modulus = 0.
301Index: ../trunk-jpl/src/m/classes/matdamageice.py
302===================================================================
303--- ../trunk-jpl/src/m/classes/matdamageice.py (revision 21529)
304+++ ../trunk-jpl/src/m/classes/matdamageice.py (revision 21530)
305@@ -28,7 +28,7 @@
306 self.rheology_n = float('NaN')
307 self.rheology_law = ''
308
309- #gia:
310+ #giaivins:
311 self.lithosphere_shear_modulus = 0.
312 self.lithosphere_density = 0.
313 self.mantle_shear_modulus = 0.
314Index: ../trunk-jpl/src/m/classes/matdamageice.m
315===================================================================
316--- ../trunk-jpl/src/m/classes/matdamageice.m (revision 21529)
317+++ ../trunk-jpl/src/m/classes/matdamageice.m (revision 21530)
318@@ -21,7 +21,7 @@
319 rheology_n = NaN;
320 rheology_law = '';
321
322- %gia:
323+ %giaivins:
324 lithosphere_shear_modulus = 0.;
325 lithosphere_density = 0.;
326 mantle_shear_modulus = 0.;
327Index: ../trunk-jpl/src/m/classes/transient.py
328===================================================================
329--- ../trunk-jpl/src/m/classes/transient.py (revision 21529)
330+++ ../trunk-jpl/src/m/classes/transient.py (revision 21530)
331@@ -16,7 +16,7 @@
332 self.isstressbalance = False
333 self.isthermal = False
334 self.isgroundingline = False
335- self.isgia = False
336+ self.isgiaivins = False
337 self.isesa = False
338 self.isdamageevolution = False
339 self.ismovingfront = False
340@@ -36,7 +36,7 @@
341 string="%s\n%s"%(string,fielddisplay(self,'isstressbalance','indicates if a stressbalance solution is used in the transient'))
342 string="%s\n%s"%(string,fielddisplay(self,'isthermal','indicates if a thermal solution is used in the transient'))
343 string="%s\n%s"%(string,fielddisplay(self,'isgroundingline','indicates if a groundingline migration is used in the transient'))
344- string="%s\n%s"%(string,fielddisplay(self,'isgia','indicates if a postglacial rebound is used in the transient'))
345+ string="%s\n%s"%(string,fielddisplay(self,'isgiaivins','indicates if a postglacial rebound is used in the transient'))
346 string="%s\n%s"%(string,fielddisplay(self,'isesa','indicates whether an elastic adjustment model is used in the transient'))
347 string="%s\n%s"%(string,fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient'))
348 string="%s\n%s"%(string,fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient'))
349@@ -62,7 +62,7 @@
350 self.isstressbalance = False
351 self.isthermal = False
352 self.isgroundingline = False
353- self.isgia = False
354+ self.isgiaivins = False
355 self.isesa = False
356 self.isdamageevolution = False
357 self.ismovingfront = False
358@@ -82,7 +82,7 @@
359 self.isstressbalance = True
360 self.isthermal = True
361 self.isgroundingline = False
362- self.isgia = False
363+ self.isgiaivins = False
364 self.isesa = False
365 self.isdamageevolution = False
366 self.ismovingfront = False
367@@ -105,7 +105,7 @@
368 md = checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0,1])
369 md = checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0,1])
370 md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0,1])
371- md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0,1])
372+ md = checkfield(md,'fieldname','transient.isgiaivins','numel',[1],'values',[0,1])
373 md = checkfield(md,'fieldname','transient.isesa','numel',[1],'values',[0,1])
374 md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0,1])
375 md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0,1])
376@@ -122,7 +122,7 @@
377 WriteData(fid,prefix,'object',self,'fieldname','isstressbalance','format','Boolean')
378 WriteData(fid,prefix,'object',self,'fieldname','isthermal','format','Boolean')
379 WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean')
380- WriteData(fid,prefix,'object',self,'fieldname','isgia','format','Boolean')
381+ WriteData(fid,prefix,'object',self,'fieldname','isgiaivins','format','Boolean')
382 WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean')
383 WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean')
384 WriteData(fid,prefix,'object',self,'fieldname','ishydrology','format','Boolean')
385Index: ../trunk-jpl/src/m/classes/matice.js
386===================================================================
387--- ../trunk-jpl/src/m/classes/matice.js (revision 21529)
388+++ ../trunk-jpl/src/m/classes/matice.js (revision 21530)
389@@ -156,7 +156,7 @@
390 this.rheology_n = NaN;
391 this.rheology_law = '';
392
393- //gia:
394+ //giaivins:
395 this.lithosphere_shear_modulus = 0.;
396 this.lithosphere_density = 0.;
397 this.mantle_shear_modulus = 0.;
398Index: ../trunk-jpl/src/m/classes/geometry.m
399===================================================================
400--- ../trunk-jpl/src/m/classes/geometry.m (revision 21529)
401+++ ../trunk-jpl/src/m/classes/geometry.m (revision 21530)
402@@ -52,7 +52,7 @@
403 end % }}}
404 function md = checkconsistency(self,md,solution,analyses) % {{{
405
406- if (strcmp(solution,'TransientSolution') & md.transient.isgia) | strcmp(solution,'GiaSolution'),
407+ if (strcmp(solution,'TransientSolution') & md.transient.isgiaivins) | strcmp(solution,'GiaIvinsSolution'),
408 md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0);
409 else
410 md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
411Index: ../trunk-jpl/src/m/classes/slr.m
412===================================================================
413--- ../trunk-jpl/src/m/classes/slr.m (revision 21529)
414+++ ../trunk-jpl/src/m/classes/slr.m (revision 21530)
415@@ -140,6 +140,7 @@
416 end % }}}
417 function marshall(self,prefix,md,fid) % {{{
418 WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',2);
419+ %WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofelements+1);
420 WriteData(fid,prefix,'object',self,'fieldname','sealevel','mattype',1,'format','DoubleMat','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
421 WriteData(fid,prefix,'object',self,'fieldname','reltol','format','Double');
422 WriteData(fid,prefix,'object',self,'fieldname','abstol','format','Double');
423Index: ../trunk-jpl/src/m/classes/trans.js
424===================================================================
425--- ../trunk-jpl/src/m/classes/trans.js (revision 21529)
426+++ ../trunk-jpl/src/m/classes/trans.js (revision 21530)
427@@ -13,7 +13,7 @@
428 this.isstressbalance = 1;
429 this.isthermal = 1;
430 this.isgroundingline = 0;
431- this.isgia = 0;
432+ this.isgiaivins = 0;
433 this.isdamageevolution = 0;
434 this.ismovingfront = 0;
435 this.ishydrology = 0;
436@@ -33,7 +33,7 @@
437 fielddisplay(this,'isstressbalance','indicates whether a stressbalance solution is used in the transient');
438 fielddisplay(this,'isthermal','indicates whether a thermal solution is used in the transient');
439 fielddisplay(this,'isgroundingline','indicates whether a groundingline migration is used in the transient');
440- fielddisplay(this,'isgia','indicates whether a postglacial rebound model is used in the transient');
441+ fielddisplay(this,'isgiaivins','indicates whether a postglacial rebound model is used in the transient');
442 fielddisplay(this,'isdamageevolution','indicates whether damage evolution is used in the transient');
443 fielddisplay(this,'ismovingfront','indicates whether a moving front capability is used in the transient');
444 fielddisplay(this,'ishydrology','indicates whether an hydrology model is used');
445@@ -56,7 +56,7 @@
446 checkfield(md,'fieldname','trans.isstressbalance','numel',[1],'values',[0 ,1]);
447 checkfield(md,'fieldname','trans.isthermal','numel',[1],'values',[0 ,1]);
448 checkfield(md,'fieldname','trans.isgroundingline','numel',[1],'values',[0, 1]);
449- checkfield(md,'fieldname','trans.isgia','numel',[1],'values',[0, 1]);
450+ checkfield(md,'fieldname','trans.isgiaivins','numel',[1],'values',[0, 1]);
451 checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]);
452 checkfield(md,'fieldname','trans.ismovingfront','numel',[1],'values',[0, 1]);
453 checkfield(md,'fieldname','trans.ishydrology','numel',[1],'values',[0 ,1]);
454@@ -72,7 +72,7 @@
455 WriteData(fid,prefix,'object',this,'fieldname','isstressbalance','format','Boolean');
456 WriteData(fid,prefix,'object',this,'fieldname','isthermal','format','Boolean');
457 WriteData(fid,prefix,'object',this,'fieldname','isgroundingline','format','Boolean');
458- WriteData(fid,prefix,'object',this,'fieldname','isgia','format','Boolean');
459+ WriteData(fid,prefix,'object',this,'fieldname','isgiaivins','format','Boolean');
460 WriteData(fid,prefix,'object',this,'fieldname','isdamageevolution','format','Boolean');
461 WriteData(fid,prefix,'object',this,'fieldname','ishydrology','format','Boolean');
462 WriteData(fid,prefix,'object',this,'fieldname','ismovingfront','format','Boolean');
463@@ -104,7 +104,7 @@
464 this.isstressbalance = 0;
465 this.isthermal = 0;
466 this.isgroundingline = 0;
467- this.isgia = 0;
468+ this.isgiaivins = 0;
469 this.isdamageevolution = 0;
470 this.ismovingfront = 0;
471 this.ishydrology = 0;
472Index: ../trunk-jpl/src/m/classes/model.py
473===================================================================
474--- ../trunk-jpl/src/m/classes/model.py (revision 21529)
475+++ ../trunk-jpl/src/m/classes/model.py (revision 21530)
476@@ -44,7 +44,7 @@
477 from thermal import thermal
478 from steadystate import steadystate
479 from transient import transient
480-from gia import gia
481+from giaivins import giaivins
482 from autodiff import autodiff
483 from inversion import inversion
484 from outputdefinition import outputdefinition
485@@ -106,7 +106,7 @@
486 self.transient = transient()
487 self.levelset = levelset()
488 self.calving = calving()
489- self.gia = gia()
490+ self.giaivins = giaivins()
491
492 self.autodiff = autodiff()
493 self.inversion = inversion()
494@@ -149,7 +149,7 @@
495 'transient',\
496 'levelset',\
497 'calving',\
498- 'gia',\
499+ 'giaivins',\
500 'autodiff',\
501 'inversion',\
502 'qmu',\
503@@ -639,7 +639,7 @@
504
505 md.materials.extrude(md)
506 md.damage.extrude(md)
507- md.gia.extrude(md)
508+ md.giaivins.extrude(md)
509 md.mask.extrude(md)
510 md.qmu.extrude(md)
511 md.basalforcings.extrude(md)
512@@ -695,9 +695,9 @@
513 if not np.isnan(md.initialization.epl_head).all(): md.initialization.epl_head=project2d(md,md.initialization.epl_head,1)
514 if not np.isnan(md.initialization.epl_thickness).all(): md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1)
515
516- #gia
517- if not np.isnan(md.gia.mantle_viscosity).all(): md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1)
518- if not np.isnan(md.gia.lithosphere_thickness).all(): md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1)
519+ #giaivins
520+ if not np.isnan(md.giaivins.mantle_viscosity).all(): md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1)
521+ if not np.isnan(md.giaivins.lithosphere_thickness).all(): md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1)
522
523 #elementstype
524 if not np.isnan(md.flowequation.element_equation).all():
525Index: ../trunk-jpl/src/m/classes/transient.m
526===================================================================
527--- ../trunk-jpl/src/m/classes/transient.m (revision 21529)
528+++ ../trunk-jpl/src/m/classes/transient.m (revision 21530)
529@@ -10,7 +10,7 @@
530 isstressbalance = 0;
531 isthermal = 0;
532 isgroundingline = 0;
533- isgia = 0;
534+ isgiaivins = 0;
535 isesa = 0;
536 isdamageevolution = 0;
537 ismovingfront = 0;
538@@ -36,7 +36,7 @@
539 self.isstressbalance = 0;
540 self.isthermal = 0;
541 self.isgroundingline = 0;
542- self.isgia = 0;
543+ self.isgiaivins = 0;
544 self.isesa = 0;
545 self.isdamageevolution = 0;
546 self.ismovingfront =0;
547@@ -55,7 +55,7 @@
548 self.isstressbalance = 1;
549 self.isthermal = 1;
550 self.isgroundingline = 0;
551- self.isgia = 0;
552+ self.isgiaivins = 0;
553 self.isesa = 0;
554 self.isdamageevolution = 0;
555 self.ismovingfront = 0;
556@@ -83,7 +83,7 @@
557 md = checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0 1]);
558 md = checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0 1]);
559 md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0 1]);
560- md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0 1]);
561+ md = checkfield(md,'fieldname','transient.isgiaivins','numel',[1],'values',[0 1]);
562 md = checkfield(md,'fieldname','transient.isesa','numel',[1],'values',[0 1]);
563 md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]);
564 md = checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0 1]);
565@@ -101,7 +101,7 @@
566 fielddisplay(self,'isstressbalance','indicates whether a stressbalance solution is used in the transient');
567 fielddisplay(self,'isthermal','indicates whether a thermal solution is used in the transient');
568 fielddisplay(self,'isgroundingline','indicates whether a groundingline migration is used in the transient');
569- fielddisplay(self,'isgia','indicates whether a postglacial rebound model is used in the transient');
570+ fielddisplay(self,'isgiaivins','indicates whether a postglacial rebound model is used in the transient');
571 fielddisplay(self,'isesa','indicates whether an elastic adjustment model is used in the transient');
572 fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient');
573 fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient');
574@@ -117,7 +117,7 @@
575 WriteData(fid,prefix,'object',self,'fieldname','isstressbalance','format','Boolean');
576 WriteData(fid,prefix,'object',self,'fieldname','isthermal','format','Boolean');
577 WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean');
578- WriteData(fid,prefix,'object',self,'fieldname','isgia','format','Boolean');
579+ WriteData(fid,prefix,'object',self,'fieldname','isgiaivins','format','Boolean');
580 WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean');
581 WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean');
582 WriteData(fid,prefix,'object',self,'fieldname','ishydrology','format','Boolean');
583@@ -141,7 +141,7 @@
584 writejsdouble(fid,[modelname '.trans.isstressbalance'],self.isstressbalance);
585 writejsdouble(fid,[modelname '.trans.isthermal'],self.isthermal);
586 writejsdouble(fid,[modelname '.trans.isgroundingline'],self.isgroundingline);
587- writejsdouble(fid,[modelname '.trans.isgia'],self.isgia);
588+ writejsdouble(fid,[modelname '.trans.isgiaivins'],self.isgiaivins);
589 writejsdouble(fid,[modelname '.trans.isesa'],self.isesa);
590 writejsdouble(fid,[modelname '.trans.isdamageevolution'],self.isdamageevolution);
591 writejsdouble(fid,[modelname '.trans.ismovingfront'],self.ismovingfront);
592Index: ../trunk-jpl/src/m/contrib/defleurian/netCDF/ClassTry.py
593===================================================================
594--- ../trunk-jpl/src/m/contrib/defleurian/netCDF/ClassTry.py (revision 21529)
595+++ ../trunk-jpl/src/m/contrib/defleurian/netCDF/ClassTry.py (revision 21530)
596@@ -69,7 +69,7 @@
597 'steadystate':'steadystate',\
598 'transient':'transient',\
599 'calving':'calving',\
600- 'gia':'gia',\
601+ 'giaivins':'giaivins',\
602 'autodiff':'autodiff',\
603 'inversion':'inversion',\
604 'qmu':'qmu',\
Note: See TracBrowser for help on using the repository browser.