also reset geometry if SCF failed in AIMD
add AIMD error handler
Merge remote-tracking branch 'origin/master'