Changeset 18278

Timestamp:

07/21/14 17:43:57 (11 years ago)

Author:

cborstad

Message:

CHG: display and marshall all damage params if isdamage=1, since now damage can be calculated from a Stressbalance

File:

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

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

@@ -63 +63 @@
                         s+="%s\n" % fielddisplay(self,"penalty_threshold","threshold to declare convergence of damage evolution solution (default is 0)")
                         s+="%s\n" % fielddisplay(self,"penalty_factor","scaling exponent (default is 3)")
-
-                if self.law== 1 or self.law == 2:
                         s+="%s\n" % fielddisplay(self,"c1","damage parameter 1 ")
                         s+="%s\n" % fielddisplay(self,"c2","damage parameter 2 ")
@@ -132 +130 @@
                         md = checkfield(md,'fieldname','damage.D','>=',0,'<=',self.max_damage,'size',[md.mesh.numberofvertices])
                         md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0)
-                        md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2])
+                        md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2,3])
                         md = checkfield(md,'fieldname','damage.spcdamage','forcing',1)
                         md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2])
@@ -140 +138 @@
                         md = checkfield(md,'fieldname','damage.penalty_lock','>=0',0)
                         md = checkfield(md,'fieldname','damage.penalty_threshold','>=0',0)
-
-                if self.law == 1 or self.law == 2:
                         md = checkfield(md,'fieldname','damage.healing','>=',0)
                         md = checkfield(md,'fieldname','damage.c1','>=',0)
@@ -171 +167 @@
                         WriteData(fid,'object',self,'fieldname','penalty_lock','format','Integer')
                         WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double')
-
-                if self.law==1 or self.law==2:
                         WriteData(fid,'object',self,'fieldname','c1','format','Double')
                         WriteData(fid,'object',self,'fieldname','c2','format','Double')