Changeset 11339

Timestamp:

02/07/12 07:49:15 (13 years ago)

Author:

Mathieu Morlighem

Message:

removed all PatchToVec, not needed anymore

File:

• issm/trunk-jpl/src/m/model/tres.m (modified) (4 diffs)

issm/trunk-jpl/src/m/model/tres.m

@@ -10 +10 @@
 if strcmpi(string,'diagnostic'),
         if md.mesh.dimension==2,
-                if isfield(md.results.DiagnosticSolution,'VxAverage'),
-                        md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.VxAverage);
-                else
-                        md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
-                end
-                if isfield(md.results.DiagnosticSolution,'VyAverage'),
-                        md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.VyAverage);
-                else
-                        md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
-                end
+                md.initialization.vx=md.results.DiagnosticSolution.Vx;
+                md.initialization.vy=md.results.DiagnosticSolution.Vy;
         else 
-                md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
-                md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
-                if isfield(md.results.DiagnosticSolution,'Vz'),
-                        md.initialization.vz=PatchToVec(md.results.DiagnosticSolution.Vz);
-                else
-                        md.initialization.vz=zeros(md.mesh.numberofvertices,1);
-                end
+                md.initialization.vx=md.results.DiagnosticSolution.Vx;
+                md.initialization.vy=md.results.DiagnosticSolution.Vy;
+                md.initialization.vz=md.results.DiagnosticSolution.Vz;
         end
-        md.initialization.vel=PatchToVec(md.results.DiagnosticSolution.Vel);
+        md.initialization.vel=md.results.DiagnosticSolution.Vel;
 
         if isfield(md.results.DiagnosticSolution,'Pressure'),
-                md.initialization.pressure=PatchToVec(md.results.DiagnosticSolution.Pressure);
+                md.initialization.pressure=md.results.DiagnosticSolution.Pressure;
         end
         if md.rifts.numrifts,
@@ -42 +30 @@
                 for control_parameters=md.inversion.control_parameters
                         %Will need to be updated... good luck ;)
-                        md.(EnumToModelField(control_parameters))=PatchToVec(md.results.DiagnosticSolution.(EnumToString(control_parameters)));
+                        md.(EnumToModelField(control_parameters))=md.results.DiagnosticSolution.(EnumToString(control_parameters));
                 end
         end
@@ -59 +47 @@
         for i=1:length(results),
                 if ~isempty(md.results.TransientSolution(i).Vel),
-                        results2(count).Vel=PatchToVec(md.results.TransientSolution(i).Vel);
-                        results2(count).Surface=PatchToVec(md.results.TransientSolution(i).Surface);
-                        results2(count).Thickness=PatchToVec(md.results.TransientSolution(i).Thickness);
-                        results2(count).Bed=PatchToVec(md.results.TransientSolution(i).Bed);
-                        results2(count).Vx=PatchToVec(md.results.TransientSolution(i).Vx);
-                        results2(count).Vy=PatchToVec(md.results.TransientSolution(i).Vy);
+                        results2(count).Vel=md.results.TransientSolution(i).Vel;
+                        results2(count).Surface=md.results.TransientSolution(i).Surface;
+                        results2(count).Thickness=md.results.TransientSolution(i).Thickness;
+                        results2(count).Bed=md.results.TransientSolution(i).Bed;
+                        results2(count).Vx=md.results.TransientSolution(i).Vx;
+                        results2(count).Vy=md.results.TransientSolution(i).Vy;
                         results2(count).time=md.results.TransientSolution(i).time;
                         results2(count).step=md.results.TransientSolution(i).step;
@@ -76 +64 @@
         clear results,results2;
 elseif strcmpi(string,'steadystate'),
-        md.initialization.vx=PatchToVec(md.results.SteadystateSolution.Vx);
-        md.initialization.vy=PatchToVec(md.results.SteadystateSolution.Vy);
+        md.initialization.vx=md.results.SteadystateSolution.Vx;
+        md.initialization.vy=md.results.SteadystateSolution.Vy;
         if isfield(md.results.SteadystateSolution,'Vz'),
-                md.initialization.vz=PatchToVec(md.results.SteadystateSolution.Vz);
+                md.initialization.vz=md.results.SteadystateSolution.Vz;
         end
 
-        md.initialization.vel=PatchToVec(md.results.SteadystateSolution.Vel);
-        md.initialization.pressure=PatchToVec(md.results.SteadystateSolution.Pressure);
-        md.initialization.temperature=PatchToVec(md.results.SteadystateSolution.Temperature);
-        md.basalforcings.melting_rate=PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate);
+        md.initialization.vel=md.results.SteadystateSolution.Vel;
+        md.initialization.pressure=md.results.SteadystateSolution.Pressure;
+        md.initialization.temperature=md.results.SteadystateSolution.Temperature;
+        md.basalforcings.melting_rate=md.results.SteadystateSolution.BasalforcingsMeltingRate;
 
         if md.inversion.iscontrol==1,
                 for control_parameters=md.inversion.control_parameters
-                        md.(EnumToModelField(control_parameters))=PatchToVec(md.results.SteadystateSolution.(EnumToString(control_parameters)));
+                        md.(EnumToModelField(control_parameters))=md.results.SteadystateSolution.(EnumToString(control_parameters));
                 end
         end
 
 elseif strcmpi(string,'thermal'),
-        md.initialization.temperature=PatchToVec(md.results.ThermalSolution.Temperature);
-        md.basalforcings.melting_rate=PatchToVec(md.results.ThermalSolution.BasalMeltingRate);
+        md.initialization.temperature=md.results.ThermalSolution.Temperature;
+        md.basalforcings.melting_rate=md.results.ThermalSolution.BasalMeltingRate;
 elseif strcmpi(string,'hydrology'),
-        md.initialization.watercolumn=PatchToVec(md.results.HydrologySolution.Watercolumn);
+        md.initialization.watercolumn=md.results.HydrologySolution.Watercolumn;
 
 else