Index: /issm/trunk-jpl/test/NightlyRun/test270.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test270.m	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test270.m	(revision 17764)
@@ -2,5 +2,7 @@
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
+md.damage.isdamage=1;
 md.damage.D=0.5*ones(md.mesh.numberofvertices,1);
+md.damage.spcdamage=NaN*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
Index: /issm/trunk-jpl/test/NightlyRun/test270.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test270.py	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test270.py	(revision 17764)
@@ -1,17 +1,21 @@
 import numpy
-from model import *
-from triangle import *
-from setmask import *
-from parameterize import *
-from paterson import *
-from setflowequation import *
-from EnumDefinitions import *
-from solve import *
-from MatlabFuncs import *
+from model import model
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from EnumDefinitions import StressbalanceSolutionEnum
+from solve import solve
+from matdamageice import matdamageice
+from generic import generic
+from socket import gethostname as oshostname
 
 md=triangle(model(),'../Exp/Square.exp',150000.)
 md=setmask(md,'all','')
+md.materials=matdamageice()
 md=parameterize(md,'../Par/SquareShelf.py')
-md.damage.D=0.5*numpy.ones((md.mesh.numberofvertices,1))
+md.damage.isdamage=1
+md.damage.D=0.5*numpy.ones(md.mesh.numberofvertices)
+md.damage.spcdamage=numpy.nan*numpy.ones(md.mesh.numberofvertices)
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
Index: /issm/trunk-jpl/test/NightlyRun/test271.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test271.m	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test271.m	(revision 17764)
@@ -1,5 +1,7 @@
 md=triangle(model(),'../Exp/Square.exp',150000.);
 md=setmask(md,'all','');
+md.materials=matdamageice();
 md=parameterize(md,'../Par/SquareShelf.par');
+md.damage.isdamage=1;
 md.damage.D=zeros(md.mesh.numberofvertices,1);
 md.damage.spcdamage=NaN*ones(md.mesh.numberofvertices,1);
Index: /issm/trunk-jpl/test/NightlyRun/test271.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test271.py	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test271.py	(revision 17764)
@@ -1,3 +1,3 @@
-import numpy as npy
+import numpy 
 from triangle import triangle
 from model import model
@@ -10,14 +10,17 @@
 from solve import solve
 from EnumDefinitions import DamageEvolutionSolutionEnum
+from matdamageice import matdamageice
 
 md=triangle(model(),'../Exp/Square.exp',150000.)
 md=setmask(md,'all','')
+md.materials=matdamageice()
 md=parameterize(md,'../Par/SquareShelf.py')
-md.damage.D=npy.zeros((md.mesh.numberofvertices,1))
-md.damage.spcdamage=npy.float('nan')*npy.ones((md.mesh.numberofvertices,1))
+md.damage.isdamage=1
+md.damage.D=numpy.zeros(md.mesh.numberofvertices)
+md.damage.spcdamage=numpy.nan*numpy.ones(md.mesh.numberofvertices)
 md.damage.law='pralong'
 md.damage.stabilization=1;
 
-pos=npy.nonzero(npy.logical_and(md.mask.ice_levelset[:,0]!=0,md.mesh.vertexonboundary==1))
+pos=numpy.nonzero(numpy.logical_and(md.mask.ice_levelset[:,0]!=0,md.mesh.vertexonboundary==1))
 md.damage.spcdamage[pos]=0.5;
 
Index: /issm/trunk-jpl/test/NightlyRun/test272.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test272.m	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test272.m	(revision 17764)
@@ -1,6 +1,9 @@
 md=triangle(model(),'../Exp/Square.exp',150000.);
 md=setmask(md,'all','');
+md.materials=matdamageice();
 md=parameterize(md,'../Par/SquareShelf.par');
+md.damage.isdamage=1;
 md.damage.D=0.5*ones(md.mesh.numberofvertices,1);
+md.damage.spcdamage=NaN*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'SSA','all');
 md.verbose=verbose('control',true);
Index: /issm/trunk-jpl/test/NightlyRun/test272.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test272.py	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test272.py	(revision 17764)
@@ -1,17 +1,20 @@
 import numpy
-from model import *
-from triangle import *
-from setmask import *
-from parameterize import *
-from paterson import *
-from setflowequation import *
-from EnumDefinitions import *
-from solve import *
-from MatlabFuncs import *
+from model import model
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from EnumDefinitions import StressbalanceSolutionEnum
+from solve import solve
+from socket import gethostname as oshostname
+from matdamageice import matdamageice
 
 md=triangle(model(),'../Exp/Square.exp',150000.)
 md=setmask(md,'all','')
+md.materials=matdamageice()
 md=parameterize(md,'../Par/SquareShelf.py')
-md.damage.D=0.5*numpy.ones((md.mesh.numberofvertices,1))
+md.damage.isdamage=1
+md.damage.D=0.5*numpy.ones(md.mesh.numberofvertices)
+md.damage.spcdamage=numpy.nan*numpy.ones(md.mesh.numberofvertices)
 md=setflowequation(md,'SSA','all')
 
Index: /issm/trunk-jpl/test/NightlyRun/test274.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test274.m	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test274.m	(revision 17764)
@@ -2,6 +2,9 @@
 md=meshprocessrifts(md,'../Exp/Square.exp');
 md=setmask(md,'all','');
+md.materials=matdamageice();
 md=parameterize(md,'../Par/SquareShelf2.par');
+md.damage.isdamage=1;
 md.damage.D=0.5*ones(md.mesh.numberofvertices,1);
+md.damage.spcdamage=NaN*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'SSA','all');
 
Index: /issm/trunk-jpl/test/NightlyRun/test274.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test274.py	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test274.py	(revision 17764)
@@ -1,19 +1,22 @@
 import numpy
-from model import *
-from triangle import *
-from meshprocessrifts import *
-from setmask import *
-from parameterize import *
-from paterson import *
-from setflowequation import *
-from EnumDefinitions import *
-from solve import *
-from MatlabFuncs import *
+from model import model
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from EnumDefinitions import StressbalanceSolutionEnum
+from solve import solve
+from socket import gethostname as oshostname
+from matdamageice import matdamageice
+from meshprocessrifts import meshprocessrifts
 
 md=triangle(model(),'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000.)
 md=meshprocessrifts(md,'../Exp/Square.exp')
 md=setmask(md,'all','')
+md.materials=matdamageice()
 md=parameterize(md,'../Par/SquareShelf2.py')
-md.damage.D=0.5*numpy.ones((md.mesh.numberofvertices,1))
+md.damage.isdamage=1
+md.damage.D=0.5*numpy.ones(md.mesh.numberofvertices)
+md.damage.spcdamage=numpy.nan*numpy.ones(md.mesh.numberofvertices)
 md=setflowequation(md,'SSA','all')
 
Index: /issm/trunk-jpl/test/NightlyRun/test275.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test275.m	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test275.m	(revision 17764)
@@ -1,5 +1,7 @@
 md=triangle(model(),'../Exp/Square.exp',150000.);
 md=setmask(md,'all','');
+md.materials=matdamageice();
 md=parameterize(md,'../Par/SquareShelf.par');
+md.damage.isdamage=1;
 md.damage.D=0.1*ones(md.mesh.numberofvertices,1);
 md.damage.spcdamage=NaN*ones(md.mesh.numberofvertices,1);
Index: /issm/trunk-jpl/test/NightlyRun/test275.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test275.py	(revision 17763)
+++ /issm/trunk-jpl/test/NightlyRun/test275.py	(revision 17764)
@@ -1,3 +1,3 @@
-import numpy as npy
+import numpy
 from triangle import triangle
 from model import model
@@ -13,7 +13,9 @@
 md=triangle(model(),'../Exp/Square.exp',150000.)
 md=setmask(md,'all','')
+md.materials=matdamageice()
 md=parameterize(md,'../Par/SquareShelf.py')
-md.damage.D=0.1*npy.ones((md.mesh.numberofvertices,1))
-md.damage.spcdamage=npy.float('nan')*npy.ones((md.mesh.numberofvertices,1))
+md.damage.isdamage=1
+md.damage.D=0.1*numpy.ones(md.mesh.numberofvertices)
+md.damage.spcdamage=numpy.nan*numpy.ones(md.mesh.numberofvertices)
 md.damage.law='pralong'