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

Revert "null constructor for MInkowski"

Browse Source 
This reverts commit c4e5fde6ac.
This commit is contained in:
James E McClure
2018-09-16 02:27:47 -04:00
parent d762383d55
commit b0d98a78ed
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
analysis/Minkowski.h
View File

@@ -47,7 +47,6 @@ public:
//........................................................................... //...........................................................................
Minkowski(std::shared_ptr <Domain> Dm); Minkowski(std::shared_ptr <Domain> Dm);
Minkowski(){};
~Minkowski(); ~Minkowski();
void ComputeScalar(const DoubleArray Field, const double isovalue); void ComputeScalar(const DoubleArray Field, const double isovalue);
void PrintAll(); void PrintAll();

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