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

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James E McClure 2018-05-26 07:30:18 -04:00
commit e1ed7a5dfc
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example/Bubble/input.db
View File

@ -10,6 +10,7 @@ Color {
pBC = 0 pBC = 0
din = 1.0 din = 1.0
dout = 1.0 dout = 1.0
flux = 1.0e-3
timestepMax = 200 timestepMax = 200
interval = 1000 interval = 1000
tol = 1e-5; tol = 1e-5;
@ -19,7 +20,7 @@ Color {
Domain { Domain {
nproc = 1, 1, 1 // Number of processors (Npx,Npy,Npz) nproc = 1, 1, 1 // Number of processors (Npx,Npy,Npz)
n = 16, 16, 16 // Size of local domain (Nx,Ny,Nz) n = 80, 80, 80 // Size of local domain (Nx,Ny,Nz)
n_spheres = 1 // Number of spheres n_spheres = 1 // Number of spheres
L = 1, 1, 1 // Length of domain (x,y,z) L = 1, 1, 1 // Length of domain (x,y,z)
BC = 0 // Boundary condition type BC = 0 // Boundary condition type

5
tests/CMakeLists.txt
View File

@ -46,14 +46,13 @@ ADD_LBPM_TEST( TestMap )
#ADD_LBPM_TEST( TestColorGradDFH ) #ADD_LBPM_TEST( TestColorGradDFH )
ADD_LBPM_TEST( TestColorGradDFH ) ADD_LBPM_TEST( TestColorGradDFH )
ADD_LBPM_TEST( TestBubbleDFH ../example/Bubble/input.db) ADD_LBPM_TEST( TestBubbleDFH ../example/Bubble/input.db)
ADD_LBPM_TEST( TestColorMassBounceback ../example/Bubble/input.db) #ADD_LBPM_TEST( TestColorMassBounceback ../example/Bubble/input.db)
ADD_LBPM_TEST( TestPressVel ../example/Piston/input.db) ADD_LBPM_TEST( TestPressVel ../example/Piston/input.db)
ADD_LBPM_TEST( TestPoiseuille ../example/Piston/poiseuille.db) ADD_LBPM_TEST( TestPoiseuille ../example/Piston/poiseuille.db)
ADD_LBPM_TEST( TestForceMoments ../example/Piston/input.db) ADD_LBPM_TEST( TestForceMoments ../example/Piston/input.db)
ADD_LBPM_TEST( TestForceD3Q19 ) ADD_LBPM_TEST( TestForceD3Q19 )
ADD_LBPM_TEST( TestMomentsD3Q19 ) ADD_LBPM_TEST( TestMomentsD3Q19 )
ADD_LBPM_TEST( TestInterfaceSpeed ../example/Bubble/input.db)
ADD_LBPM_TEST( TestInterfaceSpeed ../example/Piston/input.db)
ADD_LBPM_TEST( TestSphereCurvature ) ADD_LBPM_TEST( TestSphereCurvature )
#ADD_LBPM_TEST_1_2_4( TestTwoPhase ) #ADD_LBPM_TEST_1_2_4( TestTwoPhase )
ADD_LBPM_TEST_1_2_4( TestBlobIdentify ) ADD_LBPM_TEST_1_2_4( TestBlobIdentify )

8
tests/TestInterfaceSpeed.cpp
View File

@ -38,7 +38,9 @@ int main (int argc, char *argv[])
std::shared_ptr<Domain> Dm(new Domain(domain_db,comm)); std::shared_ptr<Domain> Dm(new Domain(domain_db,comm));
for (i=0; i<Dm->Nx*Dm->Ny*Dm->Nz; i++) Dm->id[i] = 1; Nx+=2; Ny+=2; Nz+=2;
for (i=0; i<Nx*Ny*Nz; i++) Dm->id[i] = 1;
Dm->CommInit(); Dm->CommInit();
@ -137,11 +139,11 @@ int main (int argc, char *argv[])
toReturn = 5; toReturn = 5;
printf("TestCylinderArea.cpp: error tolerance exceeded for common curve length \n"); printf("TestCylinderArea.cpp: error tolerance exceeded for common curve length \n");
} }
if ( fabs(Averages->vawn_global(2)+0.2) > 0.01){ if ( fabs(Averages->vawn_global(2)+0.25) > 0.01){
printf("TestInterfaceSpeed: Error too high for kinematic velocity of wn interface \n"); printf("TestInterfaceSpeed: Error too high for kinematic velocity of wn interface \n");
toReturn = 6; toReturn = 6;
} }
if ( fabs(Averages->vawns_global(2)+0.2) > 0.01){ if ( fabs(Averages->vawns_global(2)+0.25) > 0.01){
printf("TestInterfaceSpeed: Error too high for kinematic velocity of common curve \n"); printf("TestInterfaceSpeed: Error too high for kinematic velocity of common curve \n");
toReturn = 7; toReturn = 7;
} }