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

how neatly he spreads his claws

Browse Source
This commit is contained in:
James E McClure
2018-05-21 07:13:18 -04:00
parent b0bb1e3680
commit 71b9c88177
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CMakeLists.txt
View File

@@ -48,7 +48,7 @@ ADD_LBPM_TEST( TestColorGradDFH )
ADD_LBPM_TEST( TestBubbleDFH ../example/Bubble/input.db)
ADD_LBPM_TEST( TestColorMassBounceback ../example/Bubble/input.db)
ADD_LBPM_TEST( TestPressVel ../example/Piston/input.db)
ADD_LBPM_TEST( TestPoiseuille ../example/Piston/input.db)
ADD_LBPM_TEST( TestPoiseuille ../example/Piston/poiseuille.db)
ADD_LBPM_TEST( TestForceMoments ../example/Piston/input.db)
ADD_LBPM_TEST( TestForceD3Q19 )
ADD_LBPM_TEST( TestMomentsD3Q19 )

21
tests/TestColorSquareTube.cpp
View File

@@ -8,7 +8,7 @@
#include <fstream>
#include "common/ScaLBL.h"
#include "common/MPI_Helpers.h"
#include "models/ColorModel.h"
std::shared_ptr<Database> loadInputs( int nprocs )
{
@@ -39,7 +39,18 @@ std::shared_ptr<Database> loadInputs( int nprocs )
return db;
}
void InitSquareTube(ScaLBL_ColorModel &ColorModel){
void InitializeSquareTube(ScaLBL_ColorModel &ColorModel){
int i,j,k,n;
int rank = ColorModel.Mask->rank();
int Nx = ColorModel.Mask->Nx;
int Ny = ColorModel.Mask->Ny;
int Nz = ColorModel.Mask->Nz;
int nprocx = ColorModel.Mask->rank_info.nx;
int nprocy = ColorModel.Mask->rank_info.ny;
int iproc = ColorModel.Mask->rank_info.ix;
int jproc = ColorModel.Mask->rank_info.jy;
int kproc = ColorModel.Mask->rank_info.kz;
for (k=0;k<Nz;k++){
for (j=0;j<Ny;j++){
for (i=0;i<Nx;i++){
@@ -48,10 +59,6 @@ void InitSquareTube(ScaLBL_ColorModel &ColorModel){
}
}
}
int kproc = rank/(nprocx*nprocy);
int jproc = (rank-nprocx*nprocy*kproc)/nprocx;
int iproc = rank-nprocx*nprocy*kproc-nprocx*jproc;
printf("rank=%i, %i,%i,%i \n",rank,iproc,jproc,kproc);
// Initialize a square tube
for (k=1;k<Nz-1;k++){
@@ -86,7 +93,7 @@ int main(int argc, char **argv)
MPI_Comm comm = MPI_COMM_WORLD;
MPI_Comm_rank(comm,&rank);
MPI_Comm_size(comm,&nprocs);
int check;
int check=0;
{
if (rank == 0){
printf("********************************************************\n");