Skip to content
Snippets Groups Projects
Commit 34d2219f authored by Jean-François Remacle's avatar Jean-François Remacle
Browse files

*** empty log message ***

parent 95c9d5f3
Branches
Tags
No related merge requests found
No preview for this file type
......@@ -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
......
......
// $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)
{
......@@ -381,6 +381,8 @@ int MeshDiscreteSurface(Surface *s)
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,
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 ++;
......
......
// $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
//
......@@ -90,6 +90,8 @@ static double integrate(int nbList, List_T *list, int dim,
{
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;
double res = 0.;
......@@ -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)
......
......
File changed. Contains only whitespace changes. Show whitespace changes.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment