fix merge conflict

This commit is contained in:
Rex Zhe Li 2020-02-21 11:18:58 -05:00
commit ff04f20fa8

View File

@ -838,7 +838,7 @@ void ScaLBL_ColorModel::Run(){
delta_volume_target=Dm->Volume*(volA+(log_krA_target - log_krA)/slope_krA_volume);
log_krA_prev = log_krA;
volA_prev = volA;
printf(" ",log_krA, log_krA_target, volA);
printf(" log(kr)=%f, TARGET log(kr)=%f, volume=%f \n",log_krA, log_krA_target, volA);
/** compute averages & write data **/
Averages->Full();
Averages->Write(timestep);