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

null constructor for MInkowski

Browse Source
This commit is contained in:
James E McClure
2018-09-15 21:01:34 -04:00
parent 4b66b0dbed
commit c4e5fde6ac
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
analysis/TwoPhase.cpp
View File

@@ -98,8 +98,8 @@ TwoPhase::TwoPhase(std::shared_ptr <Domain> dm):
Vel_y.resize(Nx,Ny,Nz); Vel_y.fill(0);
Vel_z.resize(Nx,Ny,Nz); Vel_z.fill(0);
wet_morph = new Minkowski(dm));
nonwet_morph = new Minkowski(dm));
wet_morph = Minkowski(Dm);
nonwet_morph = Minkowski(Dm);
//.........................................
// Allocate cube storage space
@@ -558,7 +558,7 @@ void TwoPhase::ComputeLocal()
n = k*Nx*Ny+j*Nx+i;
if (!(Dm->id[n] > 0)){
// Solid phase
phase_labels(i,j,k) = 0;
phase_label(i,j,k) = 0;
}
else if (SDn(i,j,k) < 0.0){
// wetting phase
@@ -566,9 +566,9 @@ void TwoPhase::ComputeLocal()
}
else {
// non-wetting phase
phase_labels(i,j,k) = 0;
phase_label(i,j,k) = 0;
}
phase_distance(Nx,Ny,Nz) =2.0*double(phase_labels(i,j,k))-1.0;
phase_distance(Nx,Ny,Nz) =2.0*double(phase_label(i,j,k))-1.0;
}
}
}
@@ -582,7 +582,7 @@ void TwoPhase::ComputeLocal()
n = k*Nx*Ny+j*Nx+i;
if (!(Dm->id[n] > 0)){
// Solid phase
phase_labels(i,j,k) = 0;
phase_label(i,j,k) = 0;
}
else if (SDn(i,j,k) < 0.0){
// wetting phase
@@ -590,9 +590,9 @@ void TwoPhase::ComputeLocal()
}
else {
// non-wetting phase
phase_labels(i,j,k) = 1;
phase_label(i,j,k) = 1;
}
phase_distance(Nx,Ny,Nz) =2.0*double(phase_labels(i,j,k))-1.0;
phase_distance(Nx,Ny,Nz) =2.0*double(phase_label(i,j,k))-1.0;
}
}
}