OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add geometric test for 3D topo

Browse Source
This commit is contained in:
James McClure
2019-05-22 17:21:25 -06:00
parent d1cec4fb9b
commit 06ecb0db4e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/TestTopo3D.cpp
View File

@@ -125,15 +125,15 @@ int main(int argc, char **argv)
z = Dm->kproc()*(Nz-2)+k - CZ -0.1;
//..............................................................................
if (x >= 0 && y>=0){
if (x <= 0 || y<=0) {
// Single torus
Object.distance(i,j,k) = sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z) - R2;
}
else {
double d1 = R2-sqrt(x*x +(y-R1)*(y-R1) + z*z);
double d2 = R2-sqrt((x-R1)*(x-R1)+y*y + z*z);
Object.distance(i,j,k) = max(d1,d2);
}
else{
// Single torus
Object.distance(i,j,k) = sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z) - R2;
}
if (Object.distance(i,j,k) > 0.0){
Dm->id[n] = 2;
@@ -200,15 +200,15 @@ int main(int argc, char **argv)
//..............................................................................
// Bowl
if (z <= 0 ){
if (z > 0 ){
Object.distance(i,j,k) = sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z) - R2;
}
else
{
double d1 = sqrt(x*x+y*y+z*z)-(R1-R2);
double d2 = R-sqrt(x*x+y*y+z*z);
Object.distance(i,j,k) = min(d1,d2);
}
else{
Object.distance(i,j,k) = sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z) - R2;
}
if (Object.distance(i,j,k) > 0.0){
Dm->id[n] = 2;
Object.id(i,j,k) = 2;