diff --git a/analysis/Minkowski.cpp b/analysis/Minkowski.cpp index 3b3f419a..3b22bfcd 100644 --- a/analysis/Minkowski.cpp +++ b/analysis/Minkowski.cpp @@ -169,10 +169,12 @@ void Minkowski::MeasureConnectedPathway(){ for (int k=0; kid(i,j,k) = 1; } else if (DelPhi(n) > 1e-4){ - // wetting phase + // interface morph_i->id(i,j,k) = 0; } else { - // non-wetting phase + // not interface morph_i->id(i,j,k) = 1; } } @@ -438,7 +438,7 @@ void SubPhase::Full(){ // compute density double nA = Rho_n(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 uy = Vel_y(n); double uz = Vel_z(n); diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 8a4845d1..160324f1 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -415,11 +415,11 @@ void ScaLBL_ColorModel::Run(){ bool USE_MORPH = false; 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 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 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; + double morph_delta = 0.0; double capillary_number = 0.0; double tolerance = 0.01; double Ca_previous = 0.f;