Make critical point calculation more robust

[g-bauer]

Depending on initial values, the critical point routine may return the wrong state. We currently only check if the result for a temperature is OK (and then we don't check additional temperatures) but a more rigorous check is needed.