Fix s parameter for Willet-formulation of capillar.
Add one more critical-calculation to capillar model.