diff --git a/models/GreyscaleModel.cpp b/models/GreyscaleModel.cpp index 11d92c80..c28c88c5 100644 --- a/models/GreyscaleModel.cpp +++ b/models/GreyscaleModel.cpp @@ -261,8 +261,7 @@ void ScaLBL_GreyscaleModel::AssignComponentLabels(double *Porosity, double *Perm // Set Dm to match Mask for (int i=0; iid[i] = Mask->id[i]; - for (int idx=0; idxComm.sumReduce(label_count[idx]); - + for (int idx=0; idxComm, label_count[idx]); //Initialize a weighted porosity after considering grey voxels GreyPorosity=0.0; for (unsigned int idx=0; idxComm); //MPI_Allreduce(&count_loc,&count,1,MPI_DOUBLE,MPI_SUM,Mask->Comm); - vax = Mask->Comm.sumReduce( vax_loc ); - vay = Mask->Comm.sumReduce( vay_loc ); - vaz = Mask->Comm.sumReduce( vaz_loc ); - count = Mask->Comm.sumReduce( count_loc ); + vax = sumReduce( Mask->Comm, vax_loc); + vay = sumReduce( Mask->Comm, vay_loc); + vaz = sumReduce( Mask->Comm, vaz_loc); + count = sumReduce( Mask->Comm, count_loc); vax /= count; vay /= count; @@ -634,10 +633,10 @@ void ScaLBL_GreyscaleModel::Run(){ double As = Morphology.A(); double Hs = Morphology.H(); double Xs = Morphology.X(); - Vs = Dm->Comm.sumReduce( Vs); - As = Dm->Comm.sumReduce( As); - Hs = Dm->Comm.sumReduce( Hs); - Xs = Dm->Comm.sumReduce( Xs); + Vs = sumReduce( Dm->Comm, Vs); + As = sumReduce( Dm->Comm, As); + Hs = sumReduce( Dm->Comm, Hs); + Xs = sumReduce( Dm->Comm, Xs); double h = Dm->voxel_length; //double absperm = h*h*mu*Mask->Porosity()*flow_rate / force_mag;