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

refactor Minkowski

Browse Source
This commit is contained in:
James E McClure 2018-07-30 13:58:17 -04:00
parent 71f71799fd
commit f48cd05fa2
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
analysis/Minkowski.cpp
View File

@ -149,11 +149,9 @@ void Minkowski::ComputeLocal()
// Compute volume averages // Compute volume averages
for (int p=0;p<8;p++){ for (int p=0;p<8;p++){
n = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny; 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
// 1-D index for this cube corner if ( SDn(i+cube[p][0],j+cube[p][1],k+cube[p][2]) < 0 ){
if ( SDn(i+cube[p][0],j+cube[p][1],k+cube[p][2]) < 0 ){ vol_n += 0.125;
vol_n += 0.125;
}
} }
} }

4
models/MRTModel.cpp
View File

@ -180,13 +180,13 @@ void ScaLBL_MRTModel::Run(){
void ScaLBL_MRTModel::VelocityField(double *VELOCITY){ void ScaLBL_MRTModel::VelocityField(double *VELOCITY){
Minkowski Morphology(Mask); Minkowski Morphology(Mask);
int SIZE=Np*sizeof(double); int SIZE=Np*sizeof(double);
ScaLBL_D3Q19_Momentum(fq,Velocity, Np); ScaLBL_D3Q19_Momentum(fq,Velocity, Np);
ScaLBL_DeviceBarrier(); MPI_Barrier(comm); ScaLBL_DeviceBarrier(); MPI_Barrier(comm);
ScaLBL_CopyToHost(&VELOCITY[0],&Velocity[0],3*SIZE); 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.Initialize();
Morphology.UpdateMeshValues(); Morphology.UpdateMeshValues();
Morphology.ComputeLocal(); Morphology.ComputeLocal();