From cc10c0c46eae174f20de47e9b8f4766a1ca93ef3 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 13 Oct 2017 13:52:00 -0400 Subject: [PATCH] Updated ink bottle example to support two different tube radii --- tests/lbpm_inkbottle_pp.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/tests/lbpm_inkbottle_pp.cpp b/tests/lbpm_inkbottle_pp.cpp index cbcb5ec8..78cb74fb 100644 --- a/tests/lbpm_inkbottle_pp.cpp +++ b/tests/lbpm_inkbottle_pp.cpp @@ -38,19 +38,23 @@ int main(int argc, char **argv) MPI_Request req1[18],req2[18]; MPI_Status stat1[18],stat2[18]; - double TubeRadius =15.0; + double UpperTubeRadius =15.0; + double LowerTubeRadius =15.0; int BC; int BubbleTop,BubbleBottom; double BulbRadius; - TubeRadius=strtod(argv[1],NULL); - BC=atoi(argv[2]); - BubbleBottom = atoi(argv[3]); - BubbleTop = atoi(argv[4]); - BulbRadius=strtod(argv[5],NULL); + LowerTubeRadius=strtod(argv[1],NULL); + LowerTubeRadius=strtod(argv[2],NULL); + BulbRadius=strtod(argv[3],NULL); + BubbleBottom = atoi(argv[4]); + BubbleTop = atoi(argv[5]); + + BC=0; if (rank == 0){ 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"); } @@ -158,12 +162,17 @@ int main(int argc, char **argv) for (i=0;i Averages.SDs(i,j,k)) Averages.SDs(i,j,k) = BulbDist; + // Initialize phase positions if (Averages.SDs(i,j,k) < 0.0){ id[n] = 0;