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

connected pathway analysis seems to work

Browse Source
This commit is contained in:
James E McClure 2019-03-21 16:12:05 -04:00
parent 44ae2b697e
commit 1c9764a6fb
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
analysis/Minkowski.cpp
View File

@ -169,10 +169,12 @@ void Minkowski::MeasureConnectedPathway(){
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++){
id(i,j,k) = 1;
if (id(i,j,k) == LABEL && label(i,j,k) == 0){ if (id(i,j,k) == LABEL && label(i,j,k) == 0){
id(i,j,k) = 0; id(i,j,k) = 0;
} }
else{
id(i,j,k) = 1;
}
} }
} }
} }

6
analysis/SubPhase.cpp
View File

@ -405,11 +405,11 @@ void SubPhase::Full(){
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){
// wetting phase // interface
morph_i->id(i,j,k) = 0; morph_i->id(i,j,k) = 0;
} }
else { else {
// non-wetting phase // not interface
morph_i->id(i,j,k) = 1; morph_i->id(i,j,k) = 1;
} }
} }
@ -438,7 +438,7 @@ void SubPhase::Full(){
// compute density // compute density
double nA = Rho_n(n); double nA = Rho_n(n);
double nB = Rho_w(n); double nB = Rho_w(n);
double phi = (rho_n-rho_w)/(rho_n+rho_w); double phi = (nA-nB)/(nA+nB);
double ux = Vel_x(n); double ux = Vel_x(n);
double uy = Vel_y(n); double uy = Vel_y(n);
double uz = Vel_z(n); double uz = Vel_z(n);

4
models/ColorModel.cpp
View File

@ -415,11 +415,11 @@ void ScaLBL_ColorModel::Run(){
bool USE_MORPH = false; bool USE_MORPH = false;
int analysis_interval = 1000; // number of timesteps in between in situ analysis int analysis_interval = 1000; // number of timesteps in between in situ analysis
int MAX_MORPH_TIMESTEPS = 50000; // maximum number of LBM timesteps to spend in morphological adaptation routine int MAX_MORPH_TIMESTEPS = 50000; // maximum number of LBM timesteps to spend in morphological adaptation routine
int RAMP_TIMESTEPS = 50000; // number of timesteps to run initially (to get a reasonable velocity field before other pieces kick in) int RAMP_TIMESTEPS = 0;//50000; // number of timesteps to run initially (to get a reasonable velocity field before other pieces kick in)
int morph_interval = 1000000; int morph_interval = 1000000;
int CURRENT_MORPH_TIMESTEPS=0; // counter for number of timesteps spent in morphological adaptation routine (reset each time) int CURRENT_MORPH_TIMESTEPS=0; // counter for number of timesteps spent in morphological adaptation routine (reset each time)
double morph_delta = 0.0;
int morph_timesteps = 0; int morph_timesteps = 0;
double morph_delta = 0.0;
double capillary_number = 0.0; double capillary_number = 0.0;
double tolerance = 0.01; double tolerance = 0.01;
double Ca_previous = 0.f; double Ca_previous = 0.f;