From 18dd0ab6f24d97903b6349fa4b1519beee35182f Mon Sep 17 00:00:00 2001
From: Tristan Carrier Baudouin <tristan.carrier@uclouvain.be>
Date: Wed, 14 Sep 2011 09:31:27 +0000
Subject: [PATCH] changes
---
Mesh/Levy3D.cpp | 32 +++++++++++++++++++++++++++++++-
Mesh/Levy3D.h | 8 +++++++-
Mesh/meshGRegion.cpp | 4 ++--
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/Mesh/Levy3D.cpp b/Mesh/Levy3D.cpp
index 1fa845254e..798eb68686 100755
--- a/Mesh/Levy3D.cpp
+++ b/Mesh/Levy3D.cpp
@@ -979,13 +979,21 @@ void LpSmoother::improve_model(){
void LpSmoother::improve_region(GRegion* gr){
int i;
int j;
+ double epsg;
+ double epsf;
+ double epsx;
MVertex* vertex;
MElement* element;
MElementOctree* octree;
deMeshGRegion deleter;
+ double initial_conditions[2];
std::set<MVertex*> all_vertices;
std::vector<MVertex*> interior_vertices;
std::set<MVertex*>::iterator it;
+ alglib::ae_int_t maxits;
+ alglib::minlbfgsstate state;
+ alglib::minlbfgsreport rep;
+ alglib::real_1d_array x;
for(i=0;i<gr->getNumMeshElements();i++){
element = gr->getMeshElement(i);
@@ -997,17 +1005,33 @@ void LpSmoother::improve_region(GRegion* gr){
octree = new MElementOctree(gr->model());
+ epsg = 0;
+ epsf = 0;
+ epsx = 0;
+ maxits = max_iter;
+
+ initial_conditions[0] = 12.0;
+ initial_conditions[1] = 37.0;
+ x.setcontent(2,initial_conditions);
+
+ minlbfgscreate(2,1,x,state);
+ minlbfgssetcond(state,epsg,epsf,epsx,maxits);
+ minlbfgsoptimize(state,call_back,NULL,NULL);
+ minlbfgsresults(state,x,rep);
+ printf("%f %f\n",x[0],x[1]);
+
for(it=all_vertices.begin();it!=all_vertices.end();it++){
if((*it)->onWhat()->dim()==3){
interior_vertices.push_back(*it);
}
}
+ printf("%d\n",interior_vertices.size());
deleter(gr);
//std::vector<GRegion*> regions;
//regions.push_back(gr);
//meshGRegion mesher(regions);
- //mesher(gr);
+ //mesher(gr);
}
/*********functions*********/
@@ -1018,3 +1042,9 @@ bool inside_domain(MElementOctree* octree,double x,double y,double z){
if(element!=NULL) return 1;
else return 0;
}
+
+void call_back(const alglib::real_1d_array& x,double& func,alglib::real_1d_array& grad,void* ptr){
+ func = pow_int(3.0-x[0],2) + pow_int(4.0-x[1],2);
+ grad[0] = -2.0*(3.0-x[0]);
+ grad[1] = -2.0*(4.0-x[1]);
+}
diff --git a/Mesh/Levy3D.h b/Mesh/Levy3D.h
index 4c739371bf..012409b85b 100755
--- a/Mesh/Levy3D.h
+++ b/Mesh/Levy3D.h
@@ -3,6 +3,11 @@
#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*********/
@@ -150,4 +155,5 @@ class LpSmoother{
/*********functions*********/
-bool inside_domain(MElementOctree*,double,double,double);
\ No newline at end of file
+bool inside_domain(MElementOctree*,double,double,double);
+void call_back(const alglib::real_1d_array&,double&,alglib::real_1d_array&,void*);
\ No newline at end of file
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index ccff85541d..73cd67ddaa 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -823,8 +823,8 @@ void meshNormalsPointOutOfTheRegion(GRegion *gr)
// fclose(fp);
}
-void meshGRegion::operator() (GRegion *gr)
-{
+void meshGRegion::operator() (GRegion *gr)
+{
gr->model()->setCurrentMeshEntity(gr);
if(gr->geomType() == GEntity::DiscreteVolume) return;
--
GitLab