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

reattempt decl MF

Browse Source
This commit is contained in:
James E McClure
2018-09-28 16:36:42 -04:00
parent 344318a169
commit b272776979
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
analysis/Minkowski.h
View File

@@ -45,7 +45,8 @@ public:
double J(); double J();
double X(); double X();
//........................................................................... //..........................................................................
Minkowski(){};//NULL CONSTRUCTOR
Minkowski(std::shared_ptr <Domain> Dm); Minkowski(std::shared_ptr <Domain> Dm);
~Minkowski(); ~Minkowski();
void ComputeScalar(const DoubleArray& Field, const double isovalue); void ComputeScalar(const DoubleArray& Field, const double isovalue);

28
analysis/TwoPhase.cpp
View File

@@ -150,7 +150,9 @@ 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,"Euler Kn Jn An\n"); //miknowski measures, fprintf(TIMELOG,"Vw Aw Jw Xw "); //miknowski measures,
fprintf(TIMELOG,"Vn An Jn Xn\n"); //miknowski measures,
// fprintf(TIMELOG,"Euler Kn Jn An\n"); //miknowski measures,
} }
NWPLOG = fopen("components.NWP.tcat","a+"); NWPLOG = fopen("components.NWP.tcat","a+");
@@ -179,7 +181,9 @@ 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,"Euler Kn Jn An\n"); //miknowski measures, fprintf(TIMELOG,"Vw Aw Jw Xw "); //miknowski measures,
fprintf(TIMELOG,"Vn An Jn Xn\n"); //miknowski measures,
// fprintf(TIMELOG,"Euler Kn Jn An\n"); //miknowski measures,
} }
} }
@@ -542,7 +546,7 @@ 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
@@ -568,7 +572,7 @@ 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++){
for (j=0; j<Ny; j++){ for (j=0; j<Ny; j++){
@@ -590,12 +594,12 @@ void TwoPhase::ComputeLocal()
} }
} }
} }
printf("calculate distance at rank=%i \n",Dm->rank()); //printf("calculate distance at rank=%i \n",Dm->rank());
CalcDist(phase_distance,phase_label,*Dm); CalcDist(phase_distance,phase_label,*Dm);
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());
*/
} }
@@ -1174,7 +1178,9 @@ 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\n",euler_global, Kn_global, Jn_global, An_global); // minkowski measures fprintf(TIMELOG,"%.5g %.5g %.5g %.5g ",wet_morph.Vi_global, wet_morph.Ai_global, wet_morph.Ji_global, wet_morph.Xi_global);
fprintf(TIMELOG,"%.5g %.5g %.5g %.5g\n",nonwet_morph.Vi_global, nonwet_morph.Ai_global, nonwet_morph.Ji_global, nonwet_morph.Xi_global);
// fprintf(TIMELOG,"%.5g %.5g %.5g %.5g\n",euler_global, Kn_global, Jn_global, An_global); // minkowski measures
fflush(TIMELOG); fflush(TIMELOG);
} }
else{ else{
@@ -1199,7 +1205,9 @@ 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\n",euler, Kn, Jn, An); // minkowski measures fprintf(TIMELOG,"%.5g %.5g %.5g %.5g ",wet_morph.Vi_global, wet_morph.Ai_global, wet_morph.Ji_global, wet_morph.Xi_global);
fprintf(TIMELOG,"%.5g %.5g %.5g %.5g\n",nonwet_morph.Vi_global, nonwet_morph.Ai_global, nonwet_morph.Ji_global, nonwet_morph.Xi_global);
// fprintf(TIMELOG,"%.5g %.5g %.5g %.5g\n",euler, Kn, Jn, An); // minkowski measures
fflush(TIMELOG); fflush(TIMELOG);
} }

4
analysis/TwoPhase.h
View File

@@ -145,8 +145,8 @@ public:
DoubleArray Vel_z; DoubleArray Vel_z;
DoubleArray PhaseDistance; DoubleArray PhaseDistance;
//Minkowski wet_morph; Minkowski wet_morph;
//Minkowski nonwet_morph; Minkowski nonwet_morph;
// Container for averages; // Container for averages;
DoubleArray ComponentAverages_WP; DoubleArray ComponentAverages_WP;