Changeset 18554

Timestamp:

10/01/14 06:10:21 (10 years ago)

Author:

jbondzio

Message:

ADD: thermal.reltol for python

Location:

issm/trunk-jpl/src/m/classes

Files:

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

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

@@ -99 +99 @@
                                 md = checkfield(md,'fieldname','thermal.isdynamicbasalspc','numel', [1],'values',[0 1]);
                                 if(md.thermal.isenthalpy)
-                                        md = checkfield(md,'fieldname','thermal.reltol','>',0.,'message','reltol must be larger than zero');
                                         if isnan(md.stressbalance.reltol),
                                                 md = checkmessage(md,['for a steadystate computation, stressbalance.reltol (relative convergence criterion) must be defined!']);
                                         end
+                                        md = checkfield(md,'fieldname','thermal.reltol','>',0.,'message','reltol must be larger than zero');
                                         md = checkfield(md,'fieldname','thermal.isdynamicbasalspc','numel', [1],'values',[1], 'message',['for enthalpy run thermal.isdynamicbasalspc should be 1']);
                                 end

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

@@ -18 +18 @@
                 self.penalty_threshold = 0
                 self.stabilization     = 0
+                self.reltol            = 0
                 self.maxiter           = 0
                 self.penalty_lock      = 0
@@ -34 +35 @@
                 string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: SUPG'))
                 string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of non linear iterations'))
+                string="%s\n%s"%(string,fielddisplay(self,'reltol','relative tolerance criterion'))
                 string="%s\n%s"%(string,fielddisplay(self,'penalty_lock','stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization)'))
                 string="%s\n%s"%(string,fielddisplay(self,'penalty_threshold','threshold to declare convergence of thermal solution (default is 0)'))
@@ -56 +58 @@
                 #Type of stabilization used
                 self.stabilization=1
+
+                #Relative tolerance for the enthalpy convergence
+                self.reltol=0.01
 
                 #Maximum number of iterations
@@ -89 +94 @@
                         md = checkfield(md,'fieldname','thermal.isdynamicbasalspc','numel',[1],'values',[0,1]);
                         if(md.thermal.isenthalpy):
+                                if numpy.isnan(md.stressbalance.reltol):
+                                        md.checkmessage("for a steadystate computation, stressbalance.reltol (relative convergence criterion) must be defined!")
+                                md = checkfield(md,'fieldname','thermal.reltol','>',0.,'message',"reltol must be larger than zero");
                                 md = checkfield(md,'fieldname','thermal.isdynamicbasalspc','numel', [1],'values',[1], 'message',"for enthalpy run thermal.isdynamicbasalspc should be true")
                 md = checkfield(md,'fieldname','thermal.requested_outputs','stringrow',1)
@@ -98 +106 @@
                 WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer')
                 WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
+                WriteData(fid,'object',self,'fieldname','reltol','format','Double');
                 WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
                 WriteData(fid,'object',self,'fieldname','penalty_lock','format','Integer')