Changeset 9783

Timestamp:

09/12/11 16:34:06 (14 years ago)

Author:

xinl3

Message:

updated some names

Location:

issm/trunk/src/m

Files:

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

issm/trunk/src/m/classes/inversion.m

@@ -144 +144 @@
                 function disp(obj) % {{{
                         fielddisplay(obj,'iscontrol','is inversion activated?');
-                        fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''DragCoefficient''}, or {''RheologyBbar''}');
+                        fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''RheologyBbar''}');
                         fielddisplay(obj,'cost_functions_coefficients','cost_functions_coefficients applied to the misfit of each node');
                         fielddisplay(obj,'nsteps','number of optimization searches');

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

@@ -154 +154 @@
                                 disp(sprintf('\n      Elements and vertices of the original 2d mesh:'));
                                 fielddisplay(obj,'numberofelements2d','number of elements');
-                                fielddisplay(obj,'numberofverticess2d','number of vertices');
+                                fielddisplay(obj,'numberofvertices2d','number of vertices');
                                 fielddisplay(obj,'elements2d','index into (x,y,z), coordinates of the vertices');
                                 fielddisplay(obj,'x2d','vertices x coordinate');
@@ -166 +166 @@
                         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','vertices x coordinate');
                         fielddisplay(obj,'y','vertices y coordinate');
@@ -174 +173 @@
                         disp(sprintf('\n      Properties:'));
                         fielddisplay(obj,'dimension','mesh dimension (2d or 3d)');
-                        fielddisplay(obj,'numlayers','number of extrusion layers');
-                        fielddisplay(obj,'penalties','penalties list');
+                        fielddisplay(obj,'numberoflayers','number of extrusion layers');
                         fielddisplay(obj,'vertexonbed','lower vertices flags list');
                         fielddisplay(obj,'elementonbed','lower elements flags list');

issm/trunk/src/m/model/project2d.m

@@ -28 +28 @@
 end
 
-if size(value,1)==md3d.mesh.numberofnodes,
+if size(value,1)==md3d.mesh.numberofvertices,
         projection_value=value((layer-1)*md3d.mesh.numberofvertices2d+1:layer*md3d.mesh.numberofvertices2d,:);
-elseif size(value,1)==md3d.mesh.numberofnodes+1,
+elseif size(value,1)==md3d.mesh.numberofvertices+1,
         projection_value=[value((layer-1)*md3d.mesh.numberofvertices2d+1:layer*md3d.mesh.numberofvertices2d,:); value(end,:)];
 else