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

Updated ink bottle example to support two different tube radii

Browse Source
This commit is contained in:
James E McClure 2017-10-13 13:52:00 -04:00
parent d6bbd7e6c3
commit cc10c0c46e
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/lbpm_inkbottle_pp.cpp
View File

@ -38,19 +38,23 @@ int main(int argc, char **argv)
MPI_Request req1[18],req2[18]; MPI_Request req1[18],req2[18];
MPI_Status stat1[18],stat2[18]; MPI_Status stat1[18],stat2[18];
double TubeRadius =15.0; double UpperTubeRadius =15.0;
double LowerTubeRadius =15.0;
int BC; int BC;
int BubbleTop,BubbleBottom; int BubbleTop,BubbleBottom;
double BulbRadius; double BulbRadius;
TubeRadius=strtod(argv[1],NULL); LowerTubeRadius=strtod(argv[1],NULL);
BC=atoi(argv[2]); LowerTubeRadius=strtod(argv[2],NULL);
BubbleBottom = atoi(argv[3]); BulbRadius=strtod(argv[3],NULL);
BubbleTop = atoi(argv[4]); BubbleBottom = atoi(argv[4]);
BulbRadius=strtod(argv[5],NULL); BubbleTop = atoi(argv[5]);
BC=0;
if (rank == 0){ if (rank == 0){
printf("********************************************************\n"); printf("********************************************************\n");
printf("Generate ink bottle geometry with tube radius = %f voxels, bulb radius %f voxels \n",TubeRadius,BulbRadius); printf("Generate ink bottle geometry");
printf( " lower tube radius = %f, upper tube radius=%f, bulb radius %f voxels \n",LowerTubeRadius,UpperTubeRadius,BulbRadius);
printf("********************************************************\n"); printf("********************************************************\n");
} }
@ -158,12 +162,17 @@ int main(int argc, char **argv)
for (i=0;i<Nx;i++){ for (i=0;i<Nx;i++){
n = k*Nx*Ny + j*Nz + i; n = k*Nx*Ny + j*Nz + i;
// Cylindrical capillary tube aligned with the z direction // Cylindrical capillary tube aligned with the z direction
Averages.SDs(i,j,k) = TubeRadius-sqrt(1.0*((i-Nx/2)*(i-Nx/2) if (k<Nz/2)
Averages.SDs(i,j,k) = LowerTubeRadius-sqrt(1.0*((i-Nx/2)*(i-Nx/2)
+ (j-Ny/2)*(j-Ny/2)));
else
Averages.SDs(i,j,k) = UpperTubeRadius-sqrt(1.0*((i-Nx/2)*(i-Nx/2)
+ (j-Ny/2)*(j-Ny/2))); + (j-Ny/2)*(j-Ny/2)));
BulbDist = BulbRadius-sqrt(1.0*((i-Nx/2)*(i-Nx/2)+ (j-Ny/2)*(j-Ny/2) + (k-Nz/2)*(k-Nz/2))); BulbDist = BulbRadius-sqrt(1.0*((i-Nx/2)*(i-Nx/2)+ (j-Ny/2)*(j-Ny/2) + (k-Nz/2)*(k-Nz/2)));
if (BulbDist > Averages.SDs(i,j,k)) Averages.SDs(i,j,k) = BulbDist; if (BulbDist > Averages.SDs(i,j,k)) Averages.SDs(i,j,k) = BulbDist;
// Initialize phase positions // Initialize phase positions
if (Averages.SDs(i,j,k) < 0.0){ if (Averages.SDs(i,j,k) < 0.0){
id[n] = 0; id[n] = 0;