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

updates to dcel

Browse Source
This commit is contained in:
James E McClure
2018-09-17 11:00:20 -04:00
parent 7b372bbd7b c3aa841f26
commit 3271c0d37f
3 changed files with 8 additions and 28 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();

28
analysis/TwoPhase.cpp
View File

@@ -97,10 +97,6 @@ TwoPhase::TwoPhase(std::shared_ptr <Domain> dm):
Vel_x.resize(Nx,Ny,Nz); Vel_x.fill(0); // Gradient of the phase indicator field Vel_x.resize(Nx,Ny,Nz); Vel_x.fill(0); // Gradient of the phase indicator field
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);
nonwet_morph = Minkowski(Dm);
//......................................... //.........................................
// Allocate cube storage space // Allocate cube storage space
CubeValues.resize(2,2,2); CubeValues.resize(2,2,2);
@@ -154,8 +150,7 @@ TwoPhase::TwoPhase(std::shared_ptr <Domain> dm):
fprintf(TIMELOG,"Gnsxx Gnsyy Gnszz Gnsxy Gnsxz Gnsyz "); fprintf(TIMELOG,"Gnsxx Gnsyy Gnszz Gnsxy Gnsxz Gnsyz ");
fprintf(TIMELOG,"trawn trJwn trRwn "); //trimmed curvature, fprintf(TIMELOG,"trawn trJwn trRwn "); //trimmed curvature,
fprintf(TIMELOG,"wwndnw wwnsdnwn Jwnwwndnw "); //kinematic quantities, fprintf(TIMELOG,"wwndnw wwnsdnwn Jwnwwndnw "); //kinematic quantities,
fprintf(TIMELOG,"Vw Jw Aw Xw "); //miknowski measures, fprintf(TIMELOG,"Euler Kn Jn An\n"); //miknowski measures,
fprintf(TIMELOG,"Vn Jn An Xn\n"); //miknowski measures,
} }
NWPLOG = fopen("components.NWP.tcat","a+"); NWPLOG = fopen("components.NWP.tcat","a+");
@@ -184,9 +179,8 @@ TwoPhase::TwoPhase(std::shared_ptr <Domain> dm):
fprintf(TIMELOG,"Gnsxx Gnsyy Gnszz Gnsxy Gnsxz Gnsyz "); fprintf(TIMELOG,"Gnsxx Gnsyy Gnszz Gnsxy Gnsxz Gnsyz ");
fprintf(TIMELOG,"trawn trJwn trRwn "); //trimmed curvature, fprintf(TIMELOG,"trawn trJwn trRwn "); //trimmed curvature,
fprintf(TIMELOG,"wwndnw wwnsdnwn Jwnwwndnw "); //kinematic quantities, fprintf(TIMELOG,"wwndnw wwnsdnwn Jwnwwndnw "); //kinematic quantities,
fprintf(TIMELOG,"Vw Jw Aw Xw "); //miknowski measures, fprintf(TIMELOG,"Euler Kn Jn An\n"); //miknowski measures,
fprintf(TIMELOG,"Vn Jn An Xn\n"); //miknowski measures, }
}
} }
@@ -548,11 +542,11 @@ void TwoPhase::ComputeLocal()
} }
} }
} }
/*
Array <char> phase_label(Nx,Ny,Nz); Array <char> phase_label(Nx,Ny,Nz);
Array <double> phase_distance(Nx,Ny,Nz); Array <double> phase_distance(Nx,Ny,Nz);
// Analyze the wetting fluid // Analyze the wetting fluid
/* for (k=0; k<Nz; k++){ for (k=0; k<Nz; k++){
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;
@@ -574,7 +568,6 @@ void TwoPhase::ComputeLocal()
} }
CalcDist(phase_distance,phase_label,*Dm); CalcDist(phase_distance,phase_label,*Dm);
wet_morph.ComputeScalar(phase_distance,0.f); wet_morph.ComputeScalar(phase_distance,0.f);
*/
printf("generating distance at rank=%i \n",Dm->rank()); printf("generating distance at rank=%i \n",Dm->rank());
// Analyze the wetting fluid // Analyze the wetting fluid
for (k=0; k<Nz; k++){ for (k=0; k<Nz; k++){
@@ -602,7 +595,7 @@ void TwoPhase::ComputeLocal()
printf("morphological analysis at rank=%i \n",Dm->rank()); printf("morphological analysis at rank=%i \n",Dm->rank());
nonwet_morph.ComputeScalar(phase_distance,0.f); nonwet_morph.ComputeScalar(phase_distance,0.f);
printf("rank=%i completed \n",Dm->rank()); printf("rank=%i completed \n",Dm->rank());
*/
} }
@@ -1304,10 +1297,7 @@ void TwoPhase::PrintAll(int timestep)
Gws_global(0),Gws_global(1),Gws_global(2),Gws_global(3),Gws_global(4),Gws_global(5)); // orientation of ws interface Gws_global(0),Gws_global(1),Gws_global(2),Gws_global(3),Gws_global(4),Gws_global(5)); // orientation of ws interface
fprintf(TIMELOG,"%.5g %.5g %.5g ",trawn_global, trJwn_global, trRwn_global); // Trimmed curvature fprintf(TIMELOG,"%.5g %.5g %.5g ",trawn_global, trJwn_global, trRwn_global); // Trimmed curvature
fprintf(TIMELOG,"%.5g %.5g %.5g ",wwndnw_global, wwnsdnwn_global, Jwnwwndnw_global); // kinematic quantities fprintf(TIMELOG,"%.5g %.5g %.5g ",wwndnw_global, wwnsdnwn_global, Jwnwwndnw_global); // kinematic quantities
fprintf(TIMELOG,"%.5g %.5g %.5g %.5g ", wet_morph.Vi_global, wet_morph.Ji_global, wet_morph.Ai_global, wet_morph.Xi_global); // minkowski measures fprintf(TIMELOG,"%.5g %.5g %.5g %.5g\n",euler_global, Kn_global, Jn_global, An_global); // minkowski measures
fprintf(TIMELOG,"%.5g %.5g %.5g %.5g\n", nonwet_morph.Vi_global, nonwet_morph.Ji_global, nonwet_morph.Ai_global, nonwet_morph.Xi_global); // minkowski measures
fflush(TIMELOG); fflush(TIMELOG);
} }
else{ else{
@@ -1332,9 +1322,7 @@ void TwoPhase::PrintAll(int timestep)
Gws(0),Gws(1),Gws(2),Gws(3),Gws(4),Gws(5)); // orientation of ws interface Gws(0),Gws(1),Gws(2),Gws(3),Gws(4),Gws(5)); // orientation of ws interface
fprintf(TIMELOG,"%.5g %.5g %.5g ",trawn, trJwn, trRwn); // Trimmed curvature fprintf(TIMELOG,"%.5g %.5g %.5g ",trawn, trJwn, trRwn); // Trimmed curvature
fprintf(TIMELOG,"%.5g %.5g %.5g ",wwndnw, wwnsdnwn, Jwnwwndnw); // kinematic quantities fprintf(TIMELOG,"%.5g %.5g %.5g ",wwndnw, wwnsdnwn, Jwnwwndnw); // kinematic quantities
fprintf(TIMELOG,"%.5g %.5g %.5g %.5g ", wet_morph.Vi, wet_morph.Ji, wet_morph.Ai, wet_morph.Xi); // minkowski measures fprintf(TIMELOG,"%.5g %.5g %.5g %.5g\n",euler, Kn, Jn, An); // minkowski measures
fprintf(TIMELOG,"%.5g %.5g %.5g %.5g\n", nonwet_morph.Vi, nonwet_morph.Ji, nonwet_morph.Ai, nonwet_morph.Xi); // minkowski measures
fflush(TIMELOG); fflush(TIMELOG);
} }

7
analysis/TwoPhase.h
View File

@@ -8,8 +8,6 @@
#include "common/Domain.h" #include "common/Domain.h"
#include "common/Communication.h" #include "common/Communication.h"
#include "analysis/analysis.h" #include "analysis/analysis.h"
#include "analysis/distance.h"
#include "analysis/Minkowski.h"
#include "shared_ptr.h" #include "shared_ptr.h"
#include "common/Utilities.h" #include "common/Utilities.h"
@@ -143,11 +141,6 @@ public:
DoubleArray Vel_x; // Velocity DoubleArray Vel_x; // Velocity
DoubleArray Vel_y; DoubleArray Vel_y;
DoubleArray Vel_z; DoubleArray Vel_z;
DoubleArray PhaseDistance;
Minkowski wet_morph;
Minkowski nonwet_morph;
// Container for averages; // Container for averages;
DoubleArray ComponentAverages_WP; DoubleArray ComponentAverages_WP;
DoubleArray ComponentAverages_NWP; DoubleArray ComponentAverages_NWP;