merge two methods in viscosity model
merge two methods in conductivity.py
remove a todo