Changeset 23170

Timestamp:

08/24/18 10:06:45 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added finite element to levelset

Location:

issm/trunk-jpl/src/m/classes

Files:

• levelset.m (modified) (5 diffs)
• levelset.py (modified) (5 diffs)
• thermal.py (modified) (1 diff)

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

@@ -10 +10 @@
                 reinit_frequency        = 5;
                 calving_max       = 0.;
+                fe                = 'P1';
         end
         methods
@@ -41 +42 @@
                         self.calving_max      = 3000.;
 
+                        %Linear elements by default
+                        self.fe='P1';
+
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -49 +53 @@
                         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) % {{{
@@ -56 +61 @@
                         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) % {{{
@@ -65 +71 @@
                         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) % {{{

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

@@ -18 +18 @@
                 self.reinit_frequency = 0
                 self.calving_max      = 0.
+                self.fe               = 'P1'
 
                 #set defaults
@@ -29 +30 @@
                 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
@@ -41 +43 @@
                 self.stabilization = 1
                 self.reinit_frequency = 5
-                self.calving_max      = 3000
+                self.calving_max      = 3000.
+
+                #Linear elements by default
+                self.fe='P1'
 
                 return self
@@ -54 +59 @@
                 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
@@ -65 +71 @@
                 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');
         # }}}

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

@@ -22 +22 @@
                 self.penalty_factor    = 0
                 self.isenthalpy        = 0
-                self.isdynamicbasalspc = 0;
-                self.fe                = 'P1';
+                self.isdynamicbasalspc = 0
+                self.fe                = 'P1'
                 self.requested_outputs = []