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

Updating global minkowski measures for test

Browse Source
This commit is contained in:
James E McClure
2015-09-05 09:50:21 -04:00
parent bfc61576c6
commit 4ed4e0f53e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/TwoPhase.cpp
View File

@@ -147,7 +147,7 @@ TwoPhase::TwoPhase(Domain &dm):
fprintf(TIMELOG,"Gwnxx Gwnyy Gwnzz Gwnxy Gwnxz Gwnyz "); // Orientation tensors fprintf(TIMELOG,"Gwnxx Gwnyy Gwnzz Gwnxy Gwnxz Gwnyz "); // Orientation tensors
fprintf(TIMELOG,"Gwsxx Gwsyy Gwszz Gwsxy Gwsxz Gwsyz "); fprintf(TIMELOG,"Gwsxx Gwsyy Gwszz Gwsxy Gwsxz Gwsyz ");
fprintf(TIMELOG,"Gnsxx Gnsyy Gnszz Gnsxy Gnsxz Gnsyz "); fprintf(TIMELOG,"Gnsxx Gnsyy Gnszz Gnsxy Gnsxz Gnsyz ");
fprintf(TIMELOG,"trawn trJwn trRwn Jn An Euler\n"); // trimmed curvature for wn surface fprintf(TIMELOG,"trawn trJwn trRwn Euler Jn An\n"); // trimmed curvature & minkowski measures
//fprintf(TIMELOG,"--------------------------------------------------------------------------------------\n"); //fprintf(TIMELOG,"--------------------------------------------------------------------------------------\n");
} }
@@ -463,6 +463,7 @@ void TwoPhase::ComputeLocal()
} }
//........................................................................... //...........................................................................
// Compute the integral curvature of the non-wetting phase // Compute the integral curvature of the non-wetting phase
n_nw_pts=n_nw_tris=0; n_nw_pts=n_nw_tris=0;
// Compute the non-wetting phase surface and associated area // Compute the non-wetting phase surface and associated area
An += geomavg_MarchingCubes(SDn,fluid_isovalue,i,j,k,nw_pts,n_nw_pts,nw_tris,n_nw_tris); An += geomavg_MarchingCubes(SDn,fluid_isovalue,i,j,k,nw_pts,n_nw_pts,nw_tris,n_nw_tris);
@@ -561,6 +562,7 @@ void TwoPhase::ComponentAverages()
KGwns = KNwns = 0.0; KGwns = KNwns = 0.0;
Jwn = Kwn = efawns = 0.0; Jwn = Kwn = efawns = 0.0;
trawn=trJwn=0.0; trawn=trJwn=0.0;
//........................................................................... //...........................................................................
//........................................................................... //...........................................................................
// Compute volume averages // Compute volume averages
@@ -1145,6 +1147,8 @@ void TwoPhase::Reduce()
if (ans_global > 0.0) for (i=0; i<6; i++) Gns_global(i) /= ans_global; if (ans_global > 0.0) for (i=0; i<6; i++) Gns_global(i) /= ans_global;
if (aws_global > 0.0) for (i=0; i<6; i++) Gws_global(i) /= aws_global; if (aws_global > 0.0) for (i=0; i<6; i++) Gws_global(i) /= aws_global;
euler_global /= (2*PI);
//sat_w = 1.0 - nwp_volume_global*iVol_global/porosity; //sat_w = 1.0 - nwp_volume_global*iVol_global/porosity;
sat_w = 1.0 - nwp_volume_global/(nwp_volume_global+wp_volume_global); sat_w = 1.0 - nwp_volume_global/(nwp_volume_global+wp_volume_global);
// Compute the specific interfacial areas and common line length (dimensionless per unit volume) // Compute the specific interfacial areas and common line length (dimensionless per unit volume)

1
common/pmmc.h
View File

@@ -2152,6 +2152,7 @@ inline double geomavg_MarchingCubes( DoubleArray &A, double &v, int &i, int &j,
// Compute the Interfacial Area // Compute the Interfacial Area
double s1,s2,s3,s; double s1,s2,s3,s;
Point pA,pB,pC; Point pA,pB,pC;
area = 0.0;
for (int r=0;r<n_nw_tris;r++){ for (int r=0;r<n_nw_tris;r++){
pA = nw_pts(nw_tris(0,r)); pA = nw_pts(nw_tris(0,r));
pB = nw_pts(nw_tris(1,r)); pB = nw_pts(nw_tris(1,r));