Index: /issm/trunk-jpl/examples/Inversion/runme.m
===================================================================
--- /issm/trunk-jpl/examples/Inversion/runme.m	(revision 20950)
+++ /issm/trunk-jpl/examples/Inversion/runme.m	(revision 20951)
@@ -1,24 +1,14 @@
-step=3;
+step=1;
 if step==1
-	%Generate observation
+	%Generate observations
 	md = model;
 	md = triangle(md,'DomainOutline.exp',100000);
-	md = setmask(md,'','');
+	md = setmask(md,'all','');
 	md = parameterize(md,'Square.par');
 	md = setflowequation(md,'SSA','all');
-    md.geometry.base = md.geometry.base + 100;
-    md.geometry.surface = md.geometry.surface + 100;
-    md.materials.rheology_B(:) = 1.8*10^8;
-    md.friction.coefficient(:) = 50;
-    pos = find(md.mesh.x < 600000 & md.mesh.x > 400000);
-    md.friction.coefficient(pos) = 10;
 	md.cluster = generic('np',2);
-
-    
-	md = solve(md,StressbalanceSolutionEnum);
-
-	plotmodel(md,'data',md.friction.coefficient,'caxis',[0 100],'figure',1,'gridded#all',1);
-	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2,'gridded#all',1);  
-
+	md = solve(md,StressbalanceSolutionEnum());
+	plotmodel(md,'axis#all','tight','data',md.materials.rheology_B,'caxis',[ 1.3 1.9]*10^8,'title','"True" B',...
+		'data',md.results.StressbalanceSolution.Vel,'title','"observed velocities"')
 	save model1 md
 end
@@ -27,6 +17,5 @@
 	loadmodel('model1.mat');
 	md.materials.rheology_B(:) = 1.8*10^8;
-    md.friction.coefficient(:) = 50;
-    
+
 	%results of previous run are taken as observations
 	md.inversion=m1qn3inversion();
@@ -35,9 +24,7 @@
 	md.inversion.vel_obs = md.results.StressbalanceSolution.Vel;
 
-	md = solve(md,StressbalanceSolutionEnum);
-
-	plotmodel(md,'data',md.friction.coefficient,'caxis',[0 100],'figure',1);
-	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);  
-
+	md = solve(md,StressbalanceSolutionEnum());
+	plotmodel(md,'axis#all','tight','data',md.materials.rheology_B,'caxis',[ 1.3 1.9]*10^8,'title','B first guess',...
+		'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
 	save model2 md
 end
@@ -49,19 +36,16 @@
 	maxsteps = 20;
 	md.inversion.iscontrol = 1;
-	md.inversion.control_parameters = {'FrictionCoefficient'};
+	md.inversion.control_parameters = {'MaterialsRheologyBbar'};
 	md.inversion.maxsteps = maxsteps;
-	md.inversion.cost_functions = [101 103 501];
-	md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,3);
-    md.inversion.cost_functions_coefficients(:,1) = 1000;
-    md.inversion.cost_functions_coefficients(:,3) = 0.05;
-	md.inversion.min_parameters    = 1*ones(md.mesh.numberofvertices,1);
-	md.inversion.max_parameters    = 100*ones(md.mesh.numberofvertices,1);
+	md.inversion.cost_functions = 101;
+	md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,1);
+	md.inversion.min_parameters    = cuffey(273)*ones(md.mesh.numberofvertices,1);
+	md.inversion.max_parameters    = cuffey(200)*ones(md.mesh.numberofvertices,1);
 
 	%Go solve!
 	md.verbose=verbose(0);
-	md=solve(md,StressbalanceSolutionEnum);
-
-	plotmodel(md,'data',md.results.StressbalanceSolution.FrictionCoefficient,'caxis',[0 100],'figure',1);
-	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);  
+	md=solve(md,StressbalanceSolutionEnum());
+	plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'title','inferred B',...
+		'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
 end
 if step==4
@@ -77,12 +61,11 @@
 	md.inversion.cost_functions_coefficients      = ones(md.mesh.numberofvertices,1);
 	md.inversion.cost_functions_coefficients(:,2) = 10^-16*ones(md.mesh.numberofvertices,1);
-	md.inversion.min_parameters    = paterson(273)*ones(md.mesh.numberofvertices,1);
-	md.inversion.max_parameters    = paterson(200)*ones(md.mesh.numberofvertices,1);
+	md.inversion.min_parameters    = cuffey(273)*ones(md.mesh.numberofvertices,1);
+	md.inversion.max_parameters    = cuffey(200)*ones(md.mesh.numberofvertices,1);
 
 	%Go solve!
 	md.verbose=verbose(0);
-	md=solve(md,StressbalanceSolutionEnum);
-
-	plotmodel(md,'data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'figure',1);
-	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);  
+	md=solve(md,StressbalanceSolutionEnum());
+	plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'title','inferred B',...
+		'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
 end
Index: /issm/trunk-jpl/examples/Pig/runme.m
===================================================================
--- /issm/trunk-jpl/examples/Pig/runme.m	(revision 20950)
+++ /issm/trunk-jpl/examples/Pig/runme.m	(revision 20951)
@@ -138,9 +138,5 @@
 
 	% Save model
-<<<<<<< .mine
-	save ./Models/PIG_ModelHO md;
-=======
 	save ./Models/PIG_Control_drag md;
->>>>>>> .r20806
 end
 
@@ -165,17 +161,14 @@
 
 	% Load Model
-    md = loadmodel('./Models/PIG_Control_drag.mat');
+
 	% Disable inversion
-    md.inversion.iscontrol = 0;
+
 	% Extrude Mesh
-    md = extrude(md, 10, 1);
+
 	% Set Flowequation
-    md = setflowequation(md,'HO','all');
+
 	% Solve
-    md.cluster=generic('name',oshostname,'np',2);
-	md=solve(md,StressbalanceSolutionEnum);
+
 	% Save Model
-    save ./Models/PIG_Control_drag md;
-    
 
 end