Changeset 21542 for issm/trunk-jpl/src/m/classes/thermal.m

Timestamp:

02/10/17 10:32:55 (8 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Higher order finite elements for enthalpy

File:

• issm/trunk-jpl/src/m/classes/thermal.m (modified) (5 diffs)

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

@@ -15 +15 @@
                 isenthalpy        = 0;
                 isdynamicbasalspc = 0;
+                fe                = 'P1';
                 requested_outputs = {};
         end
@@ -66 +67 @@
                         self.isdynamicbasalspc=0;
 
+                        %Linear elements by default
+                        self.fe='P1';
+
                         %default output
                         self.requested_outputs={'default'};
@@ -76 +80 @@
                         md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 1 2]);
                         md = checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1,'>=',0);
+                        md = checkfield(md,'fieldname','thermal.fe','values',{'P1','P1xP2'});
                         if (ismember('EnthalpyAnalysis',analyses) & md.thermal.isenthalpy & dimension(md.mesh)==3),
 
@@ -110 +115 @@
                         fielddisplay(self,'isenthalpy','use an enthalpy formulation to include temperate ice (default is 0)');
                         fielddisplay(self,'isdynamicbasalspc',['enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)']);
+                        fielddisplay(self,'fe','Finite Element type: ''P1'' (default), ''P1xP2''');
                         fielddisplay(self,'requested_outputs','additional outputs requested');
 
@@ -122 +128 @@
                         WriteData(fid,prefix,'object',self,'fieldname','penalty_factor','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','isenthalpy','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','fe','format','String');
                         WriteData(fid,prefix,'object',self,'fieldname','isdynamicbasalspc','format','Boolean');