hexahedra

Mesh/directions3D.cpp

@@ -100,12 +100,12 @@ void Frame_field::init_face(GFace* gf){
     for(j=0;j<element->getNumVertices();j++){
       vertex = element->getVertex(j);
 
-	  if(gf->geomType()==GEntity::CompoundSurface){
+	  /*if(gf->geomType()==GEntity::CompoundSurface){
 	    ok = translate(gf,octree,vertex,SPoint2(average_x,average_y),v1,v2);
 	  }
-	  else{
+	  else{*/
 	    ok = improved_translate(gf,vertex,v1,v2);
-	  }
+	  //}
 
       if(ok){
 	v1.normalize();

Mesh/meshGFaceLloyd.cpp

@@ -327,6 +327,8 @@ void callback(const alglib::real_1d_array& x,double& func,alglib::real_1d_array&
       obj.get_gauss();
       obj.eval(*pointer,gradients,energy,p);
       func = energy;
+	  //obj.print_voronoi1();
+	  //obj.print_voronoi2();
 	}
   }
 
@@ -600,7 +602,7 @@ void smoothing::optimize_model(){
   for(it=model->firstFace();it!=model->lastFace();it++)
   {
     gf = *it;
-	if(gf->getNumMeshElements()>0 /*&& gf->geomType()==GEntity::CompoundSurface*/){
+	if(gf->getNumMeshElements()>0 /*&& gf->tag()==114*/ /*&& gf->geomType()==GEntity::CompoundSurface*/){
 	  optimize_face(gf);
 	  //recombineIntoQuads(gf,1,1);
 	}
@@ -1232,7 +1234,14 @@ void lpcvt::print_voronoi1(){
 	p1 = v1.get_point();
 	p2 = v2.get_point();
 	p3 = v3.get_point();
-	print_segment(p2,p3,file);
+	//print_segment(p2,p3,file);
+	metric m = it->get_metric(); //Modification
+	double h = it->get_h(0,0); //Modification
+	double x = (p1.x() + p2.x() + p3.x())/3.0; //Modification
+	double y = (p1.y() + p2.y() + p3.y())/3.0; //Modification
+	double k = 0.4; //Modification
+	print_segment(SPoint2(x,y),SPoint2(x+k*h*m.get_a(),y+k*h*m.get_b()),file); //Modification
+	print_segment(SPoint2(x,y),SPoint2(x+k*h*m.get_c(),y+k*h*m.get_d()),file); //Modification
   }
   file << "};\n";
 }