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

poking at MF issue

Browse Source
This commit is contained in:
James McClure 2022-03-08 22:13:48 -05:00
parent 00d1f36867
commit 91cf379e86
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
analysis/Minkowski.cpp
View File

@ -162,9 +162,6 @@ void Minkowski::MeasureObject() {
*/ */
//DoubleArray smooth_distance(Nx,Ny,Nz); //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 k = 0; k < Nz; k++) {
for (int j = 0; j < Ny; j++) { for (int j = 0; j < Ny; j++) {
for (int i = 0; i < Nx; i++) { for (int i = 0; i < Nx; i++) {
@ -173,7 +170,7 @@ void Minkowski::MeasureObject() {
} }
} }
CalcDist(distance, id, *Dm); CalcDist(distance, id, *Dm);
fillData.fill(distance); Dm->CommunicateMeshHalo(distance);
//Mean3D(distance,smooth_distance); //Mean3D(distance,smooth_distance);
//Eikonal(distance, id, *Dm, 20, {true, true, true}); //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 * THIS ALGORITHM ASSUMES THAT id() is populated with phase id to distinguish objects
* 0 - labels the object * 0 - labels the object
* 1 - labels the rest of the * 1 - labels the rest
*/ */
for (int k = 0; k < Nz; k++) { for (int k = 0; k < Nz; k++) {
for (int j = 0; j < Ny; j++) { for (int j = 0; j < Ny; j++) {

8
analysis/SubPhase.cpp
View File

@ -595,7 +595,7 @@ void SubPhase::Full() {
for (j = 0; j < Ny; j++) { for (j = 0; j < Ny; j++) {
for (i = 0; i < Nx; i++) { for (i = 0; i < Nx; i++) {
n = k * Nx * Ny + j * Nx + i; n = k * Nx * Ny + j * Nx + i;
if (!(Dm->id[n] > 0)) { if (SDs(n) <= 0.0) {
// Solid phase // Solid phase
morph_n->id(i, j, k) = 1; morph_n->id(i, j, k) = 1;
@ -642,7 +642,7 @@ void SubPhase::Full() {
for (j = 0; j < Ny; j++) { for (j = 0; j < Ny; j++) {
for (i = 0; i < Nx; i++) { for (i = 0; i < Nx; i++) {
n = k * Nx * Ny + j * Nx + i; n = k * Nx * Ny + j * Nx + i;
if (!(Dm->id[n] > 0)) { if (SDs(n) <= 0.0) {
// Solid phase // Solid phase
morph_w->id(i, j, k) = 1; morph_w->id(i, j, k) = 1;
@ -688,7 +688,7 @@ void SubPhase::Full() {
for (j = 0; j < Ny; j++) { for (j = 0; j < Ny; j++) {
for (i = 0; i < Nx; i++) { for (i = 0; i < Nx; i++) {
n = k * Nx * Ny + j * Nx + i; n = k * Nx * Ny + j * Nx + i;
if (!(Dm->id[n] > 0)) { if (SDs(n) <= 0.0) {
// Solid phase // Solid phase
morph_i->id(i, j, k) = 1; morph_i->id(i, j, k) = 1;
} else if (DelPhi(n) > 1e-4) { } else if (DelPhi(n) > 1e-4) {
@ -731,7 +731,7 @@ void SubPhase::Full() {
for (i = imin; i < Nx - 1; i++) { for (i = imin; i < Nx - 1; i++) {
n = k * Nx * Ny + j * Nx + i; n = k * Nx * Ny + j * Nx + i;
// Compute volume averages // Compute volume averages
if (Dm->id[n] > 0) { if (SDs(n) > 0.0) {
// compute density // compute density
double nA = Rho_n(n); double nA = Rho_n(n);
double nB = Rho_w(n); double nB = Rho_w(n);

1
tests/TestTorus.cpp
View File

@ -168,6 +168,7 @@ int main(int argc, char **argv)
// Averages->Reduce(); // Averages->Reduce();
Object->MeasureObject(); Object->MeasureObject();
//Object->MeasureConnectedPathway();
double Vi = Object->V(); double Vi = Object->V();
double Ai = Object->A(); double Ai = Object->A();
double Hi = Object->H(); double Hi = Object->H();