Skip to content
Snippets Groups Projects
Commit aa10091c authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

compile fixes

parent 1c4ba1f2
No related branches found
No related tags found
No related merge requests found
......@@ -494,7 +494,6 @@ if(ENABLE_BFGS)
endif(ENABLE_BFGS)
if(ENABLE_RTREE)
add_subdirectory(contrib/rtree)
include_directories(contrib/rtree)
set_config_option(HAVE_RTREE "RTree")
endif(ENABLE_RTREE)
......
......@@ -10,6 +10,12 @@
#if defined(HAVE_BFGS)
#include "ap.h"
#include "alglibinternal.h"
#include "alglibmisc.h"
#include "linalg.h"
#include "optimization.h"
#include "Levy3D.h"
#include "polynomialBasis.h"
#include "GModel.h"
......
......@@ -6,16 +6,14 @@
// Contributor(s):
// Tristan Carrier
#include "SVector3.h"
#ifndef _LEVY3D_H_
#define _LEVY3D_H_
#include <list>
#include "SVector3.h"
#include "fullMatrix.h"
#include "GRegion.h"
#include "MElementOctree.h"
#include "ap.h"
#include "alglibinternal.h"
#include "alglibmisc.h"
#include "linalg.h"
#include "optimization.h"
class VoronoiVertex{
private:
......@@ -127,3 +125,5 @@ class LpSmoother{
static int get_nbr_interior_vertices();
static MVertex* get_interior_vertex(int);
};
#endif
......@@ -887,6 +887,7 @@ void bowyerWatson(GFace *gf)
vSizesBGM, vMetricsBGM, AllTris);
}
}
#if defined(HAVE_ANN)
{
FieldManager *fields = gf->model()->getFields();
BoundaryLayerField *blf = 0;
......@@ -896,6 +897,7 @@ void bowyerWatson(GFace *gf)
if (blf && !blf->iRecombine) quadsToTriangles(gf,10000);
}
}
#endif
transferDataStructure(gf, AllTris, Us, Vs);
}
......@@ -1206,6 +1208,7 @@ void bowyerWatsonFrontal(GFace *gf)
// _printTris (name, AllTris, Us, Vs,true);
transferDataStructure(gf, AllTris, Us, Vs);
// in case of boundary layer meshing
#if defined(HAVE_ANN)
{
FieldManager *fields = gf->model()->getFields();
BoundaryLayerField *blf = 0;
......@@ -1215,6 +1218,7 @@ void bowyerWatsonFrontal(GFace *gf)
if (blf && !blf->iRecombine)quadsToTriangles(gf,10000);
}
}
#endif
}
void optimalPointFrontalQuad (GFace *gf,
......
......@@ -7,6 +7,7 @@
// Tristan Carrier
#include <set>
#include <fstream>
#include "meshGFaceLloyd.h"
#include "DivideAndConquer.h"
#include "GFace.h"
......@@ -16,7 +17,10 @@
#include "Context.h"
#include "meshGFace.h"
#include "BackgroundMesh.h"
#include <fstream>
#include "GmshConfig.h"
#if defined(HAVE_BFGS)
#include "ap.h"
#include "alglibinternal.h"
#include "alglibmisc.h"
......@@ -2148,3 +2152,5 @@ MElementOctree* wrapper::get_octree(){
void wrapper::set_octree(MElementOctree* new_octree){
octree = new_octree;
}
#endif
......@@ -5,15 +5,10 @@
#ifndef _MESH_GFACE_LLOYD_H_
#define _MESH_GFACE_LLOYD_H_
#include <queue>
#include "fullMatrix.h"
#include "DivideAndConquer.h"
#include <queue>
#include "ap.h"
#include "alglibinternal.h"
#include "alglibmisc.h"
#include "linalg.h"
#include "optimization.h"
#include "MElementOctree.h"
class GFace;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment