Index: /issm/trunk/test/NightlyRun/test231.m
===================================================================
--- /issm/trunk/test/NightlyRun/test231.m	(revision 5192)
+++ /issm/trunk/test/NightlyRun/test231.m	(revision 5193)
@@ -7,6 +7,6 @@
 
 %solver, to handle penalties
-md=solversettoasm(md);
-%md=solversettomumps(md);
+%md=solversettoasm(md);
+md=solversettomumps(md);
 
 %rift settings
Index: /issm/trunk/test/NightlyRun/test232.m
===================================================================
--- /issm/trunk/test/NightlyRun/test232.m	(revision 5192)
+++ /issm/trunk/test/NightlyRun/test232.m	(revision 5193)
@@ -5,5 +5,5 @@
 md=setelementstype(md,'macayeal','all');
 md.cluster=oshostname();
-md.np=1
+md.np=2
 
 %solver, to handle penalties
@@ -14,7 +14,7 @@
 md.rifts.fill=MelangeEnum();
 md.rifts.fraction=0;
-md.penalty_lock=2;
+md.penalty_lock=10;
+md.min_mechanical_constraints=0;
 md.rifts.fractionincrement=.1;
-
 md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 
Index: /issm/trunk/test/NightlyRun/test423.m
===================================================================
--- /issm/trunk/test/NightlyRun/test423.m	(revision 5192)
+++ /issm/trunk/test/NightlyRun/test423.m	(revision 5193)
@@ -6,14 +6,15 @@
 
 %Dakota options
-md.variables.nuv=normal_uncertain.empty();
-md.variables.nuv(end+1)=normal_uncertain('RhoIce',md.rho_ice,0.01);
-md.variables.nuv(end+1)=normal_uncertain('DragCoefficient',1,0.01);
+%variables
+md.variables.rho_ice=normal_uncertain('RhoIce',md.rho_ice,0.01);
+md.variables.drag_coefficient=normal_uncertain('DragCoefficient',1,0.01);
 
-md.responses=struct();
-md.responses.rf =response_function.empty();
-md.responses.rf (end+1)=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+%responses
+md.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
 
+%method
 md.qmu_method     =dakota_method('nond_l');
 
+%parameters
 md.qmu_params.direct=true;
 md.qmu_params.analysis_driver='diagnostic';
@@ -22,4 +23,5 @@
 md.qmu_params.tabular_graphics_data=true;
 
+%partitioning
 md.part=0:1:md.numberofgrids-1;
 md.part=md.part';
@@ -27,6 +29,8 @@
 md.qmu_analysis=1;
 
+%imperative! 
 md.eps_rel=10^-5; %tighten for qmu analysese
 
+%solve
 md=solve(md,'analysis_type',DiagnosticSolutionEnum,'overwrite','y');
 
Index: /issm/trunk/test/NightlyRun/test424.m
===================================================================
--- /issm/trunk/test/NightlyRun/test424.m	(revision 5192)
+++ /issm/trunk/test/NightlyRun/test424.m	(revision 5193)
@@ -6,14 +6,15 @@
 
 %Dakota options
-md.variables.nuv=normal_uncertain.empty();
-md.variables.nuv(end+1)=normal_uncertain('RhoIce',md.rho_ice,0.01);
-md.variables.nuv(end+1)=normal_uncertain('DragCoefficient',1,0.01);
+%variables
+md.variables.rho_ice=normal_uncertain('RhoIce',md.rho_ice,0.01);
+md.variables.drag_coefficient=normal_uncertain('DragCoefficient',1,0.01);
 
-md.responses=struct();
-md.responses.rf =response_function.empty();
-md.responses.rf (end+1)=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+%responses
+md.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
 
+%method
 md.qmu_method     =dakota_method('nond_l');
 
+%parameters
 md.qmu_params.direct=true;
 md.qmu_params.analysis_driver='diagnostic';
@@ -22,4 +23,5 @@
 md.qmu_params.tabular_graphics_data=true;
 
+%partitioning
 md.part=0:1:md.numberofgrids-1;
 md.part=md.part';
@@ -27,6 +29,8 @@
 md.qmu_analysis=1;
 
+%imperative! 
 md.eps_rel=10^-5; %tighten for qmu analysese
 
+%solve
 md=solve(md,'analysis_type',DiagnosticSolutionEnum,'overwrite','y');
 
Index: /issm/trunk/test/NightlyRun/test425.m
===================================================================
--- /issm/trunk/test/NightlyRun/test425.m	(revision 5192)
+++ /issm/trunk/test/NightlyRun/test425.m	(revision 5193)
@@ -6,14 +6,21 @@
 
 %Dakota options
-md.variables.nuv=normal_uncertain.empty();
-md.variables.nuv(end+1)=normal_uncertain('RhoIce',md.rho_ice,0.01);
-md.variables.nuv(end+1)=normal_uncertain('DragCoefficient',1,0.01);
 
-md.responses=struct();
-md.responses.rf =response_function.empty();
-md.responses.rf (end+1)=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+%partitioning
+md.npart=20;
+md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
+md.part=md.part-1;
 
+%variables
+md.variables.rho_ice=normal_uncertain('RhoIce',md.rho_ice,0.01);
+md.variables.drag_coefficient=normal_uncertain('DragCoefficient',1,0.01);
+
+%responses
+md.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+
+%method
 md.qmu_method     =dakota_method('nond_l');
 
+%parameters
 md.qmu_params.direct=true;
 md.qmu_params.analysis_driver='diagnostic';
@@ -22,12 +29,10 @@
 md.qmu_params.tabular_graphics_data=true;
 
-%partitioning
-md.npart=20;
-md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
-md.part=md.part-1;
+
+%imperative!
+md.eps_rel=10^-5; %tighten for qmu analyses
 md.qmu_analysis=1;
 
-md.eps_rel=10^-5; %tighten for qmu analyses
-
+%solve
 md=solve(md,'analysis_type',DiagnosticSolutionEnum,'overwrite','y');
 
Index: /issm/trunk/test/NightlyRun/test426.m
===================================================================
--- /issm/trunk/test/NightlyRun/test426.m	(revision 5192)
+++ /issm/trunk/test/NightlyRun/test426.m	(revision 5193)
@@ -6,14 +6,21 @@
 
 %Dakota options
-md.variables.nuv=normal_uncertain.empty();
-md.variables.nuv(end+1)=normal_uncertain('RhoIce',md.rho_ice,0.01);
-md.variables.nuv(end+1)=normal_uncertain('DragCoefficient',1,0.01);
 
-md.responses=struct();
-md.responses.rf =response_function.empty();
-md.responses.rf (end+1)=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+%partitioning
+md.npart=20;
+md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
+md.part=md.part-1;
 
+%variables
+md.variables.rho_ice=normal_uncertain('RhoIce',md.rho_ice,0.01);
+md.variables.drag_coefficient=normal_uncertain('DragCoefficient',1,0.01);
+
+%responses
+md.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+
+%method
 md.qmu_method     =dakota_method('nond_l');
 
+%parameters
 md.qmu_params.direct=true;
 md.qmu_params.analysis_driver='diagnostic';
@@ -22,12 +29,10 @@
 md.qmu_params.tabular_graphics_data=true;
 
-%partitioning
-md.npart=20;
-md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
-md.part=md.part-1;
+
+%imperative!
+md.eps_rel=10^-5; %tighten for qmu analyses
 md.qmu_analysis=1;
 
-md.eps_rel=10^-5; %tighten for qmu analyses
-
+%solve
 md=solve(md,'analysis_type',DiagnosticSolutionEnum,'overwrite','y');
 
Index: /issm/trunk/test/NightlyRun/test427.m
===================================================================
--- /issm/trunk/test/NightlyRun/test427.m	(revision 5192)
+++ /issm/trunk/test/NightlyRun/test427.m	(revision 5193)
@@ -14,16 +14,21 @@
 
 %Dakota options
-md.variables.nuv=normal_uncertain.empty();
-md.variables.nuv(end+1)=normal_uncertain('DragCoefficient',1,0.01);
 
-md.responses=struct();
-md.responses.rf =response_function.empty();
-md.responses.rf (end+1)=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+%partitioning
+md.npart=20;
+md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
+md.part=md.part-1;
+
+%variables
+md.variables.drag_coefficient=normal_uncertain('DragCoefficient',1,0.01);
+
+%responses
+md.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux1=response_function('MassFlux1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux2=response_function('MassFlux2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux3=response_function('MassFlux3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux4=response_function('MassFlux4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux5=response_function('MassFlux5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.massFlux6=response_function('MassFlux6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
 
 %mass flux profiles
@@ -31,6 +36,8 @@
 md.qmu_mass_flux_profile_directory=pwd;
 
+%method
 md.qmu_method     =dakota_method('nond_l');
 
+%parameters
 md.qmu_params.direct=true;
 md.qmu_params.analysis_driver='diagnostic';
@@ -38,17 +45,13 @@
 md.qmu_params.interval_type='forward';
 md.qmu_params.tabular_graphics_data=true;
-
-%partitioning
-md.npart=20;
-md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
-md.part=md.part-1;
 md.qmu_analysis=1;
-
 md.eps_rel=10^-5; %tighten for qmu analyses
 
+%solve
 md=solve(md,'analysis_type',DiagnosticSolutionEnum,'overwrite','y');
+md=tres(md,'dakota');
 
 %Fields and tolerances to track changes
-md=tres(md,'dakota');
+
 %ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr
 %we recover those mass fluxes through the mean of the response.
Index: /issm/trunk/test/NightlyRun/test428.m
===================================================================
--- /issm/trunk/test/NightlyRun/test428.m	(revision 5192)
+++ /issm/trunk/test/NightlyRun/test428.m	(revision 5193)
@@ -14,16 +14,21 @@
 
 %Dakota options
-md.variables.nuv=normal_uncertain.empty();
-md.variables.nuv(end+1)=normal_uncertain('DragCoefficient',1,0.01);
 
-md.responses=struct();
-md.responses.rf =response_function.empty();
-md.responses.rf (end+1)=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.responses.rf (end+1)=response_function('MassFlux6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+%partitioning
+md.npart=20;
+md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
+md.part=md.part-1;
+
+%variables
+md.variables.drag_coefficient=normal_uncertain('DragCoefficient',1,0.01);
+
+%responses
+md.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux1=response_function('MassFlux1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux2=response_function('MassFlux2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux3=response_function('MassFlux3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux4=response_function('MassFlux4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.MassFlux5=response_function('MassFlux5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
+md.responses.massFlux6=response_function('MassFlux6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
 
 %mass flux profiles
@@ -31,6 +36,8 @@
 md.qmu_mass_flux_profile_directory=pwd;
 
+%method
 md.qmu_method     =dakota_method('nond_l');
 
+%parameters
 md.qmu_params.direct=true;
 md.qmu_params.analysis_driver='diagnostic';
@@ -38,17 +45,12 @@
 md.qmu_params.interval_type='forward';
 md.qmu_params.tabular_graphics_data=true;
-
-%partitioning
-md.npart=20;
-md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
-md.part=md.part-1;
 md.qmu_analysis=1;
-
 md.eps_rel=10^-5; %tighten for qmu analyses
 
+%solve
 md=solve(md,'analysis_type',DiagnosticSolutionEnum,'overwrite','y');
+md=tres(md,'dakota');
 
 %Fields and tolerances to track changes
-md=tres(md,'dakota');
 %ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr
 %we recover those mass fluxes through the mean of the response.