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

fix compile without bfgs

parent 91955411
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <sstream> #include <sstream>
#include <iterator> #include <iterator>
#include <string.h> #include <string.h>
#include "GmshConfig.h"
#include "OptHOM.h" #include "OptHOM.h"
#include "OptHomRun.h" #include "OptHomRun.h"
#include "GModel.h" #include "GModel.h"
...@@ -15,6 +16,8 @@ ...@@ -15,6 +16,8 @@
#include "OS.h" #include "OS.h"
#include <stack> #include <stack>
#if defined(HAVE_BFGS)
double distMaxStraight(MElement *el) double distMaxStraight(MElement *el)
{ {
const polynomialBasis *lagrange = (polynomialBasis*)el->getFunctionSpace(); const polynomialBasis *lagrange = (polynomialBasis*)el->getFunctionSpace();
...@@ -534,8 +537,11 @@ static void optimizeOneByOne ...@@ -534,8 +537,11 @@ static void optimizeOneByOne
} }
} }
#endif
void HighOrderMeshOptimizer(GModel *gm, OptHomParameters &p) void HighOrderMeshOptimizer(GModel *gm, OptHomParameters &p)
{ {
#if defined(HAVE_BFGS)
double t1 = Cpu(); double t1 = Cpu();
int samples = 30; int samples = 30;
...@@ -583,4 +589,7 @@ void HighOrderMeshOptimizer(GModel *gm, OptHomParameters &p) ...@@ -583,4 +589,7 @@ void HighOrderMeshOptimizer(GModel *gm, OptHomParameters &p)
p.CPU = t2-t1; p.CPU = t2-t1;
Msg::StatusBar(true, "Done optimizing high order mesh (%g s)", p.CPU); Msg::StatusBar(true, "Done optimizing high order mesh (%g s)", p.CPU);
#else
Msg::Error("High-order mesh optimizer requires BFGS");
#endif
} }
...@@ -62,7 +62,7 @@ ENDMACRO(SWIG_GET_WRAPPER_DEPENDENCIES) ...@@ -62,7 +62,7 @@ ENDMACRO(SWIG_GET_WRAPPER_DEPENDENCIES)
option(ENABLE_PYTHON_LIB_API "Export all C header files needed to build the python library" OFF) option(ENABLE_PYTHON_LIB_API "Export all C header files needed to build the python library" OFF)
if(ENABLE_PYTHON_LIB_API) if(ENABLE_PYTHON_LIB_API)
set(GMSH_API ${GMSH_API} Geo/Curvature.h Mesh/Generator.h Mesh/highOrderTools.h set(GMSH_API ${GMSH_API} Geo/Curvature.h Mesh/Generator.h
Mesh/meshGFaceLloyd.h Numeric/DivideAndConquer.h Post/PViewFactory.h Mesh/meshGFaceLloyd.h Numeric/DivideAndConquer.h Post/PViewFactory.h
Solver/linearSystemPETSc.h Fltk/FlGui.h Solver/functionSpace.h Solver/linearSystemPETSc.h Fltk/FlGui.h Solver/functionSpace.h
Solver/STensor43.h Solver/sparsityPattern.h Solver/SElement.h Solver/STensor43.h Solver/sparsityPattern.h Solver/SElement.h
...@@ -132,12 +132,12 @@ set (GMSH_PYTHON_EXTRA_INCLUDE ...@@ -132,12 +132,12 @@ set (GMSH_PYTHON_EXTRA_INCLUDE
Geo/GeomMeshMatcher.h Geo/GeomMeshMatcher.h
Geo/GFaceCompound.h Geo/GFaceCompound.h
Geo/gmshLevelset.h Geo/gmshLevelset.h
Mesh/highOrderTools.h
Numeric/jacobiPolynomials.h Numeric/jacobiPolynomials.h
Numeric/legendrePolynomials.h Numeric/legendrePolynomials.h
Solver/linearSystemPETSc.h Solver/linearSystemPETSc.h
Mesh/meshGFaceLloyd.h Mesh/meshGFaceLloyd.h
contrib/HighOrderMeshOptimizer/OptHomRun.h contrib/HighOrderMeshOptimizer/OptHomRun.h
contrib/HighOrderMeshOptimizer/OptHomElastic.h
Post/PViewAsSimpleFunction.h Post/PViewAsSimpleFunction.h
Post/PViewFactory.h Post/PViewFactory.h
Numeric/pyramidalBasis.h Numeric/pyramidalBasis.h
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment