Skip to content
Snippets Groups Projects
Commit 8832ae48 authored by Jose Agustin Arguedas Leiva's avatar Jose Agustin Arguedas Leiva
Browse files

[WIP] working on passing the correct particle system to cylinders

parent 2ad6b526
No related branches found
No related tags found
No related merge requests found
...@@ -82,7 +82,7 @@ public: ...@@ -82,7 +82,7 @@ public:
/* t fixed at 1, find min along s */ /* t fixed at 1, find min along s */
t = 1.0; t = 1.0;
s = t*pq-2.0/this->length*xq; s = t*pq-2.0/this->length*xq;
if( abs(s)>1.0 ) { s = s / abs(s) } if( abs(s)>1.0 ) { s = s / abs(s) ;}
x_dist = this->length*0.5*t*pos_part1[3]-this->length*0.5*s*pos_part2[3]-x; x_dist = this->length*0.5*t*pos_part1[3]-this->length*0.5*s*pos_part2[3]-x;
y_dist = this->length*0.5*t*pos_part1[4]-this->length*0.5*s*pos_part2[4]-y; y_dist = this->length*0.5*t*pos_part1[4]-this->length*0.5*s*pos_part2[4]-y;
z_dist = this->length*0.5*t*pos_part1[5]-this->length*0.5*s*pos_part2[5]-z; z_dist = this->length*0.5*t*pos_part1[5]-this->length*0.5*s*pos_part2[5]-z;
...@@ -90,7 +90,7 @@ public: ...@@ -90,7 +90,7 @@ public:
/* t fixed at -1, find min along s */ /* t fixed at -1, find min along s */
t = -1.0; t = -1.0;
s = t*pq-2.0/this->length*xq; s = t*pq-2.0/this->length*xq;
if( abs(s)>1.0 ) { s = s / abs(s) } if( abs(s)>1.0 ) { s = s / abs(s) ;}
x_dist = this->length*0.5*t*pos_part1[3]-this->length*0.5*s*pos_part2[3]-x; x_dist = this->length*0.5*t*pos_part1[3]-this->length*0.5*s*pos_part2[3]-x;
y_dist = this->length*0.5*t*pos_part1[4]-this->length*0.5*s*pos_part2[4]-y; y_dist = this->length*0.5*t*pos_part1[4]-this->length*0.5*s*pos_part2[4]-y;
z_dist = this->length*0.5*t*pos_part1[5]-this->length*0.5*s*pos_part2[5]-z; z_dist = this->length*0.5*t*pos_part1[5]-this->length*0.5*s*pos_part2[5]-z;
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
/* s fixed at 1, find min along t */ /* s fixed at 1, find min along t */
s = 1.0; s = 1.0;
t = s*pq+2.0/this->length*xp; t = s*pq+2.0/this->length*xp;
if( abs(t)>1.0 ) { t = t / abs(t) } if( abs(t)>1.0 ) { t = t / abs(t) ;}
x_dist = this->length*0.5*t*pos_part1[3]-this->length*0.5*s*pos_part2[3]-x; x_dist = this->length*0.5*t*pos_part1[3]-this->length*0.5*s*pos_part2[3]-x;
y_dist = this->length*0.5*t*pos_part1[4]-this->length*0.5*s*pos_part2[4]-y; y_dist = this->length*0.5*t*pos_part1[4]-this->length*0.5*s*pos_part2[4]-y;
z_dist = this->length*0.5*t*pos_part1[5]-this->length*0.5*s*pos_part2[5]-z; z_dist = this->length*0.5*t*pos_part1[5]-this->length*0.5*s*pos_part2[5]-z;
...@@ -106,7 +106,7 @@ public: ...@@ -106,7 +106,7 @@ public:
/* s fixed at -1, find min along t */ /* s fixed at -1, find min along t */
s = -1.0; s = -1.0;
t = s*pq+2.0/this->length*xp; t = s*pq+2.0/this->length*xp;
if( abs(t)>1.0 ) { t = t / abs(t) } if( abs(t)>1.0 ) { t = t / abs(t) ;}
x_dist = this->length*0.5*t*pos_part1[3]-this->length*0.5*s*pos_part2[3]-x; x_dist = this->length*0.5*t*pos_part1[3]-this->length*0.5*s*pos_part2[3]-x;
y_dist = this->length*0.5*t*pos_part1[4]-this->length*0.5*s*pos_part2[4]-y; y_dist = this->length*0.5*t*pos_part1[4]-this->length*0.5*s*pos_part2[4]-y;
z_dist = this->length*0.5*t*pos_part1[5]-this->length*0.5*s*pos_part2[5]-z; z_dist = this->length*0.5*t*pos_part1[5]-this->length*0.5*s*pos_part2[5]-z;
... ...
......
...@@ -513,6 +513,14 @@ public: ...@@ -513,6 +513,14 @@ public:
p2p_computer_class& getP2PComputer() final{ p2p_computer_class& getP2PComputer() final{
return computer_p2p; return computer_p2p;
} }
const particles_inner_computer_class& getInnerComputer() const{
return computer_particules_inner;
}
particles_inner_computer_class& getInnnerComputer(){
return computer_particules_inner;
}
}; };
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment