*** empty log message ***

Mesh/BDS.h

@@ -643,7 +643,7 @@ class BDS_Mesh
     void color_plane_surf ( double eps , int nb);
     void reverseEngineerCAD ( ) ;
     void createSearchStructures ( ) ;
-    int adapt_mesh(double,bool smooth = false,BDS_Mesh *geom = 0); 
+    int adapt_mesh(double,double, double,bool smooth = false,BDS_Mesh *geom = 0); 
     void compute_metric_edge_lengths (const BDS_Metric & metric);
     void cleanup();
     // io's 

Mesh/DiscreteSurface.cpp

-// $Id: DiscreteSurface.cpp,v 1.29 2005-10-27 15:06:26 remacle Exp $
+// $Id: DiscreteSurface.cpp,v 1.30 2005-10-28 08:31:00 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -345,8 +345,8 @@ void BDS_To_Mesh(Mesh *m)
 
 int ReMesh(Mesh *M)
 {
-  if(M->status != 2) return 0;
   printf("status %d\n",M->status);
+  if(M->status != 2) return 0;
 
   if (!M->bds)
     {
@@ -380,8 +380,10 @@ int MeshDiscreteSurface(Surface *s)
     if(!THEM->bds_mesh){
       THEM->bds_mesh = new BDS_Mesh (*(THEM->bds));
       int iter = 0;
-      while(iter < NITER && THEM->bds_mesh->adapt_mesh(CTX.mesh.lc_factor * THEM->bds->LC, 
-						    true, THEM->bds)){
+      while(iter < NITER && THEM->bds_mesh->adapt_mesh(CTX.mesh.lc_factor * THEM->bds->LC,
+						       CTX.mesh.min_elem_size_fact,
+						       CTX.mesh.nb_elem_per_rc,
+						       true, THEM->bds)){
 	Msg(STATUS2, "Iteration %2d/%d done (%d triangles)\n",iter, NITER,THEM->bds_mesh->triangles.size());
 	iter ++;
       }

Plugin/Integrate.cpp

-// $Id: Integrate.cpp,v 1.15 2005-10-27 15:06:42 remacle Exp $
+// $Id: Integrate.cpp,v 1.16 2005-10-28 08:31:00 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -89,6 +89,8 @@ static double integrate(int nbList, List_T *list, int dim,
 			int nbNod, int nbComp, int step)
 {
   if(!nbList) return 0.;
+
+  printf("dim = %d nbComp = %d nbNod = %d nbList = %d\n",dim,nbComp,nbNod,nbList);
   
   const int levelsetPositive = (int)IntegrateOptions_Number[0].def;
   
@@ -110,6 +112,9 @@ static double integrate(int nbList, List_T *list, int dim,
 	res += element->integrateLevelsetPositive(v);
     }
     else if(nbComp == 3){
+
+      printf("coucouc\n");
+
       if(dim == 1)
 	res += element->integrateCirculation(v);
       else if(dim == 2)

Plugin/ShapeFunctions.h

@@ -163,7 +163,7 @@ public:
       getGaussPoint(i, u, v, w, weight);
       double det = getJacobian(u, v, w, jac);
       double d = interpolate(val, u, v, w, stride);
-      //      if(d<0) printf("error %g %g %g %g %g %g %g %g %g\n",d,u,v,w,jac,val[0],val[1],val[2],val[3]);
+      //if(d<0) printf("error %g %g %g %g %g %g %g %g %g\n",d,u,v,w,jac,val[0],val[1],val[2],val[3]);
       sum += d * weight * det;
     }
     return sum;