Changeset 5093

Timestamp:

08/09/10 14:25:27 (15 years ago)

Author:

Mathieu Morlighem

Message:

renamed some fields

Location:

issm/trunk/src/m/classes

Files:

• @bamggeom/bamggeom.m (modified) (1 diff)
• @bamgmesh/bamgmesh.m (modified) (1 diff)
• public/bamg.m (modified) (7 diffs)
• public/mesh/meshconvert.m (modified) (1 diff)

issm/trunk/src/m/classes/@bamggeom/bamggeom.m ¶

@@ -17 +17 @@
         bg.hVertices=[];
         bg.MetricVertices=[];
-        bg.h1h2VpVertices=[];
         bg.SubDomains=[];
 

issm/trunk/src/m/classes/@bamgmesh/bamgmesh.m ¶

@@ -12 +12 @@
         bm.Triangles=[];
         bm.Quadrilaterals=[];
-        bm.ElementEdges=[];
-        bm.Segments=[];
+        bm.IssmEdges=[];
+        bm.IssmSegments=[];
         bm.VerticesOnGeometricVertex=[];
         bm.VerticesOnGeometricEdge=[];

issm/trunk/src/m/classes/public/bamg.m ¶

@@ -12 +12 @@
 %
 %   - anisomax    : maximum ration between the smallest and largest edges (default is 10^30)
-%   - coef        : coefficient applied to the metric (2-> twice as many elements, default is 1)
+%   - coeff       : coefficient applied to the metric (2-> twice as many elements, default is 1)
 %   - cutoff      : scalar used to compute the metric when metric type 2 or 3 are applied
 %   - err         : error used to generate the metric from a field
@@ -22 +22 @@
 %                   1 -> use Green formula
 %   - KeepVertices: try to keep initial vertices when adaptation is done on an existing mesh (default 1)
-%   - MaximalAngleOfCorner: maximal angle of corners in degree (default is 10)
+%   - MaxCornerAngle: maximal angle of corners in degree (default is 10)
 %   - maxnbv      : maximum number of vertices used to allocate memory (default is 10^6)
 %   - maxsubdiv   : maximum subdivision of exisiting elements (default is 10)
@@ -30 +30 @@
 %                   3 -> rescaled absolute error c/(err coeff^2) * Abs(H)/(smax-smin)
 %   - nbjacoby    : correction used by Hessiantype=1 (default is 1)
-%   - NbSmooth    : number of metric smoothing procedure (default is 3)
+%   - nbsmooth    : number of metric smoothing procedure (default is 3)
 %   - omega       : relaxation parameter of the smoothing procedure (default is 1.8)
 %   - power       : power applied to the metric (default is 1)
@@ -271 +271 @@
 bamg_options.Crack=getfieldvalue(options,'Crack',0);
 bamg_options.anisomax=getfieldvalue(options,'anisomax',10^30);
-bamg_options.coef=getfieldvalue(options,'coef',1);
+bamg_options.coeff=getfieldvalue(options,'coeff',1);
 bamg_options.cutoff=getfieldvalue(options,'cutoff',10^-5);
 bamg_options.err=getfieldvalue(options,'err',0.01);
@@ -283 +283 @@
 bamg_options.hmaxVertices=getfieldvalue(options,'hmaxVertices',[]);
 bamg_options.KeepVertices=getfieldvalue(options,'KeepVertices',1);
-bamg_options.MaximalAngleOfCorner=getfieldvalue(options,'MaximalAngleOfCorner',10);
+bamg_options.MaxCornerAngle=getfieldvalue(options,'MaxCornerAngle',10);
 bamg_options.maxnbv=getfieldvalue(options,'maxnbv',10^6);
 bamg_options.maxsubdiv=getfieldvalue(options,'maxsubdiv',10);
@@ -289 +289 @@
 bamg_options.Metrictype=getfieldvalue(options,'Metrictype',0);
 bamg_options.nbjacobi=getfieldvalue(options,'nbjacobi',1);
-bamg_options.NbSmooth=getfieldvalue(options,'NbSmooth',3);
+bamg_options.nbsmooth=getfieldvalue(options,'nbsmooth',3);
 bamg_options.omega=getfieldvalue(options,'omega',1.8);
 bamg_options.power=getfieldvalue(options,'power',1);
@@ -307 +307 @@
 md.y=bamgmesh_out.Vertices(:,2);
 md.elements=bamgmesh_out.Triangles(:,1:3);
-md.edges=bamgmesh_out.ElementEdges;
-md.segments=bamgmesh_out.Segments(:,1:3);
-md.segmentmarkers=bamgmesh_out.Segments(:,4);
+md.edges=bamgmesh_out.IssmEdges;
+md.segments=bamgmesh_out.IssmSegments(:,1:3);
+md.segmentmarkers=bamgmesh_out.IssmSegments(:,4);
 
 %Fill in rest of fields:

issm/trunk/src/m/classes/public/mesh/meshconvert.m ¶

@@ -31 +31 @@
 md.y=bamgmesh_out.Vertices(:,2);
 md.elements=bamgmesh_out.Triangles(:,1:3);
-md.edges=bamgmesh_out.ElementEdges;
-md.segments=bamgmesh_out.Segments(:,1:3);
-md.segmentmarkers=bamgmesh_out.Segments(:,4);
+md.edges=bamgmesh_out.IssmEdges;
+md.segments=bamgmesh_out.IssmSegments(:,1:3);
+md.segmentmarkers=bamgmesh_out.IssmSegments(:,4);
 
 %Fill in rest of fields: