Changeset 17817

Timestamp:

04/22/14 19:34:18 (11 years ago)

Author:

cborstad

Message:

CHG: damage model initialization

File:

• issm/trunk-jpl/src/m/classes/damage.py (modified) (4 diffs)

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

@@ -24 +24 @@
                 
                 #numerical
-                stabilization                           = float('NaN')
-                maxiter                                         = float('NaN')
-                elementinterp           = ''
-                penalty_threshold                       = float('NaN')
-                penalty_lock                            = float('NaN')
-                penalty_factor                          = float('NaN')
+                self.stabilization              = float('NaN')
+                self.maxiter                            = float('NaN')
+                self.elementinterp      = ''
+                self.penalty_threshold  = float('NaN')
+                self.penalty_lock                       = float('NaN')
+                self.penalty_factor             = float('NaN')
 
                 #general parameters for evolution law: 
@@ -59 +59 @@
                         s+="%s\n" % fielddisplay(self,"stabilization","0: no, 1: artificial_diffusivity, 2: SUPG")
                         s+="%s\n" % fielddisplay(self,"maxiter","maximum number of non linear iterations")
-                        s+="%s\n" %     fielddisplay(self,"elementinterp","interpolation scheme for finite elements {''P1'',''P2''}")
+                        s+="%s\n" %     fielddisplay(self,"elementinterp","interpolation scheme for finite elements [''P1'',''P2'']")
                         s+="%s\n" % fielddisplay(self,"penalty_lock","stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization)")
                         s+="%s\n" % fielddisplay(self,"penalty_threshold","threshold to declare convergence of damage evolution solution (default is 0)")
@@ -134 +134 @@
                         md = checkfield(md,'fieldname','damage.law','values',['undamaged','pralong'])
                         md = checkfield(md,'fieldname','damage.spcdamage','forcing',1)
-                                
                         md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2])
                         md = checkfield(md,'fieldname','damage.maxiter','>=0',0)
@@ -166 +165 @@
                         WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
                         WriteData(fid,'object',self,'fieldname','max_damage','format','Double')
-
                         WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
                         WriteData(fid,'object',self,'fieldname','elementinterp','format','String')