Merge remote-tracking branch 'upstream/master'

Author: Han Wang

dpgen/auto_test/Lammps.py

@@ -17,7 +17,7 @@ def __init__(self,
         self.inter_type = inter_parameter['type']
         self.type_map = inter_parameter['type_map']
         self.in_lammps = inter_parameter.get('in_lammps', 'auto')
-        if self.type_map == 'meam':
+        if self.inter_type == 'meam':
             self.model = list(map(os.path.abspath, inter_parameter['model']))
         else:
             self.model = os.path.abspath(inter_parameter['model'])

dpgen/generator/run.py

@@ -2030,7 +2030,7 @@ def post_fp_vasp (iter_index,
     dlog.info("failed frame: %6d in %6d  %6.2f %% " % (icount, tcount, rfail * 100.))
 
     if rfail>ratio_failed:
-       raise RuntimeError("find too many unsuccessfully terminated jobs")
+       raise RuntimeError("find too many unsuccessfully terminated jobs. Too many FP tasks are not converged. Please check your input parameters (e.g. INCAR) or configuration (e.g. POSCAR) in directories \'iter.*.*/02.fp/task.*.*/.\'")
 
 
 def post_fp_pwscf (iter_index,