From 20cdfcd49c2cd1415948ef3205f2cf0ccf14e552 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Sun, 1 Oct 2017 09:21:28 -0400 Subject: [PATCH] updated ink botle case (works) --- tests/lbpm_inkbottle_pp.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/lbpm_inkbottle_pp.cpp b/tests/lbpm_inkbottle_pp.cpp index c67cb4c0..cbcb5ec8 100644 --- a/tests/lbpm_inkbottle_pp.cpp +++ b/tests/lbpm_inkbottle_pp.cpp @@ -41,12 +41,12 @@ int main(int argc, char **argv) double TubeRadius =15.0; int BC; int BubbleTop,BubbleBottom; - int BulbRadius; + double BulbRadius; TubeRadius=strtod(argv[1],NULL); BC=atoi(argv[2]); BubbleBottom = atoi(argv[3]); BubbleTop = atoi(argv[4]); - BulbRadius = atoi(argv[5]); + BulbRadius=strtod(argv[5],NULL); if (rank == 0){ printf("********************************************************\n"); @@ -161,10 +161,9 @@ int main(int argc, char **argv) Averages.SDs(i,j,k) = TubeRadius-sqrt(1.0*((i-Nx/2)*(i-Nx/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 if (Averages.SDs(i,j,k) < 0.0){ id[n] = 0;