Changeset 4319

Timestamp:

06/29/10 15:10:11 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed ProcessPatch for variable nodes and vertices

Location:

issm/trunk/src/m/classes/public

Files:

• ProcessPatch.m (modified) (2 diffs)
• parseresultsfromdisk.m (modified) (2 diffs)

issm/trunk/src/m/classes/public/ProcessPatch.m

@@ -1 @@
-function structure=ProcessPatch(structure,step,Patch);
+function structure=ProcessPatch(structure);
 %PROCESSPATCH - create a structure from a patch
 %
 %   Usage:
-%      Result=ProcessPatch(Patch);
+%      Result=ProcessPatch(Result);
+
+%Get out if no Patch
+if (~isfield(structure,'Patch')),
+        return;
+else
+        Patch=structure(1).Patch;
+        numvertices=structure(1).PatchVertices;
+end
 
 %Get number of fields;
@@ -33 +41 @@
                 structure(step).(fieldname).element=temporarypatch(pos,4);
                 structure(step).(fieldname).interpolation=temporarypatch(pos,5);
-                structure(step).(fieldname).index=temporarypatch(pos,6:8);
-                structure(step).(fieldname).value=temporarypatch(pos,9:end);
+                structure(step).(fieldname).index=temporarypatch(pos,6:5+numvertices);
+                structure(step).(fieldname).value=temporarypatch(pos,6+numvertices:end);
 
         end
 end
+
+%remove fields
+structure=rmfield(structure,'Patch');
+structure=rmfield(structure,'PatchVertices');
+structure=rmfield(structure,'PatchNodes');

issm/trunk/src/m/classes/public/parseresultsfromdisk.m

@@ -16 +16 @@
 while ~isempty(result),
 
-        %process patch if necessary
-        if strcmpi(result.fieldname,'Patch'),
-                results=ProcessPatch(results,result.step,result.field);
-        else
-                %Get time and step
-                results(result.step).step=result.step;
-                results(result.step).time=result.time; 
-                results(result.step).(result.fieldname)=result.field;
-        end
+        %Get time and step
+        results(result.step).step=result.step;
+        results(result.step).time=result.time; 
+
+        %Add result
+        results(result.step).(result.fieldname)=result.field;
 
         %read next result
@@ -31 +28 @@
 end
 
+%process patch if necessary
+results=ProcessPatch(results);
+
 fclose(fid);