adjust tol


git-svn-id: svn://svn.code.sf.net/p/cp2k/code/trunk@14812 bac0169d-1eea-4375-b5f6-f89d2ced9994
adjust tol


git-svn-id: svn://svn.code.sf.net/p/cp2k/code/trunk@14813 bac0169d-1eea-4375-b5f6-f89d2ced9994
Merge remote-tracking branch 'upstream/master'
Code cleaned up