Changeset 9694

Timestamp:

09/08/11 14:56:34 (14 years ago)

Author:

seroussi

Message:

minor some fix in extract

File:

• issm/trunk/src/m/model/modelextract.m (modified) (3 diffs)

issm/trunk/src/m/model/modelextract.m

@@ -188 +188 @@
 
         %Penalties
-        if ~isnan(md2.penalties),
-                for i=1:size(md1.penalties,1);
-                        md2.penalties(i,:)=Pnode(md1.penalties(i,:));
-                end
-                md2.penalties=md2.penalties(find(md2.penalties(:,1)),:);
+        if ~isnan(md2.diagnostic.vertex_pairing),
+                for i=1:size(md1.diagnostic.vertex_pairing,1);
+                        md2.diagnostic.vertex_pairing(i,:)=Pnode(md1.diagnostic.vertex_pairing(i,:));
+                end
+                md2.diagnostic.vertex_pairing=md2.diagnostic.vertex_pairing(find(md2.diagnostic.vertex_pairing(:,1)),:);
         end
         if ~isnan(md2.prognostic.vertex_pairing),
@@ -217 +217 @@
         nodestoflag2=Pnode(nodestoflag1);
         if numel(md1.diagnostic.spcvx)>1 & numel(md1.diagnostic.spcvy)>2 & numel(md1.diagnostic.spcvz)>2,
-                if numel(md1.vx_obs)>1 & numel(md1.vy_obs)>1
-                        md2.diagnostic.spcvx(nodestoflag2)=md2.vx_obs(nodestoflag2); 
-                        md2.diagnostic.spcvy(nodestoflag2)=md2.vy_obs(nodestoflag2);
+                if numel(md1.inversion.vx_obs)>1 & numel(md1.inversion.vy_obs)>1
+                        md2.diagnostic.spcvx(nodestoflag2)=md2.inversion.vx_obs(nodestoflag2); 
+                        md2.diagnostic.spcvy(nodestoflag2)=md2.inversion.vy_obs(nodestoflag2);
                 else
                         md2.diagnostic.spcvx(nodestoflag2)=NaN;
@@ -235 +235 @@
 
         %Diagnostic
-        if ~isnan(md2.pressureload)
-                md2.pressureload(:,1)=Pnode(md1.pressureload(:,1)); 
-                md2.pressureload(:,2)=Pnode(md1.pressureload(:,2)); 
-                md2.pressureload(:,end-1)=Pelem(md1.pressureload(:,end-1));
+        if ~isnan(md2.diagnostic.icefront)
+                md2.diagnostic.icefront(:,1)=Pnode(md1.diagnostic.icefront(:,1)); 
+                md2.diagnostic.icefront(:,2)=Pnode(md1.diagnostic.icefront(:,2)); 
+                md2.diagnostic.icefront(:,end-1)=Pelem(md1.diagnostic.icefront(:,end-1));
                 if md1.dim==3
-                        md2.pressureload(:,3)=Pnode(md1.pressureload(:,3)); 
-                        md2.pressureload(:,4)=Pnode(md1.pressureload(:,4)); 
-                end
-                md2.pressureload=md2.pressureload(find(md2.pressureload(:,1) & md2.pressureload(:,2) & md2.pressureload(:,end)),:);
+                        md2.diagnostic.icefront(:,3)=Pnode(md1.diagnostic.icefront(:,3)); 
+                        md2.diagnostic.icefront(:,4)=Pnode(md1.diagnostic.icefront(:,4)); 
+                end
+                md2.diagnostic.icefront=md2.diagnostic.icefront(find(md2.diagnostic.icefront(:,1) & md2.diagnostic.icefront(:,2) & md2.diagnostic.icefront(:,end)),:);
         end