Index: sm/trunk-jpl/test/NightlyRun/InNeedOfDebugging/test216.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/InNeedOfDebugging/test216.py	(revision 13710)
+++ 	(revision )
@@ -1,50 +1,0 @@
-"""
-== == == == == == == == == == == == == == == == == == ==
-Auto generated python script for ISSM:   test216.m
-Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
-== == == == == == == == == == == == == == == == == == ==
-
-Matlab script conversion into python
-translateToPy.py Author: Michael Pellegrin
-translateToPy.py Date: 09/24/12
-== == == == == == == == == == == == == == == == == == ==
-"""
-
-from MatlabFuncs import *
-from model import *
-from EnumDefinitions import *
-from numpy import *
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
-
-md=triangle(model(),'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000)
-md=meshprocessrifts(md,'../Exp/Square.exp')
-md=setmask(md,'all','')
-md=parameterize(md,'../Par/SquareShelf.py')
-md=setflowequation(md,'macayeal','all')
-md.cluster=generic('name',oshostname(),'np',3)
-
-
-# rift settings
-
-md.rifts.riftstruct.fill=MelangeEnum()
-md.rifts.riftstruct.fraction=0
-md.diagnostic.rift_penalty_lock=2
-md.diagnostic.rift_penalty_threshold=0
-md.rifts.riftstruct.fractionincrement=.1
-md=solve(md,DiagnosticSolutionEnum())
-
-
-# Fields and tolerances to track changes
-
-field_names     =['Vx','Vy','Vel','Pressure']
-field_tolerances=[1e-11,1e-11,1e-11,1e-11]
-field_values=[\
-	md.results['DiagnosticSolution'][1]['Vx'],\
-	md.results['DiagnosticSolution'][1]['Vy'],\
-	md.results['DiagnosticSolution'][1]['Vel'],\
-	md.results['DiagnosticSolution'][1]['Pressure'],\
-	]
Index: /issm/trunk-jpl/test/NightlyRun/test216.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test216.py	(revision 13711)
+++ /issm/trunk-jpl/test/NightlyRun/test216.py	(revision 13711)
@@ -0,0 +1,49 @@
+"""
+== == == == == == == == == == == == == == == == == == ==
+Auto generated python script for ISSM:   test216.m
+Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
+== == == == == == == == == == == == == == == == == == ==
+
+Matlab script conversion into python
+translateToPy.py Author: Michael Pellegrin
+translateToPy.py Date: 09/24/12
+== == == == == == == == == == == == == == == == == == ==
+"""
+
+from MatlabFuncs import *
+from model import *
+from EnumDefinitions import *
+from numpy import *
+from triangle import *
+from meshprocessrifts import *
+from setmask import *
+from parameterize import *
+from setflowequation import *
+from solve import *
+
+md=triangle(model(),'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000.)
+md=meshprocessrifts(md,'../Exp/Square.exp')
+md=setmask(md,'all','')
+md=parameterize(md,'../Par/SquareShelf.py')
+md=setflowequation(md,'macayeal','all')
+md.cluster=generic('name',oshostname(),'np',3)
+
+# rift settings
+
+md.rifts.riftstruct[0]['fill']=MelangeEnum()
+md.rifts.riftstruct[0]['fraction']=0
+md.diagnostic.rift_penalty_lock=2
+md.diagnostic.rift_penalty_threshold=0
+md.rifts.riftstruct[0]['fractionincrement']=0.1
+md=solve(md,DiagnosticSolutionEnum())
+
+# Fields and tolerances to track changes
+
+field_names     =['Vx','Vy','Vel','Pressure']
+field_tolerances=[1e-11,1e-11,1e-11,1e-11]
+field_values=[\
+	md.results['DiagnosticSolution'][1]['Vx'],\
+	md.results['DiagnosticSolution'][1]['Vy'],\
+	md.results['DiagnosticSolution'][1]['Vel'],\
+	md.results['DiagnosticSolution'][1]['Pressure'],\
+	]
Index: /issm/trunk-jpl/test/NightlyRun/test274.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test274.py	(revision 13711)
+++ /issm/trunk-jpl/test/NightlyRun/test274.py	(revision 13711)
@@ -0,0 +1,35 @@
+import numpy
+from model import *
+from triangle import *
+from meshprocessrifts import *
+from setmask import *
+from parameterize import *
+from matdamageice import *
+from paterson import *
+from setflowequation import *
+from EnumDefinitions import *
+from solve import *
+from MatlabFuncs import *
+
+md=triangle(model(),'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000.)
+md=meshprocessrifts(md,'../Exp/Square.exp')
+md=setmask(md,'all','')
+md=parameterize(md,'../Par/SquareShelf.py')
+md.materials=matdamageice()
+md.materials.rheology_B=paterson(md.initialization.temperature)
+md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
+md.materials.rheology_Z=0.5*numpy.ones((md.mesh.numberofvertices,1))
+md=setflowequation(md,'macayeal','all')
+
+md.cluster=generic('name',oshostname(),'np',3)
+md=solve(md,DiagnosticSolutionEnum())
+
+#Fields and tolerances to track changes
+field_names     =['Vx','Vy','Vel','Pressure']
+field_tolerances=[1e-11,1e-11,1e-11,1e-11]
+field_values=[\
+	   md.results['DiagnosticSolution'][1]['Vx'],\
+	   md.results['DiagnosticSolution'][1]['Vy'],\
+	   md.results['DiagnosticSolution'][1]['Vel'],\
+	   md.results['DiagnosticSolution'][1]['Pressure'],\
+	   ]