diff --git a/analysis/Minkowski.cpp b/analysis/Minkowski.cpp index 665f52b9..2e1e0f85 100644 --- a/analysis/Minkowski.cpp +++ b/analysis/Minkowski.cpp @@ -73,9 +73,9 @@ void Minkowski::ComputeScalar(const DoubleArray& Field, const double isovalue) //int Nx = Field.size(0); //int Ny = Field.size(1); //int Nz = Field.size(2); - for (int k=1; k db ) if (rank_info.kz < nproc[2]-1) outlet_layers_z = 0; // Fill remaining variables N = Nx*Ny*Nz; - Volume = nx*ny*nx*nproc[0]*nproc[1]*nproc[2]*1.0; + Volume = nx*ny*nz*nproc[0]*nproc[1]*nproc[2]*1.0; if (myrank==0) printf("voxel length = %f micron \n", voxel_length); @@ -281,8 +281,8 @@ void Domain::Decomp( const std::string& Filename ) outlet_layers_x = 0; outlet_layers_y = 0; outlet_layers_z = 0; - inlet_layers_phase=1; - outlet_layers_phase=2; + inlet_layers_phase=1; + outlet_layers_phase=2; checkerSize = 32; // Read domain parameters diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 1e6b4ea7..c02a268c 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -869,8 +869,8 @@ void ScaLBL_ColorModel::Run(){ double pB = Averages->gwb.p; double pAc = Averages->gnc.p; double pBc = Averages->gwc.p; - double pAB = (pA-pB)/(h*5.796*alpha); - double pAB_connected = (pAc-pBc)/(h*5.796*alpha); + double pAB = (pA-pB)/(h*6.0*alpha); + double pAB_connected = (pAc-pBc)/(h*6.0*alpha); // connected contribution double Vol_nc = Averages->gnc.V/Dm->Volume; double Vol_wc = Averages->gwc.V/Dm->Volume; diff --git a/tests/TestTorus.cpp b/tests/TestTorus.cpp index 2d486774..0cad888a 100644 --- a/tests/TestTorus.cpp +++ b/tests/TestTorus.cpp @@ -63,6 +63,8 @@ int main(int argc, char **argv) auto Dm = std::make_shared(db,comm); // const RankInfoStruct rank_info(rank,nprocx,nprocy,nprocz); auto Averages = std::make_shared(Dm); + auto Object = std::make_shared(Dm); + Nx += 2; Ny += 2; Nz += 2; @@ -124,9 +126,11 @@ int main(int argc, char **argv) //Averages->Phase(i,j,k) = - Averages->Phase(i,j,k); if (Averages->Phase(i,j,k) > 0.0){ Dm->id[n] = 2; + Object->id(i,j,k) = 1; } else{ Dm->id[n] = 1; + Object->id(i,j,k) = 0; } Averages->SDn(i,j,k) = Averages->Phase(i,j,k); Averages->Phase(i,j,k) = Averages->SDn(i,j,k); @@ -163,6 +167,17 @@ int main(int argc, char **argv) Averages->Reduce(); Averages->PrintAll(int(5)); // Averages->Reduce(); + + Object->MeasureObject(); + double Vi = Object->V(); + double Ai = Object->A(); + double Hi = Object->H(); + double Xi = Object->X(); + Vi=sumReduce( Dm->Comm, Vi); + Ai=sumReduce( Dm->Comm, Ai); + Hi=sumReduce( Dm->Comm, Hi); + Xi=sumReduce( Dm->Comm, Xi); + printf("Vi=%f, Ai=%f, Hi=%f, Xi=%f \n", Vi,Ai,Hi,Xi); } // Limit scope so variables that contain communicators will free before MPI_Finialize MPI_Barrier(comm);