Index: /issm/trunk-jpl/test/NightlyRun/python_skipped_tests.txt
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/python_skipped_tests.txt	(revision 13581)
+++ /issm/trunk-jpl/test/NightlyRun/python_skipped_tests.txt	(revision 13581)
@@ -0,0 +1,5 @@
+test216    needs TriMeshProcessRifts module in meshprocessrifts.py (skip, per Eric, 10/03/12)
+test218    needs Dakota
+test234    needs Dakota
+test235    needs Dakota
+
Index: /issm/trunk-jpl/test/NightlyRun/test101.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test101.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test101.m	(revision 13581)
@@ -1,9 +1,9 @@
-md=triangle(model,'../Exp/Square.exp',50000);
+md=triangle(model(),'../Exp/Square.exp',50000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.diagnostic.requested_outputs=StressTensorEnum;
-md=solve(md,DiagnosticSolutionEnum);
+md.diagnostic.requested_outputs=StressTensorEnum();
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test102.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test102.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test102.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test103.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test103.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test103.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -5,6 +5,6 @@
 md=setflowequation(md,'pattyn','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.diagnostic.requested_outputs=StressTensorEnum;
-md=solve(md,DiagnosticSolutionEnum);
+md.diagnostic.requested_outputs=StressTensorEnum();
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test104.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test104.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test104.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'stokes','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test105.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test105.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test105.m	(revision 13581)
@@ -1,8 +1,8 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,PrognosticSolutionEnum);
+md=solve(md,PrognosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test106.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test106.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test106.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=meshconvert(md);
 md=setmask(md,'all','');
@@ -7,5 +7,5 @@
 md.prognostic.stabilization=3;
 md.prognostic.spcthickness=md.geometry.thickness;
-md=solve(md,PrognosticSolutionEnum);
+md=solve(md,PrognosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test107.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test107.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test107.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -5,5 +5,5 @@
 md=extrude(md,5,3);
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,PrognosticSolutionEnum);
+md=solve(md,PrognosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test108.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test108.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test108.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -6,5 +6,5 @@
 md.timestepping.time_step=0;
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,ThermalSolutionEnum);
+md=solve(md,ThermalSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test109.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test109.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test109.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -9,5 +9,5 @@
 md.transient.isthermal=1;
 md.transient.isgroundingline=0;
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test110.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test110.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test110.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -6,5 +6,5 @@
 md.transient.requested_outputs=IceVolumeEnum();
 
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test111.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test111.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test111.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -6,5 +6,5 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.transient.requested_outputs=IceVolumeEnum();
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test112.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test112.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test112.m	(revision 13581)
@@ -1,8 +1,8 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,SurfaceSlopeSolutionEnum);
+md=solve(md,SurfaceSlopeSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test113.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test113.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test113.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,SurfaceSlopeSolutionEnum);
+md=solve(md,SurfaceSlopeSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test114.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test114.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test114.m	(revision 13581)
@@ -1,8 +1,8 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,BedSlopeSolutionEnum);
+md=solve(md,BedSlopeSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test115.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test115.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test115.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,BedSlopeSolutionEnum);
+md=solve(md,BedSlopeSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test116.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test116.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test116.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -7,5 +7,5 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,BalancethicknessSolutionEnum);
+md=solve(md,BalancethicknessSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test117.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test117.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test117.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -8,5 +8,5 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,BalancethicknessSolutionEnum);
+md=solve(md,BalancethicknessSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test118.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test118.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test118.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=meshconvert(md);
 md=setmask(md,'all','');
@@ -7,5 +7,5 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,BalancethicknessSolutionEnum);
+md=solve(md,BalancethicknessSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test119.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test119.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test119.m	(revision 13581)
@@ -1,10 +1,10 @@
 
 %Simple mesh
-md=bamg(model,'domain','../Exp/Square.exp','hmax',100000.);
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',100000.);
 x1=md.mesh.x;
 y1=md.mesh.y;
 
 %hVertices
-md=bamg(model,'domain','../Exp/Square.exp','hmax',300000.,'hVertices',[10000. 100000. 400000. 100000.]');
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',[10000. 100000. 400000. 100000.]');
 x2=md.mesh.x;
 y2=md.mesh.y;
@@ -12,5 +12,5 @@
 %big mesh
 t0=clock;
-md=bamg(model,'domain','../Exp/Square.exp','hmax',3000.);
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',3000.);
 nbelements=md.mesh.numberofelements;
 elapsedtime=etime(clock,t0);
Index: /issm/trunk-jpl/test/NightlyRun/test120.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test120.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test120.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -7,5 +7,5 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1);
-md=solve(md,EnthalpySolutionEnum);
+md=solve(md,EnthalpySolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test121.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test121.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test121.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -11,5 +11,5 @@
 md.transient.isgroundingline=0;
 md.thermal.isenthalpy=1;
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test122.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test122.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test122.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
@@ -8,10 +8,10 @@
 md.thermal.stabilization=2;
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1', ...
-				      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ...
-					   'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'};
+	'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ...
+	'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'};
 field_tolerances={...
 	1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
Index: /issm/trunk-jpl/test/NightlyRun/test122.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test122.py	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test122.py	(revision 13581)
@@ -21,6 +21,6 @@
 #Fields and tolerances to track changes
 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1',\
-				      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2',\
-					   'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3']
+	'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2',\
+	'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3']
 field_tolerances=[\
 	1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\
Index: /issm/trunk-jpl/test/NightlyRun/test201.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test201.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test201.m	(revision 13581)
@@ -1,8 +1,8 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test202.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test202.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test202.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test203.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test203.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test203.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'pattyn','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test204.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test204.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test204.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'stokes','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test205.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test205.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test205.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal','coupling','penalties');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test206.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test206.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test206.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -6,5 +6,5 @@
 md.timestepping.time_step=0;
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,ThermalSolutionEnum);
+md=solve(md,ThermalSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test207.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test207.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test207.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -9,5 +9,5 @@
 md.transient.isthermal=1;
 md.transient.isgroundingline=0;
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test208.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test208.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test208.m	(revision 13581)
@@ -1,8 +1,8 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test209.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test209.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test209.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,10 +5,10 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
-				      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
-					   'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
+	'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
+	'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
 field_tolerances={...
 	1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,...
Index: /issm/trunk-jpl/test/NightlyRun/test209.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test209.py	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test209.py	(revision 13581)
@@ -33,6 +33,6 @@
 
 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
-				      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
-					   'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
+	'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
+	'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
 field_tolerances=[\
 	1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\
Index: /issm/trunk-jpl/test/NightlyRun/test210.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test210.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test210.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'pattyn','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test211.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test211.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test211.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -6,5 +6,5 @@
 md.diagnostic.reltol=NaN;
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test212.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test212.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test212.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -18,5 +18,5 @@
 
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test213.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test213.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test213.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -19,5 +19,5 @@
 
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test214.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test214.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test214.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -19,5 +19,5 @@
 
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test215.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test215.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test215.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -19,5 +19,5 @@
 
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test216.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test216.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test216.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
+md=triangle(model(),'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
 md=meshprocessrifts(md,'../Exp/Square.exp');
 md=setmask(md,'all','');
@@ -12,5 +12,5 @@
 md.diagnostic.rift_penalty_threshold=0;
 md.rifts.riftstruct.fractionincrement=.1;
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test217.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test217.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test217.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -58,5 +58,5 @@
 md.diagnostic.icefront=diagnostic.icefront;
 
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %create analytical solution: strain rate is constant = ((rho_ice*g*h)/4B)^3 (Paterson, 4th Edition, page 292.
Index: /issm/trunk-jpl/test/NightlyRun/test218.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test218.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test218.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=squaremesh(model,1000000,1000000,5,5);
+md=squaremesh(model(),1000000,1000000,5,5);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -81,5 +81,5 @@
 
 %solve
-md=solve(md,DiagnosticSolutionEnum,'overwrite','y');
+md=solve(md,DiagnosticSolutionEnum(),'overwrite','y');
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test219.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test219.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test219.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test220.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test220.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test220.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',120000);
+md=triangle(model(),'../Exp/Square.exp',120000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,5 +5,5 @@
 md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test221.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test221.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test221.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',120000);
+md=triangle(model(),'../Exp/Square.exp',120000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -6,5 +6,5 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.diagnostic.viscosity_overshoot=0;
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test222.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test222.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test222.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -5,5 +5,5 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.prognostic.hydrostatic_adjustment='Incremental';
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test223.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test223.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test223.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -6,5 +6,5 @@
 md.cluster=generic('name',oshostname(),'np',1);
 md.prognostic.hydrostatic_adjustment='Incremental';
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test224.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test224.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test224.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -6,5 +6,5 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.prognostic.hydrostatic_adjustment='Incremental';
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test225.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test225.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test225.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -7,5 +7,5 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.prognostic.hydrostatic_adjustment='Incremental';
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test226.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test226.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test226.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -6,5 +6,5 @@
 md.timestepping.time_adapt=1.;
 md.timestepping.final_time=10.;
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test227.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test227.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test227.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',200000);
+md=triangle(model(),'../Exp/Square.exp',200000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -7,5 +7,5 @@
 md.timestepping.time_adapt=1.;
 md.timestepping.final_time=10.;
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test228.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test228.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test228.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -17,5 +17,5 @@
 md.transient.isthermal=0;
 
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test229.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test229.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test229.m	(revision 13581)
@@ -1,3 +1,3 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
@@ -17,5 +17,5 @@
 md.transient.isthermal=0;
 
-md=solve(md,TransientSolutionEnum);
+md=solve(md,TransientSolutionEnum());
 
 %Fields and tolerances to track changes
Index: /issm/trunk-jpl/test/NightlyRun/test514.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test514.m	(revision 13580)
+++ /issm/trunk-jpl/test/NightlyRun/test514.m	(revision 13581)
@@ -2,10 +2,10 @@
 hVertices=10000.*ones(27,1);
 hVertices(1:5)=1000.;
-md=bamg(model,'domain','../Exp/Pig.exp','hmax',20000.,'hVertices',hVertices,'gradation',3.,'geometricalmetric',1);
+md=bamg(model(),'domain','../Exp/Pig.exp','hmax',20000.,'hVertices',hVertices,'gradation',3.,'geometricalmetric',1);
 x1=md.mesh.x;
 y1=md.mesh.y;
 
 %Simple mesh 2
-md=bamg(model,'domain','../Exp/Pig.exp','hmax',10000.);
+md=bamg(model(),'domain','../Exp/Pig.exp','hmax',10000.);
 md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
 md=parameterize(md,'../Par/Pig.par');