Changeset 9706 for issm/trunk

Timestamp:

09/08/11 17:11:32 (14 years ago)

Author:

Mathieu Morlighem

Message:

moved some stuff in mesh

Location:

issm/trunk/src/m

Files:

• classes/mesh.m (modified) (1 diff)
• classes/model/model.m (modified) (3 diffs)
• model/modelextract.m (modified) (1 diff)

issm/trunk/src/m/classes/mesh.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 average_vertex_connectivity = modelfield('default',0,'marshall',true,'format','Integer');
+                extractedvertices           = modelfield('default',NaN,'marshall',false);
+                extractedelements           = modelfield('default',NaN,'marshall',false);
         end
         methods

issm/trunk/src/m/classes/model/model.m

@@ -84 +84 @@
                  nodeonsurface     = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1);
 
-                 %Extraction
-                 extractednodes    = modelfield('default',NaN,'marshall',false);
-                 extractedelements = modelfield('default',NaN,'marshall',false);
-
                  %Boundary conditions
                  nodeonboundary = modelfield('default',NaN,'marshall',false);
@@ -234 +230 @@
                          if isfield(structmd,'gridonbed'), md.nodeonbed=structmd.gridonbed; end
                          if isfield(structmd,'gridonsurface'), md.nodeonsurface=structmd.gridonsurface; end
-                         if isfield(structmd,'extractedgrids'), md.extractednodes=structmd.extractedgrids; end
+                         if isfield(structmd,'extractedgrids'), md.mesh.extractedvertices=structmd.extractedgrids; end
                          if isfield(structmd,'gridoniceshelf'), md.mask.vertexonfloatingice=structmd.gridoniceshelf; end
                          if isfield(structmd,'gridonicesheet'), md.mask.vertexongroundedice=structmd.gridonicesheet; end
@@ -330 +326 @@
                          if isfield(structmd,'thickness_coeff'), md.geometry.hydrostatic_ratio=structmd.thickness_coeff; end
                          if isfield(structmd,'connectivity'), md.mesh.average_vertex_connectivity=structmd.connectivity; end
+                         if isfield(structmd,'extractednodes'), md.mesh.extractedvertices=structmd.extractednodes; end
+                         if isfield(structmd,'extractedelements'), md.mesh.extractedelements=structmd.extractedelements; end
 
                          %Field changes

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

@@ -267 +267 @@
 
 %Keep track of pos_node and pos_elem
-md2.extractednodes=pos_node;
-md2.extractedelements=pos_elem;
+md2.mesh.extractedvertices=pos_node;
+md2.mesh.extractedelements=pos_elem;