From dd321d3cc646fff2d4c105d7ab7eaf2cfc129b37 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Tue, 9 Apr 2019 07:45:23 -0400 Subject: [PATCH] flow reversal tweaks --- models/ColorModel.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 96687259..c329b0b5 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -642,19 +642,6 @@ void ScaLBL_ColorModel::Run(){ if (rank == 0) printf(" -- adjust force by factor %f \n ",capillary_number / Ca); Averages->SetParams(rhoA,rhoB,tauA,tauB,Fx,Fy,Fz,alpha,beta); } - // flow reversal criteria based on fractional flow rate - if (delta_volume_target < 0.0 && - volA*flow_rate_A/(volA*flow_rate_A+volB*flow_rate_B) < RESIDUAL_ENDPOINT_THRESHOLD){ - REVERSE_FLOW_DIRECTION = true; - } - else if (delta_volume_target > 0.0 && - volB*flow_rate_B/(volA*flow_rate_A+volB*flow_rate_B) < RESIDUAL_ENDPOINT_THRESHOLD){ - REVERSE_FLOW_DIRECTION = true; - } - if ( REVERSE_FLOW_DIRECTION ){ - delta_volume_target *= (-1.0); - REVERSE_FLOW_DIRECTION = false; - } } else{ if (rank==0){ @@ -686,6 +673,8 @@ void ScaLBL_ColorModel::Run(){ // flow direction will reverse after next steady point MORPH_ADAPT = false; CURRENT_STEADY_TIMESTEPS=0; + delta_volume_target *= (-1.0); + REVERSE_FLOW_DIRECTION = false; } MPI_Barrier(comm);