Changeset 9731

Timestamp:

09/09/11 14:41:38 (14 years ago)

Author:

seroussi

Message:

added more fields in mesh

Location:

issm/trunk

Files:

• src/c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (modified) (1 diff)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)
• src/m/classes/mesh.m (modified) (3 diffs)
• src/m/classes/model/model.m (modified) (2 diffs)
• src/m/model/PropagateFlagsUntilDistance.m (modified) (1 diff)
• src/m/model/SectionValues.m (modified) (1 diff)
• src/m/model/bedslope.m (modified) (1 diff)
• src/m/model/collapse.m (modified) (2 diffs)
• src/m/model/divergence.m (modified) (1 diff)
• src/m/model/extrude.m (modified) (1 diff)
• src/m/model/misfit.m (modified) (1 diff)
• src/m/model/modelextract.m (modified) (1 diff)
• src/m/model/partition/AreaAverageOntoPartition.m (modified) (1 diff)
• src/m/model/partition/partitioner.m (modified) (1 diff)
• src/m/model/plot/plot_section.m (modified) (1 diff)
• src/m/model/plot/processmesh.m (modified) (2 diffs)
• src/m/model/slope.m (modified) (1 diff)
• test/NightlyRun/test136.m (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -162 +162 @@
         MeshVertexonbedEnum,
         MeshVertexonsurfaceEnum,
+        MeshElements2dEnum,
         /*}}}*/
         /*Datasets {{{1*/
@@ -474 +475 @@
         ZEnum,
         EdgesEnum,
-        Elements2dEnum,
         XEnum,
         OutputfilenameEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -166 +166 @@
                 case MeshVertexonbedEnum : return "MeshVertexonbed";
                 case MeshVertexonsurfaceEnum : return "MeshVertexonsurface";
+                case MeshElements2dEnum : return "MeshElements2d";
                 case ConstraintsEnum : return "Constraints";
                 case ElementsEnum : return "Elements";
@@ -417 +418 @@
                 case ZEnum : return "Z";
                 case EdgesEnum : return "Edges";
-                case Elements2dEnum : return "Elements2d";
                 case XEnum : return "X";
                 case OutputfilenameEnum : return "Outputfilename";

issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

@@ -71 +71 @@
         else{
                 /*load elements2d: */
-                iomodel->FetchData(&elements2d,NULL,NULL,Elements2dEnum);
+                iomodel->FetchData(&elements2d,NULL,NULL,MeshElements2dEnum);
         }
 

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -164 +164 @@
         else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum;
         else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
+        else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum;
         else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
         else if (strcmp(name,"Elements")==0) return ElementsEnum;
@@ -415 +416 @@
         else if (strcmp(name,"Z")==0) return ZEnum;
         else if (strcmp(name,"Edges")==0) return EdgesEnum;
-        else if (strcmp(name,"Elements2d")==0) return Elements2dEnum;
         else if (strcmp(name,"X")==0) return XEnum;
         else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum;

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

@@ -32 +32 @@
                 vertexonbed         = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1);
                 vertexonsurface     = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1);
+                elements2d         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
+                x2d                = modelfield('default',NaN,'marshall',false);
+                y2d                = modelfield('default',NaN,'marshall',false);
         end
         methods
@@ -75 +78 @@
 
                         if obj.dimension==3,
-                                disp(sprintf('\n      Elements and nodes of the original 2d mesh:'));
+                                disp(sprintf('\n      Elements and vertices of the original 2d mesh:'));
                                 fielddisplay(obj,'numberofelements2d','number of elements');
-                                fielddisplay(obj,'numberofnodes2d','number of nodes');
-                                fielddisplay(obj,'elements2d','index into (x,y,z), coordinates of the nodes');
-                                fielddisplay(obj,'x2d','nodes x coordinate');
-                                fielddisplay(obj,'y2d','nodes y coordinate');
+                                fielddisplay(obj,'numberofverticess2d','number of vertices');
+                                fielddisplay(obj,'elements2d','index into (x,y,z), coordinates of the vertices');
+                                fielddisplay(obj,'x2d','vertices x coordinate');
+                                fielddisplay(obj,'y2d','vertices y coordinate');
 
-                                disp(sprintf('\n      Elements and nodes of the extruded 3d mesh:'));
+                                disp(sprintf('\n      Elements and vertices of the extruded 3d mesh:'));
                         else
-                                disp(sprintf('\n      Elements and nodes:'));
+                                disp(sprintf('\n      Elements and vertices:'));
                         end
                         fielddisplay(obj,'numberofelements','number of elements');
-                        fielddisplay(obj,'numberofnodes','number of nodes');
-                        fielddisplay(obj,'elements','index into (x,y,z), coordinates of the nodes');
+                        fielddisplay(obj,'numberofvertices','number of vertices');
+                        fielddisplay(obj,'elements','index into (x,y,z), coordinates of the vertices');
                         fielddisplay(obj,'elements_type','element types');
-                        fielddisplay(obj,'x','nodes x coordinate');
-                        fielddisplay(obj,'y','nodes y coordinate');
-                        fielddisplay(obj,'z','nodes z coordinate');
-                        fielddisplay(obj,'edges','edges of the 2d mesh (node1 node2 element1 element2)');
+                        fielddisplay(obj,'x','vertices x coordinate');
+                        fielddisplay(obj,'y','vertices y coordinate');
+                        fielddisplay(obj,'z','vertices z coordinate');
+                        fielddisplay(obj,'edges','edges of the 2d mesh (vertex1 vertex2 element1 element2)');
 
                         disp(sprintf('\n      Properties:'));
@@ -99 +102 @@
                         fielddisplay(obj,'numlayers','number of extrusion layers');
                         fielddisplay(obj,'penalties','penalties list');
-                        fielddisplay(obj,'nodeonbed','lower nodes flags list');
+                        fielddisplay(obj,'vertexonbed','lower vertices flags list');
                         fielddisplay(obj,'elementonbed','lower elements flags list');
-                        fielddisplay(obj,'nodeonsurface','upper nodes flags list');
+                        fielddisplay(obj,'vertexonsurface','upper vertices flags list');
                         fielddisplay(obj,'elementonsurface','upper elements flags list');
                 end % }}}

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

@@ -48 +48 @@
                  z                   = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  edges               = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-                 elements2d         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-                 x2d                = modelfield('default',NaN,'marshall',false);
-                 y2d                = modelfield('default',NaN,'marshall',false);
 
                  %}}}
@@ -317 +314 @@
                          if isfield(structmd,'nodeonsurface'), md.mesh.vertexonsurface=structmd.nodeonsurface; end
                          if isfield(structmd,'nodeonbed'), md.mesh.vertexonbed=structmd.nodeonbed; end
+                         if isfield(structmd,'elements2d'), md.mesh.elements2d=structmd.elements2d; end
+                         if isfield(structmd,'y2d'), md.mesh.y2d=structmd.y2d; end
+                         if isfield(structmd,'x2d'), md.mesh.x2d=structmd.x2d; end
 
                          %Field changes

issm/trunk/src/m/model/PropagateFlagsUntilDistance.m

@@ -13 +13 @@
 %make 3d work in 2d: 
 if md.mesh.dimension==3,
-        md.x=md.x2d;
-        md.y=md.y2d;
-        md.elements=md.elements2d;
+        md.x=md.mesh.x2d;
+        md.y=md.mesh.y2d;
+        md.elements=md.mesh.elements2d;
 end
 

issm/trunk/src/m/model/SectionValues.m

@@ -94 +94 @@
         %Get bed and surface for each 2d point, offset to make sure that it is inside the glacier system
         offset=10^-3;
-        bed=InterpFromMeshToMesh2d(md.elements2d,md.x2d,md.y2d,project2d(md,md.geometry.bed,1),X,Y)+offset;
-        surface=InterpFromMeshToMesh2d(md.elements2d,md.x2d,md.y2d,project2d(md,md.geometry.surface,1),X,Y)-offset;
+        bed=InterpFromMeshToMesh2d(md.mesh.elements2d,md.mesh.x2d,md.mesh.y2d,project2d(md,md.geometry.bed,1),X,Y)+offset;
+        surface=InterpFromMeshToMesh2d(md.mesh.elements2d,md.mesh.x2d,md.mesh.y2d,project2d(md,md.geometry.surface,1),X,Y)-offset;
 
         %Some useful parameters

issm/trunk/src/m/model/bedslope.m

@@ -14 +14 @@
         numberofelements=md.mesh.numberofelements2d;
         numberofnodes=md.mesh.numberofvertices2d;
-        index=md.elements2d;
-        x=md.x2d; y=md.y2d;
+        index=md.mesh.elements2d;
+        x=md.mesh.x2d; y=md.mesh.y2d;
 end
 

issm/trunk/src/m/model/collapse.m

@@ -90 +90 @@
 
 %Initialize with the 2d mesh
-md.x=md.x2d;
-md.y=md.y2d;
-md.z=zeros(size(md.x2d));
+md.x=md.mesh.x2d;
+md.y=md.mesh.y2d;
+md.z=zeros(size(md.mesh.x2d));
 md.mesh.numberofvertices=md.mesh.numberofvertices2d;
 md.mesh.numberofelements=md.mesh.numberofelements2d;
-md.elements=md.elements2d;
+md.elements=md.mesh.elements2d;
 
 %Keep a trace of lower and upper nodes
@@ -102 +102 @@
 
 %Remove old mesh 
-md.x2d=NaN;
-md.y2d=NaN;
-md.elements2d=NaN;
+md.mesh.x2d=NaN;
+md.mesh.y2d=NaN;
+md.mesh.elements2d=NaN;
 md.mesh.numberofelements2d=md.mesh.numberofelements;
 md.mesh.numberofvertices2d=md.mesh.numberofvertices;

issm/trunk/src/m/model/divergence.m

@@ -13 +13 @@
         numberofelements=md.mesh.numberofelements2d;
         numberofnodes=md.mesh.numberofvertices2d;
-        index=md.elements2d;
-        x=md.x2d; y=md.y2d;
+        index=md.mesh.elements2d;
+        x=md.mesh.x2d; y=md.mesh.y2d;
 end
 

issm/trunk/src/m/model/extrude.m

@@ -103 +103 @@
 
 %Save old mesh 
-md.x2d=md.x;
-md.y2d=md.y;
-md.elements2d=md.elements;
+md.mesh.x2d=md.x;
+md.mesh.y2d=md.y;
+md.mesh.elements2d=md.elements;
 md.mesh.numberofelements2d=md.mesh.numberofelements;
 md.mesh.numberofvertices2d=md.mesh.numberofvertices;

issm/trunk/src/m/model/misfit.m

@@ -18 +18 @@
         vy_obs=md.inversion.vy_obs;
 else
-        elements=md.elements2d;
-        x=md.x2d;
-        y=md.y2d;
+        elements=md.mesh.elements2d;
+        x=md.mesh.x2d;
+        y=md.mesh.y2d;
         vx=project2d(md,md.initialization.vx,md.mesh.numberoflayers);
         vy=project2d(md,md.initialization.vy,md.mesh.numberoflayers);

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

@@ -151 +151 @@
                 md2.numberofelements2d=length(pos_elem_2d);
                 md2.numberofnodes2d=length(pos_node_2d);
-                md2.elements2d=md1.elements2d(pos_elem_2d,:);
-                md2.elements2d(:,1)=Pnode(md2.elements2d(:,1));
-                md2.elements2d(:,2)=Pnode(md2.elements2d(:,2));
-                md2.elements2d(:,3)=Pnode(md2.elements2d(:,3));
+                md2.mesh.elements2d=md1.mesh.elements2d(pos_elem_2d,:);
+                md2.mesh.elements2d(:,1)=Pnode(md2.mesh.elements2d(:,1));
+                md2.mesh.elements2d(:,2)=Pnode(md2.mesh.elements2d(:,2));
+                md2.mesh.elements2d(:,3)=Pnode(md2.mesh.elements2d(:,3));
 
                 md2.x2d=md1.x(pos_node_2d);

issm/trunk/src/m/model/partition/AreaAverageOntoPartition.m

@@ -16 +16 @@
         md3d=md;
         
-        md.elements=md.elements2d;
-        md.x=md.x2d;
-        md.y=md.y2d;
+        md.elements=md.mesh.elements2d;
+        md.x=md.mesh.x2d;
+        md.y=md.mesh.y2d;
         md.mesh.numberofvertices=md.mesh.numberofvertices2d;
         md.mesh.numberofelements=md.mesh.numberofelements2d;

issm/trunk/src/m/model/partition/partitioner.m

@@ -34 +34 @@
         %extrude the partition vector vertically. 
         md3d=md; %save  for later
-        md.elements=md.elements2d;
-        md.x=md.x2d;
-        md.y=md.y2d;
+        md.elements=md.mesh.elements2d;
+        md.x=md.mesh.x2d;
+        md.y=md.mesh.y2d;
         md.mesh.numberofvertices=md.mesh.numberofvertices2d;
         md.mesh.numberofelements=md.mesh.numberofelements2d;

issm/trunk/src/m/model/plot/plot_section.m

@@ -32 +32 @@
 md3d=md;
 if exist(options,'layer')
-        md.x=md.x2d; md.y=md.y2d; md.elements=md.elements2d; md.mesh.dimension=2;
+        md.x=md.mesh.x2d; md.y=md.mesh.y2d; md.elements=md.mesh.elements2d; md.mesh.dimension=2;
 end
 

issm/trunk/src/m/model/plot/processmesh.m

@@ -17 +17 @@
         if ~strcmpi(getfieldvalue(options,'coord','xy'),'latlon'),
                 x=md.x;
-                x2d=md.x2d;
+                x2d=md.mesh.x2d;
                 y=md.y;
-                y2d=md.y2d;
+                y2d=md.mesh.y2d;
         else
                 x=md.mesh.long;
-                x2d=md.x2d;
+                x2d=md.mesh.x2d;
                 y=md.mesh.lat;
-                y2d=md.y2d;
+                y2d=md.mesh.y2d;
         end
 
@@ -37 +37 @@
 
 
-        elements2d=md.elements2d;
+        elements2d=md.mesh.elements2d;
         elements=md.elements;
 

issm/trunk/src/m/model/slope.m

@@ -14 +14 @@
         numberofelements=md.mesh.numberofelements2d;
         numberofnodes=md.mesh.numberofvertices2d;
-        index=md.elements2d;
-        x=md.x2d; y=md.y2d;
+        index=md.mesh.elements2d;
+        x=md.mesh.x2d; y=md.mesh.y2d;
 end
 

issm/trunk/test/NightlyRun/test136.m

@@ -6 +6 @@
 md.initialization.vy=md.initialization.vy+400;
 md=setflowequation(md,'macayeal','all');
-md.cluster=generic('name',oshostname(),'np',3);
+md.cluster=generic('name',oshostname(),'np',1);
+md.debug.valgrind=1;
 md=solve(md,BalancethicknessSolutionEnum);