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

Relying on the time labeled components for averaging

Browse Source
This commit is contained in:
James E McClure
2015-08-18 21:40:51 -04:00
parent 2750e7b3d9
commit dcc49452a3
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/TwoPhase.h
View File

@@ -272,6 +272,7 @@ public:
void ComputeDelPhi();
void ColorToSignedDistance(double Beta, DoubleArray &ColorData, DoubleArray &DistData);
void ComputeLocal();
void AssignComponentLabels();
void ComponentAverages();
void Reduce();
void WriteSurfaces(int logcount);
@@ -564,16 +565,10 @@ void TwoPhase::ComputeLocal(){
}
}
}
void TwoPhase::AssignComponentLabels(){
void TwoPhase::ComponentAverages(){
int i,j,k,n;
int kmin,kmax;
int LabelWP,LabelNWP;
double TempLocal;
int cube[8][3] = {{0,0,0},{1,0,0},{0,1,0},{1,1,0},{0,0,1},{1,0,1},{0,1,1},{1,1,1}};
LabelNWP=1; LabelWP=2;
int LabelNWP=1;
int LabelWP=2;
// NOTE: labeling the wetting phase components is tricky! One sandstone media had over 800,000 components
//NumberComponents_WP = ComputeGlobalPhaseComponent(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,PhaseID,LabelWP,Label_WP);
// treat all wetting phase is connected
@@ -590,6 +585,16 @@ void TwoPhase::ComponentAverages(){
NumberComponents_NWP = ComputeGlobalPhaseComponent(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,PhaseID,LabelNWP,Label_NWP);
//NumberComponents_NWP = ComputeGlobalBlobIDs(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,SDs,SDn,solid_isovalue,fluid_isovalue,Label_NWP);
}
void TwoPhase::ComponentAverages(){
int i,j,k,n;
int kmin,kmax;
int LabelWP,LabelNWP;
double TempLocal;
int cube[8][3] = {{0,0,0},{1,0,0},{0,1,0},{1,1,0},{0,0,1},{1,0,1},{0,1,1},{1,1,1}};
ComponentAverages_WP.resize(BLOB_AVG_COUNT,NumberComponents_WP);
ComponentAverages_NWP.resize(BLOB_AVG_COUNT,NumberComponents_NWP);

5
tests/lbpm_color_simulator.cpp
View File

@@ -812,8 +812,9 @@ int main(int argc, char **argv)
// Compute the timestep-timestep map
ID_map_struct map = computeIDMap(GlobalBlobID,GlobalBlobID2);
// Renumber the current timestep's ids
}
Averages.NumberComponents_NWP = nblobs2;
Averages.Label_NWP.swap(GlobalBlobID2);
GlobalBlobID.swap(GlobalBlobID2);
PROFILE_STOP("Identify blobs and maps");
}
@@ -857,7 +858,7 @@ int main(int argc, char **argv)
// Read in the restart file to CPU buffers
WriteCheckpoint(LocalRestartFile, cDen, cDistEven, cDistOdd, N);
PROFILE_STOP("Save Checkpoint");
PROFILE_SAVE("lbpm_colo_simulator",1);
PROFILE_SAVE("lbpm_color_simulator",1);
}
}
PROFILE_STOP("Loop");