Index: /issm/trunk/test/NightlyRun/test223.m
===================================================================
--- /issm/trunk/test/NightlyRun/test223.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test223.m	(revision 5355)
@@ -6,5 +6,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -21,10 +21,10 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
 	PatchToVec(md.results.DiagnosticSolution.Gradient),...
 	md.results.DiagnosticSolution.J,...
-	PatchToVec(md.results.DiagnosticSolution.RheologyB2d),...
+	PatchToVec(md.results.DiagnosticSolution.RheologyBbar),...
 	PatchToVec(md.results.DiagnosticSolution.Pressure),...
 	PatchToVec(md.results.DiagnosticSolution.Vel),...
Index: /issm/trunk/test/NightlyRun/test224.m
===================================================================
--- /issm/trunk/test/NightlyRun/test224.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test224.m	(revision 5355)
@@ -6,5 +6,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -21,10 +21,10 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
 	PatchToVec(md.results.DiagnosticSolution.Gradient),...
 	md.results.DiagnosticSolution.J,...
-	PatchToVec(md.results.DiagnosticSolution.RheologyB2d),...
+	PatchToVec(md.results.DiagnosticSolution.RheologyBbar),...
 	PatchToVec(md.results.DiagnosticSolution.Pressure),...
 	PatchToVec(md.results.DiagnosticSolution.Vel),...
Index: /issm/trunk/test/NightlyRun/test225.m
===================================================================
--- /issm/trunk/test/NightlyRun/test225.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test225.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22,5 +22,5 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
Index: /issm/trunk/test/NightlyRun/test226.m
===================================================================
--- /issm/trunk/test/NightlyRun/test226.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test226.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22,5 +22,5 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
Index: /issm/trunk/test/NightlyRun/test227.m
===================================================================
--- /issm/trunk/test/NightlyRun/test227.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test227.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22,5 +22,5 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
 field_values={...
Index: /issm/trunk/test/NightlyRun/test228.m
===================================================================
--- /issm/trunk/test/NightlyRun/test228.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test228.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22,5 +22,5 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08};
 field_values={...
Index: /issm/trunk/test/NightlyRun/test229.m
===================================================================
--- /issm/trunk/test/NightlyRun/test229.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test229.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22,5 +22,5 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
 field_values={...
Index: /issm/trunk/test/NightlyRun/test230.m
===================================================================
--- /issm/trunk/test/NightlyRun/test230.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test230.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22,5 +22,5 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
 field_values={...
Index: /issm/trunk/test/NightlyRun/test235.m
===================================================================
--- /issm/trunk/test/NightlyRun/test235.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test235.m	(revision 5355)
@@ -61,5 +61,5 @@
 %Dakota options
 %variables
-md.variables.rheology_B=normal_uncertain('RheologyB2d',1,.5);
+md.variables.rheology_B=normal_uncertain('RheologyBbar',1,.5);
 
 %responses
@@ -85,5 +85,5 @@
 %Fields and tolerances to track changes
 md=tres(md,'dakota');
-md.results.dakota.importancefactors=importancefactors(md,'RheologyB2d','MaxVel')';
+md.results.dakota.importancefactors=importancefactors(md,'RheologyBbar','MaxVel')';
 field_names     ={'importancefactors'};
 field_tolerances={1e-11};
Index: /issm/trunk/test/NightlyRun/test236.m
===================================================================
--- /issm/trunk/test/NightlyRun/test236.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test236.m	(revision 5355)
@@ -61,5 +61,5 @@
 %Dakota options
 %variables
-md.variables.rheology_B=normal_uncertain('RheologyB2d',1,.5);
+md.variables.rheology_B=normal_uncertain('RheologyBbar',1,.5);
 
 %responses
@@ -85,5 +85,5 @@
 %Fields and tolerances to track changes
 md=tres(md,'dakota');
-md.results.dakota.importancefactors=importancefactors(md,'RheologyB2d','MaxVel')';
+md.results.dakota.importancefactors=importancefactors(md,'RheologyBbar','MaxVel')';
 field_names     ={'importancefactors'};
 field_tolerances={1e-13};
Index: /issm/trunk/test/NightlyRun/test337.m
===================================================================
--- /issm/trunk/test/NightlyRun/test337.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test337.m	(revision 5355)
@@ -6,5 +6,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test338.m
===================================================================
--- /issm/trunk/test/NightlyRun/test338.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test338.m	(revision 5355)
@@ -6,5 +6,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test339.m
===================================================================
--- /issm/trunk/test/NightlyRun/test339.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test339.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test340.m
===================================================================
--- /issm/trunk/test/NightlyRun/test340.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test340.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test341.m
===================================================================
--- /issm/trunk/test/NightlyRun/test341.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test341.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test342.m
===================================================================
--- /issm/trunk/test/NightlyRun/test342.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test342.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test343.m
===================================================================
--- /issm/trunk/test/NightlyRun/test343.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test343.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test344.m
===================================================================
--- /issm/trunk/test/NightlyRun/test344.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test344.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test429.m
===================================================================
--- /issm/trunk/test/NightlyRun/test429.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test429.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test430.m
===================================================================
--- /issm/trunk/test/NightlyRun/test430.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test430.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test431.m
===================================================================
--- /issm/trunk/test/NightlyRun/test431.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test431.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test432.m
===================================================================
--- /issm/trunk/test/NightlyRun/test432.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test432.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test521.m
===================================================================
--- /issm/trunk/test/NightlyRun/test521.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test521.m	(revision 5355)
@@ -12,5 +12,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
Index: /issm/trunk/test/NightlyRun/test522.m
===================================================================
--- /issm/trunk/test/NightlyRun/test522.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test522.m	(revision 5355)
@@ -12,5 +12,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
Index: /issm/trunk/test/NightlyRun/test523.m
===================================================================
--- /issm/trunk/test/NightlyRun/test523.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test523.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test524.m
===================================================================
--- /issm/trunk/test/NightlyRun/test524.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test524.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test525.m
===================================================================
--- /issm/trunk/test/NightlyRun/test525.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test525.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;
Index: /issm/trunk/test/NightlyRun/test526.m
===================================================================
--- /issm/trunk/test/NightlyRun/test526.m	(revision 5354)
+++ /issm/trunk/test/NightlyRun/test526.m	(revision 5355)
@@ -7,5 +7,5 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;