From 9193b0253cdb99a94513a82d1aad0a9bbe44e2a8 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 19 Dec 2011 10:16:05 +0000
Subject: [PATCH] moving to netgen svn

---
 CMakeLists.txt        | 4 ++--
 Fltk/onelabWindow.cpp | 2 +-
 Mesh/meshGRegion.cpp  | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db807ff4e5..7712dedd99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -535,9 +535,9 @@ if(HAVE_MESH)
   if(ENABLE_NETGEN)
     add_subdirectory(contrib/Netgen)
     include_directories(contrib/Netgen contrib/Netgen/libsrc/include 
-                        contrib/Netgen/libsrc/interface)
+                        contrib/Netgen/nglib)
     set_config_option(HAVE_NETGEN "Netgen")
-    add_definitions(-DNO_PARALLEL_THREADS)
+    add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
   endif(ENABLE_NETGEN)
 
   if(ENABLE_BAMG)
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 859c4fba1e..2f2f896edb 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -724,7 +724,7 @@ static void onelab_add_solver_cb(Fl_Widget *w, void *data)
 {
   for(int i = 0; i < 5; i++){
     if(opt_solver_name(i, GMSH_GET, "").empty()){
-      const char *name = fl_input("Solver name:", "");
+      const char *name = fl_input("Client name:", "");
       if(name){
         FlGui::instance()->onelab->addSolver(name, "", i);
       }
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 296e607ffa..94b332e328 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -585,15 +585,14 @@ void MeshDelaunayVolume(std::vector<GRegion*> &regions)
 #if defined(HAVE_NETGEN)
 
 namespace nglib {
-#include "nglib.h"
-#include "nglib_addon.h"
+#include "nglib_gmsh.h"
 }
 using namespace nglib;
 
 Ng_Mesh *buildNetgenStructure(GRegion *gr, bool importVolumeMesh,
                               std::vector<MVertex*> &numberedV)
 {
-  NgAddOn_Init();
+  Ng_Init();
   Ng_Mesh *ngmesh = Ng_NewMesh();
 
   std::set<MVertex*> allBoundingVertices;
@@ -880,7 +879,7 @@ void meshGRegion::operator() (GRegion *gr)
     meshNormalsPointOutOfTheRegion(gr);
     std::vector<MVertex*> numberedV;
     Ng_Mesh *ngmesh = buildNetgenStructure(gr, false, numberedV);
-    NgAddOn_GenerateVolumeMesh(ngmesh, CTX::instance()->mesh.lcMax);
+    Ng_GenerateVolumeMesh(ngmesh, CTX::instance()->mesh.lcMax);
     TransferVolumeMesh(gr, ngmesh, numberedV);
     Ng_DeleteMesh(ngmesh);
     Ng_Exit();
@@ -910,7 +909,7 @@ void optimizeMeshGRegionNetgen::operator() (GRegion *gr)
   deMeshGRegion dem;
   dem(gr);
   // optimize mesh
-  NgAddOn_OptimizeVolumeMesh(ngmesh, CTX::instance()->mesh.lcMax);
+  Ng_OptimizeVolumeMesh(ngmesh, CTX::instance()->mesh.lcMax);
   TransferVolumeMesh(gr, ngmesh, numberedV);
   Ng_DeleteMesh(ngmesh);
   Ng_Exit();
-- 
GitLab