diff --git a/analysis/Minkowski.h b/analysis/Minkowski.h index 7c1e138d..bfa43797 100644 --- a/analysis/Minkowski.h +++ b/analysis/Minkowski.h @@ -47,6 +47,7 @@ public: //........................................................................... Minkowski(std::shared_ptr Dm); + Minkowski(){}; ~Minkowski(); void ComputeScalar(const DoubleArray Field, const double isovalue); void PrintAll(); diff --git a/analysis/TwoPhase.cpp b/analysis/TwoPhase.cpp index 87fe08ac..a64bcc69 100644 --- a/analysis/TwoPhase.cpp +++ b/analysis/TwoPhase.cpp @@ -98,8 +98,8 @@ TwoPhase::TwoPhase(std::shared_ptr 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; } } }