diff --git a/analysis/Minkowski.cpp b/analysis/Minkowski.cpp index e76cdf49..f6f1d074 100644 --- a/analysis/Minkowski.cpp +++ b/analysis/Minkowski.cpp @@ -149,11 +149,9 @@ void Minkowski::ComputeLocal() // Compute volume averages for (int p=0;p<8;p++){ n = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny; - if ( Dm->id[n] != 0 ){ - // 1-D index for this cube corner - if ( SDn(i+cube[p][0],j+cube[p][1],k+cube[p][2]) < 0 ){ - vol_n += 0.125; - } + // 1-D index for this cube corner + if ( SDn(i+cube[p][0],j+cube[p][1],k+cube[p][2]) < 0 ){ + vol_n += 0.125; } } diff --git a/models/MRTModel.cpp b/models/MRTModel.cpp index ec94363c..33b2f429 100644 --- a/models/MRTModel.cpp +++ b/models/MRTModel.cpp @@ -180,13 +180,13 @@ void ScaLBL_MRTModel::Run(){ void ScaLBL_MRTModel::VelocityField(double *VELOCITY){ - Minkowski Morphology(Mask); + Minkowski Morphology(Mask); int SIZE=Np*sizeof(double); ScaLBL_D3Q19_Momentum(fq,Velocity, Np); ScaLBL_DeviceBarrier(); MPI_Barrier(comm); ScaLBL_CopyToHost(&VELOCITY[0],&Velocity[0],3*SIZE); - - memcpy(Morphology.SDn.data(), Distance.data(), N*sizeof(double)); + + memcpy(Morphology.SDn.data(), Distance.data(), Nx*Ny*Nz*sizeof(double)); Morphology.Initialize(); Morphology.UpdateMeshValues(); Morphology.ComputeLocal();