From 070d8e2d31a55ad980db7f9f960fbfdddfd60a86 Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Tue, 28 Aug 2012 08:52:10 +0000
Subject: [PATCH] added nacca0012 test case modified voronoi generation
interface in order to allow online definition of points with python
---
Mesh/periodical.cpp | 13 +++++++++++++
Mesh/periodical.h | 1 +
2 files changed, 14 insertions(+)
diff --git a/Mesh/periodical.cpp b/Mesh/periodical.cpp
index 9e28645033..a48996fff7 100644
--- a/Mesh/periodical.cpp
+++ b/Mesh/periodical.cpp
@@ -101,6 +101,15 @@ void voroMetal3D::execute(GRegion* gr){
execute(vertices2);
}
+void voroMetal3D::execute(std::vector<double>& vertices){
+ std::vector<SPoint3> pts;
+ for (unsigned int i=0;i<vertices.size()/3;i++){
+ SPoint3 pp (vertices[3*i],vertices[3*i+1],vertices[3*i+2]);
+ pts.push_back(pp);
+ }
+ execute(pts);
+}
+
void voroMetal3D::execute(std::vector<SPoint3>& vertices)
{
#if defined(HAVE_VORO3D)
@@ -147,6 +156,10 @@ void voroMetal3D::execute(std::vector<SPoint3>& vertices)
}
delta = 0.2*(max_x - min_x);
+ min_x=min_y=min_z = 0;
+ max_x=max_y=max_z = 1;
+ delta = 0;
+
container cont(min_x-delta,max_x+delta,min_y-delta,max_y+delta,min_z-delta,max_z+delta,6,6,6,true,true,true,vertices.size());
for(i=0;i<vertices.size();i++){
diff --git a/Mesh/periodical.h b/Mesh/periodical.h
index 3cc0a76bb7..5804394730 100644
--- a/Mesh/periodical.h
+++ b/Mesh/periodical.h
@@ -17,6 +17,7 @@ class voroMetal3D{
void execute();
void execute(GRegion*);
void execute(std::vector<SPoint3>&);
+ void execute(std::vector<double>&);
void print_segment(SPoint3,SPoint3,std::ofstream&);
void initialize_counter();
void increase_counter();
--
GitLab