Changeset 16162 for issm/trunk-jpl/src/m/classes/model/model.py

Timestamp:

09/17/13 18:44:22 (12 years ago)

Author:

cborstad

Message:

CHG: working toward damage class implementation. As long as md.damage.isdamage flag is set to zero, all NR should ignore damage and run okay

File:

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

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

@@ -10 +10 @@
 from basalforcings import basalforcings
 from matice import matice
+from damage import damage
 from friction import friction
 from flowequation import flowequation
@@ -58 +59 @@
                 self.basalforcings    = basalforcings()
                 self.materials        = matice()
+                self.damage           = damage()
                 self.friction         = friction()
                 self.flowequation     = flowequation()
@@ -99 +101 @@
                         'basalforcings',\
                         'materials',\
+                        'damage',\
                         'friction',\
                         'flowequation',\
@@ -136 +139 @@
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("basalforcings","[%s,%s]" % ("1x1",obj.basalforcings.__class__.__name__),"bed forcings"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("materials","[%s,%s]" % ("1x1",obj.materials.__class__.__name__),"material properties"))
+                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("damage","[%s,%s]" % ("1x1",obj.damage.__class__.__name__),"damage propagation laws"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("friction","[%s,%s]" % ("1x1",obj.friction.__class__.__name__),"basal friction/drag properties"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("flowequation","[%s,%s]" % ("1x1",obj.flowequation.__class__.__name__),"flow equations"))
@@ -627 +631 @@
                 md.materials.rheology_n=project3d(md,'vector',md.materials.rheology_n,'type','element')
 
+                #damage
+                md.damage.D=project3d(md,'vector',md.damage.D,'type','node')
                 #parameters
                 md.geometry.surface=project3d(md,'vector',md.geometry.surface,'type','node')