poking at MF issue
This commit is contained in:
parent
00d1f36867
commit
91cf379e86
|
@ -162,9 +162,6 @@ void Minkowski::MeasureObject() {
|
|||
*/
|
||||
//DoubleArray smooth_distance(Nx,Ny,Nz);
|
||||
|
||||
|
||||
fillHalo<double> fillData(Dm->Comm, Dm->rank_info, {Nx-2,Ny-2,Nz-2}, {1, 1, 1}, 0, 1);
|
||||
|
||||
for (int k = 0; k < Nz; k++) {
|
||||
for (int j = 0; j < Ny; j++) {
|
||||
for (int i = 0; i < Nx; i++) {
|
||||
|
@ -173,7 +170,7 @@ void Minkowski::MeasureObject() {
|
|||
}
|
||||
}
|
||||
CalcDist(distance, id, *Dm);
|
||||
fillData.fill(distance);
|
||||
Dm->CommunicateMeshHalo(distance);
|
||||
|
||||
//Mean3D(distance,smooth_distance);
|
||||
//Eikonal(distance, id, *Dm, 20, {true, true, true});
|
||||
|
@ -186,7 +183,7 @@ void Minkowski::MeasureObject(double factor, const DoubleArray &Phi) {
|
|||
*
|
||||
* THIS ALGORITHM ASSUMES THAT id() is populated with phase id to distinguish objects
|
||||
* 0 - labels the object
|
||||
* 1 - labels the rest of the
|
||||
* 1 - labels the rest
|
||||
*/
|
||||
for (int k = 0; k < Nz; k++) {
|
||||
for (int j = 0; j < Ny; j++) {
|
||||
|
|
|
@ -595,7 +595,7 @@ void SubPhase::Full() {
|
|||
for (j = 0; j < Ny; j++) {
|
||||
for (i = 0; i < Nx; i++) {
|
||||
n = k * Nx * Ny + j * Nx + i;
|
||||
if (!(Dm->id[n] > 0)) {
|
||||
if (SDs(n) <= 0.0) {
|
||||
// Solid phase
|
||||
morph_n->id(i, j, k) = 1;
|
||||
|
||||
|
@ -642,7 +642,7 @@ void SubPhase::Full() {
|
|||
for (j = 0; j < Ny; j++) {
|
||||
for (i = 0; i < Nx; i++) {
|
||||
n = k * Nx * Ny + j * Nx + i;
|
||||
if (!(Dm->id[n] > 0)) {
|
||||
if (SDs(n) <= 0.0) {
|
||||
// Solid phase
|
||||
morph_w->id(i, j, k) = 1;
|
||||
|
||||
|
@ -688,7 +688,7 @@ void SubPhase::Full() {
|
|||
for (j = 0; j < Ny; j++) {
|
||||
for (i = 0; i < Nx; i++) {
|
||||
n = k * Nx * Ny + j * Nx + i;
|
||||
if (!(Dm->id[n] > 0)) {
|
||||
if (SDs(n) <= 0.0) {
|
||||
// Solid phase
|
||||
morph_i->id(i, j, k) = 1;
|
||||
} else if (DelPhi(n) > 1e-4) {
|
||||
|
@ -731,7 +731,7 @@ void SubPhase::Full() {
|
|||
for (i = imin; i < Nx - 1; i++) {
|
||||
n = k * Nx * Ny + j * Nx + i;
|
||||
// Compute volume averages
|
||||
if (Dm->id[n] > 0) {
|
||||
if (SDs(n) > 0.0) {
|
||||
// compute density
|
||||
double nA = Rho_n(n);
|
||||
double nB = Rho_w(n);
|
||||
|
|
|
@ -168,6 +168,7 @@ int main(int argc, char **argv)
|
|||
// Averages->Reduce();
|
||||
|
||||
Object->MeasureObject();
|
||||
//Object->MeasureConnectedPathway();
|
||||
double Vi = Object->V();
|
||||
double Ai = Object->A();
|
||||
double Hi = Object->H();
|
||||
|
|
Loading…
Reference in New Issue
Block a user