Index: /issm/trunk/src/c/io/WriteData.cpp =================================================================== --- /issm/trunk/src/c/io/WriteData.cpp (revision 5090) +++ /issm/trunk/src/c/io/WriteData.cpp (revision 5091) @@ -167,6 +167,6 @@ fnames[++i] = "Vertices"; fsize[i][0]=bm->VerticesSize[0]; fsize[i][1]=bm->VerticesSize[1]; fpointer[i]=&bm->Vertices; fnames[++i] = "Edges"; fsize[i][0]=bm->EdgesSize[0]; fsize[i][1]=bm->EdgesSize[1]; fpointer[i]=&bm->Edges; - fnames[++i] = "Segments"; fsize[i][0]=bm->SegmentsSize[0]; fsize[i][1]=bm->SegmentsSize[1]; fpointer[i]=&bm->Segments; - fnames[++i] = "ElementEdges"; fsize[i][0]=bm->ElementEdgesSize[0]; fsize[i][1]=bm->ElementEdgesSize[1]; fpointer[i]=&bm->ElementEdges; + fnames[++i] = "IssmSegments"; fsize[i][0]=bm->IssmSegmentsSize[0]; fsize[i][1]=bm->IssmSegmentsSize[1]; fpointer[i]=&bm->IssmSegments; + fnames[++i] = "IssmEdges"; fsize[i][0]=bm->IssmEdgesSize[0]; fsize[i][1]=bm->IssmEdgesSize[1]; fpointer[i]=&bm->IssmEdges; fnames[++i] = "Quadrilaterals"; fsize[i][0]=bm->QuadrilateralsSize[0]; fsize[i][1]=bm->QuadrilateralsSize[1]; fpointer[i]=&bm->Quadrilaterals; fnames[++i] = "VerticesOnGeometricVertex";fsize[i][0]=bm->VerticesOnGeometricVertexSize[0]; fsize[i][1]=bm->VerticesOnGeometricVertexSize[1];fpointer[i]=&bm->VerticesOnGeometricVertex; Index: /issm/trunk/src/c/modules/Bamgx/Bamgx.cpp =================================================================== --- /issm/trunk/src/c/modules/Bamgx/Bamgx.cpp (revision 5090) +++ /issm/trunk/src/c/modules/Bamgx/Bamgx.cpp (revision 5091) @@ -17,5 +17,5 @@ double coef; int verbosity; - int NbSmooth; + int nbsmooth; /*intermediary*/ @@ -24,21 +24,17 @@ double costheta=2; double hminaniso=1e-100; - Triangles* Thr=NULL; Triangles* Thb=NULL; /*Bamg options*/ - NbSmooth=bamgopts->NbSmooth; - coef=bamgopts->coef; - maxnbv=bamgopts->maxnbv; + nbsmooth =bamgopts->nbsmooth; + coef =bamgopts->coeff; + maxnbv =bamgopts->maxnbv; verbosity=bamgopts->verbose; // no metric -> no smoothing - if (bamgopts->metric==NULL){ - NbSmooth=0; - } + if (bamgopts->metric==NULL) nbsmooth=0; /*If no mesh in input, generate one*/ - if(bamgmesh_in->TrianglesSize[0]==0){ /*Mesh generation {{{1*/ @@ -87,5 +83,4 @@ /*}}}*/ } - else{ /*Anisotropic mesh adaptation {{{1*/ @@ -185,5 +180,5 @@ //Smooth vertices - if(NbSmooth>0) Th.SmoothingVertex(NbSmooth,bamgopts->omega); + if(nbsmooth>0) Th.SmoothingVertex(nbsmooth,bamgopts->omega); //display info Index: /issm/trunk/src/c/objects/Bamg/BamgGeom.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/BamgGeom.cpp (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/BamgGeom.cpp (revision 5091) @@ -8,5 +8,4 @@ bamggeom->hVertices=NULL; bamggeom->MetricVertices=NULL; - bamggeom->h1h2VpVertices=NULL; bamggeom->TangentAtEdgesSize[0]=0, bamggeom->TangentAtEdgesSize[1]=0; bamggeom->TangentAtEdges=NULL; bamggeom->CornersSize[0]=0, bamggeom->CornersSize[1]=0; bamggeom->Corners=NULL; Index: /issm/trunk/src/c/objects/Bamg/BamgGeom.h =================================================================== --- /issm/trunk/src/c/objects/Bamg/BamgGeom.h (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/BamgGeom.h (revision 5091) @@ -15,5 +15,4 @@ double* hVertices; double* MetricVertices; - double* h1h2VpVertices; int TangentAtEdgesSize[2]; Index: /issm/trunk/src/c/objects/Bamg/BamgMesh.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/BamgMesh.cpp (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/BamgMesh.cpp (revision 5091) @@ -4,9 +4,7 @@ void BamgMeshInit(BamgMesh* bamgmesh){ - bamgmesh->TrianglesSize[0]=0, bamgmesh->TrianglesSize[1]=0; bamgmesh->Triangles=NULL; bamgmesh->VerticesSize[0]=0, bamgmesh->VerticesSize[1]=0; bamgmesh->Vertices=NULL; bamgmesh->EdgesSize[0]=0, bamgmesh->EdgesSize[1]=0; bamgmesh->Edges=NULL; - bamgmesh->ElementEdgesSize[0]=0, bamgmesh->ElementEdgesSize[1]=0; bamgmesh->ElementEdges=NULL; - bamgmesh->SegmentsSize[0]=0, bamgmesh->SegmentsSize[1]=0; bamgmesh->Segments=NULL; + bamgmesh->TrianglesSize[0]=0, bamgmesh->TrianglesSize[1]=0; bamgmesh->Triangles=NULL; bamgmesh->QuadrilateralsSize[0]=0,bamgmesh->QuadrilateralsSize[1]=0; bamgmesh->Quadrilaterals=NULL; bamgmesh->VerticesOnGeometricVertexSize[0]=0, bamgmesh->VerticesOnGeometricVertexSize[1]=0;bamgmesh->VerticesOnGeometricVertex=NULL; @@ -16,4 +14,6 @@ bamgmesh->SubDomainsFromGeomSize[0]=0, bamgmesh->SubDomainsFromGeomSize[1]=0; bamgmesh->SubDomainsFromGeom=NULL; bamgmesh->hVertices=NULL; + bamgmesh->IssmEdgesSize[0]=0, bamgmesh->IssmEdgesSize[1]=0; bamgmesh->IssmEdges=NULL; + bamgmesh->IssmSegmentsSize[0]=0, bamgmesh->IssmSegmentsSize[1]=0; bamgmesh->IssmSegments=NULL; bamgmesh->ElementConnectivitySize[0]=0, bamgmesh->ElementConnectivitySize[1]=0; bamgmesh->ElementConnectivity=NULL; bamgmesh->NodalConnectivitySize[0]=0, bamgmesh->NodalConnectivitySize[1]=0; bamgmesh->NodalConnectivity=NULL; Index: /issm/trunk/src/c/objects/Bamg/BamgMesh.h =================================================================== --- /issm/trunk/src/c/objects/Bamg/BamgMesh.h (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/BamgMesh.h (revision 5091) @@ -7,7 +7,5 @@ struct BamgMesh{ - int TrianglesSize[2]; - double* Triangles; - + /*Bamg input/output*/ int VerticesSize[2]; double* Vertices; @@ -16,9 +14,6 @@ double* Edges; - int ElementEdgesSize[2]; - double* ElementEdges; - - int SegmentsSize[2]; - double* Segments; + int TrianglesSize[2]; + double* Triangles; int QuadrilateralsSize[2]; @@ -40,5 +35,18 @@ double* SubDomainsFromGeom; + int CrackedVerticesSize[2]; + double* CrackedVertices; + + int CrackedEdgesSize[2]; + double* CrackedEdges; + double* hVertices; + + /*Output for ISSM*/ + int IssmEdgesSize[2]; + double* IssmEdges; + + int IssmSegmentsSize[2]; + double* IssmSegments; int ElementConnectivitySize[2]; @@ -51,9 +59,4 @@ double* NodalElementConnectivity; - int CrackedVerticesSize[2]; - double* CrackedVertices; - - int CrackedEdgesSize[2]; - double* CrackedEdges; }; Index: /issm/trunk/src/c/objects/Bamg/BamgOpts.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/BamgOpts.cpp (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/BamgOpts.cpp (revision 5091) @@ -8,5 +8,5 @@ bamgopts->iso=0; bamgopts->maxnbv=0; - bamgopts->MaximalAngleOfCorner=0; + bamgopts->MaxCornerAngle=0; bamgopts->Hessiantype=0; bamgopts->Metrictype=0; @@ -16,5 +16,5 @@ bamgopts->power=0; bamgopts->anisomax=0; - bamgopts->NbSmooth=0; + bamgopts->nbsmooth=0; bamgopts->nbjacobi=0; bamgopts->omega=0; @@ -30,5 +30,5 @@ bamgopts->err=NULL; bamgopts->errg=0; - bamgopts->coef=0; + bamgopts->coeff=0; bamgopts->metric=NULL; bamgopts->field=NULL; @@ -41,5 +41,5 @@ int i; - if (bamgopts->coef==0) ISSMERROR("'coef' should be positive"); + if (bamgopts->coeff==0) ISSMERROR("'coeff' should be positive"); if (bamgopts->maxsubdiv<=1) ISSMERROR("'maxsubdiv' should be >1"); if (bamgopts->Crack!=0 && bamgopts->Crack!=1) ISSMERROR("'Crack' supported options are 0 and 1"); @@ -50,5 +50,5 @@ if (bamgopts->nbjacobi<=0) ISSMERROR("'nbjacobi' option should be >0"); if (bamgopts->geometricalmetric!=0 && bamgopts->geometricalmetric!=1) ISSMERROR("'geometricalmetric' supported options are 0 and 1"); - if (bamgopts->NbSmooth<=0) ISSMERROR("'NbSmooth' option should be >0"); + if (bamgopts->nbsmooth<=0) ISSMERROR("'nbsmooth' option should be >0"); if (bamgopts->maxnbv<3) ISSMERROR("'maxnbv' option should be >3"); if (bamgopts->hmin<=0) ISSMERROR("'hmin' option should be >0"); Index: /issm/trunk/src/c/objects/Bamg/BamgOpts.h =================================================================== --- /issm/trunk/src/c/objects/Bamg/BamgOpts.h (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/BamgOpts.h (revision 5091) @@ -10,5 +10,5 @@ int iso; int maxnbv; - double MaximalAngleOfCorner; + double MaxCornerAngle; int Crack; int Hessiantype; @@ -18,5 +18,5 @@ double power; double anisomax; - int NbSmooth; + int nbsmooth; int nbjacobi; double omega; @@ -32,5 +32,5 @@ double* err; double errg; - double coef; + double coeff; double* metric; double* field; Index: /issm/trunk/src/c/objects/Bamg/Geometry.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/Geometry.cpp (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/Geometry.cpp (revision 5091) @@ -43,5 +43,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/~Geometry)*/ - long int verbosity=0; + long int verbose=0; if (NbRef>0){ @@ -203,21 +203,8 @@ } - //h1h2VpVertices - if(bamggeom->h1h2VpVertices){ - if(verbose>5) printf(" processing h1h2VpVertices\n"); - double h1,h2,v1,v2; - for (i=0;i< nbv;i++) { - h1=(double)bamggeom->MetricVertices[i*4+0]; - h2=(double)bamggeom->MetricVertices[i*4+1]; - v1=(double)bamggeom->MetricVertices[i*4+2]; - v2=(double)bamggeom->MetricVertices[i*4+3]; - vertices[i].m = Metric(MatVVP2x2(1/(h1*h1),1/(h2*h2),D2(v1,v2))); - } - } - - //MaximalAngleOfCorner - if (bamgopts->MaximalAngleOfCorner){ - if(verbose>5) printf(" processing MaximalAngleOfCorner\n"); - MaximalAngleOfCorner=bamgopts->MaximalAngleOfCorner*Pi/180; + //MaxCornerAngle + if (bamgopts->MaxCornerAngle){ + if(verbose>5) printf(" processing MaxCornerAngle\n"); + MaxCornerAngle=bamgopts->MaxCornerAngle*Pi/180; } @@ -431,5 +418,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/AfterRead)*/ - long int verbosity=0; + long int verbose=0; long i,j,k; @@ -621,5 +608,5 @@ float angle2= !j2 ? OppositeAngle(eangle[i2]) : eangle[i2]; float da12 = Abs(angle2-angle1); - if (( da12 >= MaximalAngleOfCorner ) && (da12 <= 2*Pi -MaximalAngleOfCorner)) { + if (( da12 >= MaxCornerAngle ) && (da12 <= 2*Pi -MaxCornerAngle)) { vertices[i].SetCorner() ; } @@ -805,5 +792,5 @@ printf(" pmax (x,y): (%g %g)\n",pmax.x,pmax.y); printf(" coefIcoor: %g\n",coefIcoor); - printf(" MaximalAngleOfCorner: %g\n",MaximalAngleOfCorner); + printf(" MaxCornerAngle: %g\n",MaxCornerAngle); return; @@ -829,5 +816,5 @@ // BeginOfCurve=0; subdomains=0; - MaximalAngleOfCorner = 10*Pi/180; + MaxCornerAngle = 10*Pi/180; } /*}}}1*/ Index: /issm/trunk/src/c/objects/Bamg/Geometry.h =================================================================== --- /issm/trunk/src/c/objects/Bamg/Geometry.h (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/Geometry.h (revision 5091) @@ -32,5 +32,5 @@ R2 pmin,pmax; // extrema double coefIcoor; // coef to integer Icoor1; - double MaximalAngleOfCorner; + double MaxCornerAngle; //Constructor/Destructors Index: /issm/trunk/src/c/objects/Bamg/ListofIntersectionTriangles.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/ListofIntersectionTriangles.cpp (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/ListofIntersectionTriangles.cpp (revision 5091) @@ -15,5 +15,5 @@ Triangle *tbegin, *t; - long int verbosity=2; + long int verbose=2; Icoor2 deta[3], deti,detj; double ba[3]; @@ -78,5 +78,5 @@ if (t == tbegin) { // double ba,bb; - long int verbosity=2; + long int verbose=2; TriangleAdjacent edge=CloseBoundaryEdge(a,t,ba,bb); MeshVertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1); Index: /issm/trunk/src/c/objects/Bamg/MeshVertex.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/MeshVertex.cpp (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/MeshVertex.cpp (revision 5091) @@ -123,5 +123,5 @@ double hmin=(bamgopts->hmin); double hmax=(bamgopts->hmax); - double coef=bamgopts->coef; + double coef=bamgopts->coeff; int Metrictype=(bamgopts->Metrictype); Index: /issm/trunk/src/c/objects/Bamg/Triangles.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/Triangles.cpp (revision 5090) +++ /issm/trunk/src/c/objects/Bamg/Triangles.cpp (revision 5091) @@ -225,5 +225,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Triangles)*/ - long int verbosity=2; + long int verbose=2; //if(vertices) delete [] vertices; //TEST crash if not commented if(edges) delete [] edges; @@ -584,5 +584,5 @@ bamgmesh->EdgesSize[0]=nbe; bamgmesh->EdgesSize[1]=3; - int NumSegments=0; + int NumIssmSegments=0; if (nbe){ bamgmesh->Edges=(double*)xmalloc(3*nbe*sizeof(double)); @@ -592,5 +592,5 @@ bamgmesh->Edges[i*3+2]=edges[i].ref; if(edges[i].onGeometry){ - NumSegments++; + NumIssmSegments++; } } @@ -624,7 +624,7 @@ } } - bamgmesh->ElementEdgesSize[0]=edge4->nb(); - bamgmesh->ElementEdgesSize[1]=4; - bamgmesh->ElementEdges=(double*)xmalloc(4*edge4->nb()*sizeof(double)); + bamgmesh->IssmEdgesSize[0]=edge4->nb(); + bamgmesh->IssmEdgesSize[1]=4; + bamgmesh->IssmEdges=(double*)xmalloc(4*edge4->nb()*sizeof(double)); for (i=0;inb();i++){ /*Invert first two vertices if necessary*/ @@ -634,10 +634,10 @@ if (triangles[(int)elemedge[2*i+0]]((j+1)%3)==vertices+edge4->j(i)){ //trigonometric direction - bamgmesh->ElementEdges[i*4+0]=edge4->i(i)+1;// back to M indexing - bamgmesh->ElementEdges[i*4+1]=edge4->j(i)+1;// back to M indexing + bamgmesh->IssmEdges[i*4+0]=edge4->i(i)+1;// back to M indexing + bamgmesh->IssmEdges[i*4+1]=edge4->j(i)+1;// back to M indexing } else{ - bamgmesh->ElementEdges[i*4+0]=edge4->j(i)+1;// back to M indexing - bamgmesh->ElementEdges[i*4+1]=edge4->i(i)+1;// back to M indexing + bamgmesh->IssmEdges[i*4+0]=edge4->j(i)+1;// back to M indexing + bamgmesh->IssmEdges[i*4+1]=edge4->i(i)+1;// back to M indexing } found=true; @@ -646,6 +646,6 @@ } ISSMASSERT(found); - bamgmesh->ElementEdges[i*4+2]=elemedge[2*i+0]+1; // back to M indexing - bamgmesh->ElementEdges[i*4+3]=elemedge[2*i+1]+1; // back to M indexing + bamgmesh->IssmEdges[i*4+2]=elemedge[2*i+0]+1; // back to M indexing + bamgmesh->IssmEdges[i*4+3]=elemedge[2*i+1]+1; // back to M indexing } //clean up @@ -653,9 +653,9 @@ xfree((void**)&elemedge); - /*Segments*/ - if(verbose>5) printf(" writing Segments\n"); - bamgmesh->SegmentsSize[0]=NumSegments; - bamgmesh->SegmentsSize[1]=4; - bamgmesh->Segments=(double*)xmalloc(4*NumSegments*sizeof(double)); + /*IssmSegments*/ + if(verbose>5) printf(" writing IssmSegments\n"); + bamgmesh->IssmSegmentsSize[0]=NumIssmSegments; + bamgmesh->IssmSegmentsSize[1]=4; + bamgmesh->IssmSegments=(double*)xmalloc(4*NumIssmSegments*sizeof(double)); num=0; for (i=0;iSegments[num*4+0]=Number(edges[i][0])+1; //back to M indexing - bamgmesh->Segments[num*4+1]=Number(edges[i][1])+1; //back to M indexing - bamgmesh->Segments[num*4+2]=(int)j/3+1; //back to M indexing - bamgmesh->Segments[num*4+3]=edges[i].ref; + bamgmesh->IssmSegments[num*4+0]=Number(edges[i][0])+1; //back to M indexing + bamgmesh->IssmSegments[num*4+1]=Number(edges[i][1])+1; //back to M indexing + bamgmesh->IssmSegments[num*4+2]=(int)j/3+1; //back to M indexing + bamgmesh->IssmSegments[num*4+3]=edges[i].ref; num+=1; stop=true; @@ -678,8 +678,8 @@ } if (Number(triangles[(int)j/3][(int)((k+2)%3)])==i2){ - bamgmesh->Segments[num*4+0]=Number(edges[i][1])+1; //back to M indexing - bamgmesh->Segments[num*4+1]=Number(edges[i][0])+1; //back to M indexing - bamgmesh->Segments[num*4+2]=(int)j/3+1; //back to M indexing - bamgmesh->Segments[num*4+3]=edges[i].ref; + bamgmesh->IssmSegments[num*4+0]=Number(edges[i][1])+1; //back to M indexing + bamgmesh->IssmSegments[num*4+1]=Number(edges[i][0])+1; //back to M indexing + bamgmesh->IssmSegments[num*4+2]=(int)j/3+1; //back to M indexing + bamgmesh->IssmSegments[num*4+3]=edges[i].ref; num+=1; stop=true; @@ -859,6 +859,6 @@ int* connectivitysize_2=NULL; int connectivitymax_2=0; - i1=bamgmesh->ElementEdgesSize[0]; - i2=bamgmesh->ElementEdgesSize[1]; + i1=bamgmesh->IssmEdgesSize[0]; + i2=bamgmesh->IssmEdgesSize[1]; head_2=(int*)xmalloc(nbv*sizeof(int)); next_2=(int*)xmalloc(2*i1*sizeof(int)); @@ -871,5 +871,5 @@ for (i=0;iElementEdges[i*i2+j]-1; //back to C indexing + int v=(int)bamgmesh->IssmEdges[i*i2+j]-1; //back to C indexing if (k>2*i1-1 || k<0) ISSMERROR("Index exceed matrix dimensions (k=%i not in [0 %i]",k,2*i1-1); next_2[k]=head_2[v]; @@ -892,8 +892,8 @@ for(j=head_2[i];j!=-1;j=next_2[j]){ ISSMASSERT(connectivitymax_2*i+k < connectivitymax_2*nbv); - num=(int)bamgmesh->ElementEdges[int(j/2)*i2+0]; + num=(int)bamgmesh->IssmEdges[int(j/2)*i2+0]; if (i+1==num){ //carefull, ElementEdge is in M indexing //i is the first vertex of the edge, it is therefore connected to the second vertex - bamgmesh->NodalConnectivity[connectivitymax_2*i+k]=bamgmesh->ElementEdges[int(j/2)*i2+1]; + bamgmesh->NodalConnectivity[connectivitymax_2*i+k]=bamgmesh->IssmEdges[int(j/2)*i2+1]; } else{ @@ -948,5 +948,5 @@ double hmin = Max(bamgopts->hmin,MinimalHmin()); double hmax = Min(bamgopts->hmax,MaximalHmax()); - double coef = bamgopts->coef; + double coef = bamgopts->coeff; //for now we only use j==3 @@ -996,5 +996,5 @@ /*Get options*/ - int verbosity=bamgopts->verbose; + int verbose=bamgopts->verbose; double anisomax =bamgopts->anisomax; double errg =bamgopts->errg; @@ -1210,9 +1210,9 @@ /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/BoundAnisotropy)*/ - long int verbosity=0; + long int verbose=0; double lminaniso = 1/ (Max(hminaniso*hminaniso,1e-100)); //display info - if (verbosity > 1) printf(" BoundAnisotropy by %g\n",anisomax); + if (verbose > 1) printf(" BoundAnisotropy by %g\n",anisomax); double h1=1.e30,h2=1e-30; @@ -1229,5 +1229,5 @@ //info to be displayed - if (verbosity>2){ + if (verbose>2){ h1 =Min(h1,Vp.lmin()); h2 =Max(h2,Vp.lmax()); @@ -1240,5 +1240,5 @@ //display info - if (verbosity>2){ + if (verbose>2){ printf(" input: Hmin = %g, Hmax = %g, factor of anisotropy max = %g\n",pow(h2,-0.5),pow(h1,-0.5),pow(rx,0.5)); printf(" output: Hmin = %g, Hmax = %g, factor of anisotropy max = %g\n",pow(hn2,-0.5),pow(hn1,-0.5),pow(rnx,0.5)); @@ -1254,15 +1254,15 @@ /*Intermediary*/ int i,j,k,kk,it,jt; - int verbosity=0; + int verbose=0; double cutoffradian=10*Pi/180; /*Recover options*/ if (bamgopts){ - verbosity=bamgopts->verbose; - cutoffradian=bamgopts->MaximalAngleOfCorner*Pi/180; + verbose=bamgopts->verbose; + cutoffradian=bamgopts->MaxCornerAngle*Pi/180; } //display info - if (verbosity>1) printf(" construction of the geometry from the 2d mesh\n"); + if (verbose>1) printf(" construction of the geometry from the 2d mesh\n"); //check that the mesh is not empty @@ -1271,6 +1271,6 @@ } - //Gh is the geometry of the mesh (this), initialize MaximalAngleOfCorner - if (cutoffradian>=0) Gh.MaximalAngleOfCorner = cutoffradian; + //Gh is the geometry of the mesh (this), initialize MaxCornerAngle + if (cutoffradian>=0) Gh.MaxCornerAngle = cutoffradian; /*Construction of the edges*/ @@ -1337,5 +1337,5 @@ //display info - if(verbosity>5) { + if(verbose>5) { printf(" info on Mesh:\n"); printf(" - number of vertices = %i \n",nbv); @@ -1374,5 +1374,5 @@ //display info - if(verbosity>4) printf(" Construction of the edges %i\n",nbe); + if(verbose>4) printf(" Construction of the edges %i\n",nbe); for (i=0;i 3) printf(" The Number of sub domain = %i\n",NbSubDomains); + if (verbose> 3) printf(" The Number of sub domain = %i\n",NbSubDomains); //build subdomains @@ -1566,5 +1566,5 @@ Gh.NbSubDomains = NbSubDomains; Gh.subdomains = new GeometricalSubDomain[NbSubDomains]; - if (verbosity>3) printf(" number of vertices = %i\n number of edges = %i\n",Gh.nbv,Gh.nbe); + if (verbose>3) printf(" number of vertices = %i\n number of edges = %i\n",Gh.nbv,Gh.nbe); NbVerticesOnGeomVertex = Gh.nbv; VerticesOnGeomVertex = new VertexOnGeom[NbVerticesOnGeomVertex]; @@ -1700,5 +1700,5 @@ double* s=NULL; long nbsol; - int verbosity; + int verbose; int i,j,k,iA,iB,iC; @@ -1706,5 +1706,5 @@ /*Recover options*/ - verbosity=bamgopts->verbose; + verbose=bamgopts->verbose; /*Get and process fields*/ @@ -1731,5 +1731,5 @@ //display infos - if(verbosity>1) { + if(verbose>1) { printf(" Construction of Metric: number of field: %i (nbt=%i, nbv=%i)\n",nbsol,nbt,nbv); } @@ -1804,5 +1804,5 @@ //display info - if(verbosity>2) printf(" Solution %i, Min = %g, Max = %g, Delta = %g\n",nusol,smin,smax,sdelta); + if(verbose>2) printf(" Solution %i, Min = %g, Max = %g, Delta = %g\n",nusol,smin,smax,sdelta); //skip constant field @@ -1904,8 +1904,8 @@ long nbsol; int NbJacobi; - int verbosity; + int verbose; /*Recover options*/ - verbosity=bamgopts->verbose; + verbose=bamgopts->verbose; NbJacobi=bamgopts->nbjacobi; @@ -1930,5 +1930,5 @@ //display infos - if(verbosity>1) { + if(verbose>1) { printf(" Construction of Metric: number of field: %i (nbt=%i, nbv=%i)\n",nbsol,nbt,nbv); } @@ -2014,9 +2014,9 @@ //display info - if(verbosity>2) printf(" Solution %i, Min = %g, Max = %g, Delta = %g, number of fields = %i\n",nusol,smin,smax,sdelta,nbsol); + if(verbose>2) printf(" Solution %i, Min = %g, Max = %g, Delta = %g, number of fields = %i\n",nusol,smin,smax,sdelta,nbsol); //skip constant field if (sdelta < 1.0e-10*Max(absmax,1e-20) ){ - if (verbosity>2) printf(" Solution %i is constant, skipping...\n",nusol); + if (verbose>2) printf(" Solution %i is constant, skipping...\n",nusol); continue; } @@ -2335,10 +2335,10 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ForceBoundary)*/ - long int verbosity=2; + long int verbose=2; int k=0; int nbfe=0,nbswp=0,Nbswap=0; //display - if (verbosity > 2) printf(" ForceBoundary nb of edge: %i\n",nbe); + if (verbose > 2) printf(" ForceBoundary nb of edge: %i\n",nbe); //check that there is no triangle with 0 determinant @@ -2371,5 +2371,5 @@ Nbswap += vertices[j].Optim(1,0); } - if (verbosity > 3) printf(" number of inforced edge = %i, number of swap= %i\n",nbfe,Nbswap); + if (verbose > 3) printf(" number of inforced edge = %i, number of swap= %i\n",nbfe,Nbswap); } /*}}}1*/ @@ -2378,7 +2378,7 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FindSubDomain)*/ - long int verbosity=0; - - if (verbosity >2){ + long int verbose=0; + + if (verbose >2){ if (OutSide) printf(" Find all external sub-domain\n"); else printf(" Find all internal sub-domain\n"); @@ -2525,5 +2525,5 @@ }//while (t) } - if(verbosity>4) printf(" Number of removes subdomains (OutSideMesh) = %i\n",NbSubDomains-j); + if(verbose>4) printf(" Number of removes subdomains (OutSideMesh) = %i\n",NbSubDomains-j); NbSubDomains=j; } @@ -2610,5 +2610,5 @@ if (inew < NbSubDomains) { - if (verbosity>5) printf("WARNING: %i SubDomains are being removed\n",NbSubDomains-inew); + if (verbose>5) printf("WARNING: %i SubDomains are being removed\n",NbSubDomains-inew); NbSubDomains=inew;} @@ -3375,8 +3375,8 @@ /*Get options*/ - long int verbosity=2; + long int verbose=2; //Display info - if (verbosity>2) printf(" Insert initial %i vertices\n",nbv); + if (verbose>2) printf(" Insert initial %i vertices\n",nbv); //Compute integer coordinates and determinants for the existing vertices (from Geometry) @@ -3469,5 +3469,5 @@ long NbSwap=0; - if (verbosity>3) printf(" Begining of insertion process...\n"); + if (verbose>3) printf(" Begining of insertion process...\n"); for (int icount=2; icount3) { + if (verbose>3) { printf(" NbSwap of insertion: %i\n",NbSwap); printf(" NbSwap/nbv: %i\n",NbSwap/nbv); @@ -3506,5 +3506,5 @@ for (int is1=0; is1Optim(0,0); - if (verbosity>3) { + if (verbose>3) { printf(" Optim Loop: %i\n",Nbloop); printf(" NbSwap/nbv: %i\n",NbSwap/nbv); @@ -3521,5 +3521,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/InsertNewPoints)*/ - long int verbosity=0; + long int verbose=0; double seuil= 1.414/2 ;// for two close point long i; @@ -3531,5 +3531,5 @@ //display info if required - if (verbosity>5) printf(" Try to Insert %i new points\n",nbvnew); + if (verbose>5) printf(" Try to Insert %i new points\n",nbvnew); //return if no new points @@ -3580,5 +3580,5 @@ } } - if (verbosity>3) { + if (verbose>3) { printf(" number of new points: %i\n",iv); printf(" number of to close (?) points: %i\n",nbv-iv); @@ -3588,5 +3588,5 @@ for (i=nbvold;i3) printf(" NbSwap=%i\n",NbSwap); + if (verbose>3) printf(" NbSwap=%i\n",NbSwap); NbTSwap += NbSwap ; @@ -3641,10 +3641,10 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/MakeQuadrangles)*/ - long int verbosity=0; - - if (verbosity>2) printf("MakeQuadrangles costheta = %g\n",costheta); + long int verbose=0; + + if (verbose>2) printf("MakeQuadrangles costheta = %g\n",costheta); if (costheta >1) { - if (verbosity>5) printf(" do nothing: costheta > 1\n"); + if (verbose>5) printf(" do nothing: costheta > 1\n"); } @@ -3672,5 +3672,5 @@ } NbOfQuad = kk; - if (verbosity>2){ + if (verbose>2){ printf(" number of quadrilaterals = %i\n",NbOfQuad); printf(" number of triangles = %i\n",nbt-NbOutT- NbOfQuad*2); @@ -3684,5 +3684,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/MakeQuadTree)*/ - long int verbosity=0; + long int verbose=0; if ( !quadtree ) quadtree = new QuadTree(this); @@ -3693,8 +3693,8 @@ /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/MaxSubDivision)*/ - long int verbosity=0; + long int verbose=0; const double maxsubdiv2 = maxsubdiv*maxsubdiv; - if(verbosity>1) printf(" Limit the subdivision of a edges in the new mesh by %g\n",maxsubdiv); + if(verbose>1) printf(" Limit the subdivision of a edges in the new mesh by %g\n",maxsubdiv); // for all the edges // if the len of the edge is to long @@ -3738,5 +3738,5 @@ } } - if(verbosity>3){ + if(verbose>3){ printf(" number of metric changes = %i, maximum number of subdivision of a edges before change = %g\n",nbchange,pow(lmax,0.5)); } @@ -3784,9 +3784,9 @@ /*Recover options*/ - int verbosity=bamgopts->verbose; + int verbose=bamgopts->verbose; /*First, insert old points if requested*/ if (KeepVertices && (&Bh != this) && (nbv+Bh.nbv< nbvx)){ - if (verbosity>5) printf(" Inserting initial mesh points\n"); + if (verbose>5) printf(" Inserting initial mesh points\n"); for (i=0;i5) printf(" Big loop\n"); + if (verbose>5) printf(" Big loop\n"); do { /*Update variables*/ @@ -3894,5 +3894,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/PreInit)*/ - long int verbosity=0; + long int verbose=0; srand(19999999); @@ -4102,5 +4102,5 @@ /*Intermediary*/ - int verbosity=0; + int verbose=0; // generation of the integer coordinate @@ -4108,5 +4108,5 @@ // find extrema coordinates of vertices pmin,pmax long i; - if(verbosity>2) printf(" Reconstruct mesh of %i vertices\n",nbv); + if(verbose>2) printf(" Reconstruct mesh of %i vertices\n",nbv); //initialize ordre @@ -4164,5 +4164,5 @@ //Display info if required - if(verbosity>5) { + if(verbose>5) { printf(" info of Mesh:\n"); printf(" - number of vertices = %i \n",nbv); @@ -4400,5 +4400,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ReNumberingTheTriangleBySubDomain)*/ - long int verbosity=0; + long int verbose=0; long *renu= new long[nbt]; register Triangle *t0,*t,*te=triangles+nbt; @@ -4717,5 +4717,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/SmoothingVertex)*/ - long int verbosity=0; + long int verbose=0; // if quatree exist remove it end reconstruct if (quadtree) delete quadtree; @@ -4736,5 +4736,5 @@ for ( k=0;k2) printf(" SmoothingVertex: nb Iteration = %i, Omega=%g\n",nbiter,omega); + if(verbose>2) printf(" SmoothingVertex: nb Iteration = %i, Omega=%g\n",nbiter,omega); for (k=0;k3) printf(" move max = %g, iteration = %i, nb of swap = %i\n",pow(delta,0.5),k,NbSwap); + if (verbose>3) printf(" move max = %g, iteration = %i, nb of swap = %i\n",pow(delta,0.5),k,NbSwap); } @@ -4759,8 +4759,8 @@ /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/SmoothMetric)*/ - long int verbosity=0; + long int verbose=0; if(raisonmax<1.1) return; - if(verbosity > 1) printf(" Triangles::SmoothMetric raisonmax = %g\n",raisonmax); + if(verbose > 1) printf(" Triangles::SmoothMetric raisonmax = %g\n",raisonmax); ReMakeTriangleContainingTheVertex(); long i,j,kch,kk,ip; @@ -4828,5 +4828,5 @@ Exchange(first_np_or_next_t0,first_np_or_next_t1); } - if(verbosity>2) printf(" number of iterations = %i\n",kch); + if(verbose>2) printf(" number of iterations = %i\n",kch); delete [] first_np_or_next_t0; delete [] first_np_or_next_t1; @@ -4837,5 +4837,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, MeshQuad.cpp/SplitElement)*/ - long int verbosity=0; + long int verbose=0; Direction NoDirOfSearch; @@ -5320,5 +5320,5 @@ ReconstructExistingMesh(); - if (verbosity>2){ + if (verbose>2){ printf(" number of quadrilaterals = %i\n",NbOfQuad); printf(" number of triangles = %i\n",nbt-NbOutT- NbOfQuad*2); @@ -5351,5 +5351,5 @@ long it; long nbvold=nbv; - long int verbosity=2; + long int verbose=2; for (it=0;it3) { + if (verbose>3) { printf(" number of points: %i\n",iv); printf(" number of swap to split internal edges with border vertices: %i\n",NbSwap); @@ -5409,5 +5409,5 @@ } if (NbSplitEdge>nbv-nbvold) printf("WARNING: not enough vertices to split all internal edges, we lost %i edges...\n",NbSplitEdge - ( nbv-nbvold)); -if (verbosity>2) printf("SplitInternalEdgeWithBorderVertices: Number of splited edge %i\n",NbSplitEdge); +if (verbose>2) printf("SplitInternalEdgeWithBorderVertices: Number of splited edge %i\n",NbSplitEdge); return NbSplitEdge; @@ -5418,5 +5418,5 @@ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ConsRefTriangle)*/ - long int verbosity=0; + long int verbose=0; register Triangle *t0,*t; register long k=0, num;