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

../trunk-jpl/src/m/classes/thermal.py

@@ -21 +21 @@
                 self.penalty_lock      = 0
                 self.penalty_factor    = 0
                 self.isenthalpy        = 0
-                self.isdynamicbasalspc = 0;
-                self.fe                = 'P1';
+                self.isdynamicbasalspc = 0
+                self.fe                = 'P1'
                 self.requested_outputs = []
 
                 #set defaults

../trunk-jpl/src/m/classes/levelset.m

@@ -9 +9 @@
                 spclevelset                     = NaN;
                 reinit_frequency        = 5;
                 calving_max       = 0.;
+                fe                = 'P1';
         end
         methods
                 function self = levelset(varargin) % {{{
@@ -40 +41 @@
                         self.reinit_frequency = 5;
                         self.calving_max      = 3000.;
 
+                        %Linear elements by default
+                        self.fe='P1';
+
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
                         %Early return
@@ -48 +52 @@
                         md = checkfield(md,'fieldname','levelset.spclevelset','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','levelset.stabilization','values',[0 1 2]);
                         md = checkfield(md,'fieldname','levelset.calving_max','numel',1,'NaN',1,'Inf',1,'>',0);
+                        md = checkfield(md,'fieldname','levelset.fe','values',{'P1','P2'});
                 end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   Level-set parameters:'));
@@ -55 +60 @@
                         fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)');
                         fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized');
                         fielddisplay(self,'calving_max','maximum allowed calving rate (m/a)');
+                        fielddisplay(self,'fe','Finite Element type: ''P1'' (default), or ''P2''');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
 
@@ -64 +70 @@
                         WriteData(fid,prefix,'object',self,'fieldname','spclevelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','reinit_frequency','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','calving_max','format','Double','scale',1./yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','fe','format','String');
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
                 

../trunk-jpl/src/m/classes/levelset.py

@@ -17 +17 @@
                 self.spclevelset      = float('NaN')
                 self.reinit_frequency = 0
                 self.calving_max      = 0.
+                self.fe               = 'P1'
 
                 #set defaults
                 self.setdefaultparameters()
@@ -28 +29 @@
                 string="%s\n%s"%(string,fielddisplay(self,'spclevelset','levelset constraints (NaN means no constraint)'))
                 string="%s\n%s"%(string,fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized'))
                 string="%s\n%s"%(string,fielddisplay(self,'calving_max','maximum allowed calving rate (m/a)'))
+                string="%s\n%s"%(string,fielddisplay(self,'fe','Finite Element type: ''P1'' (default), or ''P2'''))
 
                 return string
                 #}}}
@@ -40 +42 @@
                 #stabilization = 1 by default
                 self.stabilization = 1
                 self.reinit_frequency = 5
-                self.calving_max      = 3000
+                self.calving_max      = 3000.
 
+                #Linear elements by default
+                self.fe='P1'
+
                 return self
         #}}}
         def checkconsistency(self,md,solution,analyses):    # {{{
@@ -53 +58 @@
                 md = checkfield(md,'fieldname','levelset.spclevelset','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','levelset.stabilization','values',[0,1,2]);
                 md = checkfield(md,'fieldname','levelset.calving_max','NaN',1,'Inf',1,'>',0);
+                md = checkfield(md,'fieldname','levelset.fe','values',['P1','P2']);
 
                 return md
         # }}}
@@ -64 +70 @@
                 WriteData(fid,prefix,'object',self,'fieldname','spclevelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                 WriteData(fid,prefix,'object',self,'fieldname','reinit_frequency','format','Integer');
                 WriteData(fid,prefix,'object',self,'fieldname','calving_max','format','Double','scale',1./yts);
+                WriteData(fid,prefix,'object',self,'fieldname','fe','format','String');
         # }}}