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

Fixing bugs in SSO

Browse Source
This commit is contained in:
James E McClure 2015-06-04 06:58:28 -04:00
parent 34765d92c2
commit 24a11aa45a
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/Domain.h
View File

@ -34,7 +34,6 @@ struct Domain{
BlobLabel.resize(Nx,Ny,Nz);
BlobGraph.resize(18,MAX_BLOB_COUNT,MAX_BLOB_COUNT);
BoundaryCondition = BC;
rank_info = RankInfoStruct(rank,nprocx,nprocy,nprocz);
}
~Domain();
@ -45,7 +44,6 @@ struct Domain{
double Lx,Ly,Lz,Volume;
int rank;
int BoundaryCondition;
RankInfoStruct rank_info;
MPI_Group Group; // Group of processors associated with this domain
MPI_Comm Comm; // MPI Communicator for this domain
@ -803,8 +801,8 @@ inline void SSO(DoubleArray &Distance, char *ID, Domain &Dm, int timesteps){
for (q=0; q<Q; q++){
weights[q] = sqrt(1.0*(D3Q27[q][0]*D3Q27[q][0]) + 1.0*(D3Q27[q][1]*D3Q27[q][1]) + 1.0*(D3Q27[q][2]*D3Q27[q][2]));
}
fillHalo<double> fillData(Dm.rank_info,Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,1,1,1,0,1);
const RankInfoStruct rank_info(rank,nprocx,nprocy,nprocz);
fillHalo<double> fillData(rank_info,Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,1,1,1,0,1);
int count = 0;
while (count < timesteps){

1
tests/TestSegDist.cpp
View File

@ -44,6 +44,7 @@ int main(int argc, char **argv)
// Get the rank info
Domain Dm(nx,ny,nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BC);
nx+=2; ny+=2; nz+=2;
int count = 0;

1
tests/TestTwoPhase.cpp
View File

@ -106,7 +106,6 @@ int main(int argc, char **argv)
Averages.PrintAll(timestep);
//....................................................................
if (rank==0){
FILE *PHASE;
PHASE = fopen("Phase.00000","wb");