Index: /issm/trunk/src/m/classes/public/tres.m
===================================================================
--- /issm/trunk/src/m/classes/public/tres.m	(revision 5163)
+++ /issm/trunk/src/m/classes/public/tres.m	(revision 5164)
@@ -1,56 +1,47 @@
-function md=tres(md,varargin)
+function md=tres(md,string)
 %TRES - transfer results results to corresponding model fields. 
 %
-%    Usage: md=tres(md,varargin)
+%    Usage: md=tres(md,string)
 %
-%
-%    Example: md=tres(md,DiagnosticAnalysisEnum);
-%             md=tres(md);
+%    Example: md=tres(md,'diagnostic');
 
 %check number of arguments
-if nargin==1,
-	string=md.analysis_type;
-elseif nargin==2,
-	string=varargin{1};
-else
-	error('tres error message: bad usage');
-end
 
-if strcmpi(string,'DiagnosticAnalysis'),
-	md.vx=md.results.DiagnosticAnalysis.vx;
-	md.vy=md.results.DiagnosticAnalysis.vy;
-	if isfield(md.results.DiagnosticAnalysis,'vz'),
-		md.vz=md.results.DiagnosticAnalysis.vz;
+if strcmpi(string,'diagnostic'),
+	md.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
+	md.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
+	if isfield(md.results.DiagnosticSolution,'Vz'),
+		md.vz=PatchToVec(md.results.DiagnosticSolution.Vz);
 	else
 		md.vz=zeros(md.numberofgrids,1);
 	end
-	md.vel=md.results.DiagnosticAnalysis.vel;
-	if isfield(md.results.DiagnosticAnalysis,'pressure'),
-		md.pressure=md.results.DiagnosticAnalysis.pressure;
+	md.vel=PatchToVec(md.results.DiagnosticSolution.Vel);
+	if isfield(md.results.DiagnosticSolution,'Pressure'),
+		md.pressure=PatchToVec(md.results.DiagnosticSolution.Pressure);
 	end
 	if md.numrifts,
-		if isfield(md.results.DiagnosticAnalysis,'riftproperties'),
-			md.riftproperties=md.results.DiagnosticAnalysis.riftproperties;
+		if isfield(md.results.DiagnosticSolution,'riftproperties'),
+			md.riftproperties=md.results.DiagnosticSolution.riftproperties;
 		end
 	end
 	if md.control_analysis==1,
-		md.(md.results.DiagnosticAnalysis.control_type)=md.results.DiagnosticAnalysis.parameter;
+		md.(md.results.DiagnosticSolution.control_type)=PatchToVec(md.results.DiagnosticSolution.parameter);
 	end
 elseif strcmpi(string,'dakota'),
 	md.dakotaresults=md.results.dakota;
-elseif strcmpi(string,'SteadystateAnalysis'),
-	md.vx=md.results.SteadystateAnalysis.vx;
-	md.vy=md.results.SteadystateAnalysis.vy;
-	if isfield(md.results.SteadystateAnalysis,'vz'),
-		md.vz=md.results.SteadystateAnalysis.vz;
+elseif strcmpi(string,'steadystate'),
+	md.vx=PatchToVec(md.results.SteadystateAnalysis.Vx);
+	md.vy=PatchToVec(md.results.SteadystateAnalysis.Vy);
+	if isfield(md.results.SteadystateAnalysis,'Vz'),
+		md.vz=PatchToVec(md.results.SteadystateAnalysis.Vz);
 	end
 
-	md.vel=md.results.SteadystateAnalysis.vel;
-	md.pressure=md.results.SteadystateAnalysis.pressure;
-	md.temperature=md.results.SteadystateAnalysis.temperature;
-	md.melting=md.results.SteadystateAnalysis.melting;
-elseif strcmpi(string,'ThermalAnalysis'),
-	md.temperature=md.results.ThermalAnalysis.temperature;
-	md.melting=md.results.ThermalAnalysis.melting;
+	md.vel=PatchToVec(md.results.SteadystateAnalysis.Vel);
+	md.pressure=PatchToVec(md.results.SteadystateAnalysis.Pressure);
+	md.temperature=PatchToVec(md.results.SteadystateAnalysis.Temperature);
+	md.melting=PatchToVec(md.results.SteadystateAnalysis.Melting);
+elseif strcmpi(string,'thermal'),
+	md.temperature=PatchToVec(md.results.ThermalAnalysis.Temperature);
+	md.melting=PatchToVec(md.results.ThermalAnalysis.Melting);
 else 
 	error(['tres error message: analysis ' string ' not supported yet!']);