updated morph condition
This commit is contained in:
parent
84801a625a
commit
d17d154c9c
@ -653,11 +653,11 @@ void ScaLBL_ColorModel::Run(){
|
|||||||
if (MORPH_ADAPT ){
|
if (MORPH_ADAPT ){
|
||||||
if (rank==0) printf("***Morphological step with target volume change %f ***\n", delta_volume_target);
|
if (rank==0) printf("***Morphological step with target volume change %f ***\n", delta_volume_target);
|
||||||
//double delta_volume_target = volB - (volA + volB)*TARGET_SATURATION; // change in volume to A
|
//double delta_volume_target = volB - (volA + volB)*TARGET_SATURATION; // change in volume to A
|
||||||
delta_volume = MorphInit(beta,delta_volume_target);
|
delta_volume += MorphInit(beta,delta_volume_target-delta_volume);
|
||||||
//if ( (delta_volume_target - delta_volume )/delta_volume_target < 0.1 ){
|
if ( (delta_volume - delta_volume_target)/delta_volume_target > 0.0 ){
|
||||||
MORPH_ADAPT = false;
|
MORPH_ADAPT = false;
|
||||||
delta_volume = 0.0;
|
delta_volume = 0.0;
|
||||||
//}
|
}
|
||||||
/*if ((delta_volume_target - delta_volume) / delta_volume > 0.f){
|
/*if ((delta_volume_target - delta_volume) / delta_volume > 0.f){
|
||||||
morph_delta *= 1.01*min((delta_volume_target - delta_volume) / delta_volume, 2.0);
|
morph_delta *= 1.01*min((delta_volume_target - delta_volume) / delta_volume, 2.0);
|
||||||
if (morph_delta > 1.f) morph_delta = 1.f;
|
if (morph_delta > 1.f) morph_delta = 1.f;
|
||||||
|
Loading…
Reference in New Issue
Block a user