source: issm/oecreview/Archive/22819-23185/ISSM-23169-23170.diff@ 23186

Last change on this file since 23186 was 23186, checked in by Mathieu Morlighem, 7 years ago

CHG: added Archive/22819-23185
File size: 4.6 KB
RevLine 
[23186]1Index: ../trunk-jpl/src/m/classes/thermal.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/thermal.py (revision 23169)
4+++ ../trunk-jpl/src/m/classes/thermal.py (revision 23170)
5@@ -21,8 +21,8 @@
6 self.penalty_lock = 0
7 self.penalty_factor = 0
8 self.isenthalpy = 0
9- self.isdynamicbasalspc = 0;
10- self.fe = 'P1';
11+ self.isdynamicbasalspc = 0
12+ self.fe = 'P1'
13 self.requested_outputs = []
14
15 #set defaults
16Index: ../trunk-jpl/src/m/classes/levelset.m
17===================================================================
18--- ../trunk-jpl/src/m/classes/levelset.m (revision 23169)
19+++ ../trunk-jpl/src/m/classes/levelset.m (revision 23170)
20@@ -9,6 +9,7 @@
21 spclevelset = NaN;
22 reinit_frequency = 5;
23 calving_max = 0.;
24+ fe = 'P1';
25 end
26 methods
27 function self = levelset(varargin) % {{{
28@@ -40,6 +41,9 @@
29 self.reinit_frequency = 5;
30 self.calving_max = 3000.;
31
32+ %Linear elements by default
33+ self.fe='P1';
34+
35 end % }}}
36 function md = checkconsistency(self,md,solution,analyses) % {{{
37 %Early return
38@@ -48,6 +52,7 @@
39 md = checkfield(md,'fieldname','levelset.spclevelset','Inf',1,'timeseries',1);
40 md = checkfield(md,'fieldname','levelset.stabilization','values',[0 1 2]);
41 md = checkfield(md,'fieldname','levelset.calving_max','numel',1,'NaN',1,'Inf',1,'>',0);
42+ md = checkfield(md,'fieldname','levelset.fe','values',{'P1','P2'});
43 end % }}}
44 function disp(self) % {{{
45 disp(sprintf(' Level-set parameters:'));
46@@ -55,6 +60,7 @@
47 fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)');
48 fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized');
49 fielddisplay(self,'calving_max','maximum allowed calving rate (m/a)');
50+ fielddisplay(self,'fe','Finite Element type: ''P1'' (default), or ''P2''');
51 end % }}}
52 function marshall(self,prefix,md,fid) % {{{
53
54@@ -64,6 +70,7 @@
55 WriteData(fid,prefix,'object',self,'fieldname','spclevelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
56 WriteData(fid,prefix,'object',self,'fieldname','reinit_frequency','format','Integer');
57 WriteData(fid,prefix,'object',self,'fieldname','calving_max','format','Double','scale',1./yts);
58+ WriteData(fid,prefix,'object',self,'fieldname','fe','format','String');
59 end % }}}
60 function savemodeljs(self,fid,modelname) % {{{
61
62Index: ../trunk-jpl/src/m/classes/levelset.py
63===================================================================
64--- ../trunk-jpl/src/m/classes/levelset.py (revision 23169)
65+++ ../trunk-jpl/src/m/classes/levelset.py (revision 23170)
66@@ -17,6 +17,7 @@
67 self.spclevelset = float('NaN')
68 self.reinit_frequency = 0
69 self.calving_max = 0.
70+ self.fe = 'P1'
71
72 #set defaults
73 self.setdefaultparameters()
74@@ -28,6 +29,7 @@
75 string="%s\n%s"%(string,fielddisplay(self,'spclevelset','levelset constraints (NaN means no constraint)'))
76 string="%s\n%s"%(string,fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized'))
77 string="%s\n%s"%(string,fielddisplay(self,'calving_max','maximum allowed calving rate (m/a)'))
78+ string="%s\n%s"%(string,fielddisplay(self,'fe','Finite Element type: ''P1'' (default), or ''P2'''))
79
80 return string
81 #}}}
82@@ -40,8 +42,11 @@
83 #stabilization = 1 by default
84 self.stabilization = 1
85 self.reinit_frequency = 5
86- self.calving_max = 3000
87+ self.calving_max = 3000.
88
89+ #Linear elements by default
90+ self.fe='P1'
91+
92 return self
93 #}}}
94 def checkconsistency(self,md,solution,analyses): # {{{
95@@ -53,6 +58,7 @@
96 md = checkfield(md,'fieldname','levelset.spclevelset','Inf',1,'timeseries',1)
97 md = checkfield(md,'fieldname','levelset.stabilization','values',[0,1,2]);
98 md = checkfield(md,'fieldname','levelset.calving_max','NaN',1,'Inf',1,'>',0);
99+ md = checkfield(md,'fieldname','levelset.fe','values',['P1','P2']);
100
101 return md
102 # }}}
103@@ -64,4 +70,5 @@
104 WriteData(fid,prefix,'object',self,'fieldname','spclevelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
105 WriteData(fid,prefix,'object',self,'fieldname','reinit_frequency','format','Integer');
106 WriteData(fid,prefix,'object',self,'fieldname','calving_max','format','Double','scale',1./yts);
107+ WriteData(fid,prefix,'object',self,'fieldname','fe','format','String');
108 # }}}
Note: See TracBrowser for help on using the repository browser.