Révision 1d8c374e modules/calculation.py

b/modules/calculation.py
17 17
    """
18 18
    from glob import glob
19 19
    import ase.io
20
    from pycp2k import CP2K
21
    from modules.utilities import tail
20
    from modules.utilities import tail, is_binary
22 21

  
23 22
    finished_calcs = []
24 23
    unfinished_calcs = []
25 24
    for conf_dir in sorted(os.listdir(run_type), key=_human_key):
26
        conf_path = f'{run_type}/{conf_dir}'
25
        conf_path = f'{run_type}/{conf_dir}/'
27 26
        if not os.path.isdir(conf_path) or 'conf_' not in conf_dir:
28 27
            continue
29 28
        if code == 'cp2k':
30
            cp2k = CP2K()
31 29
            restart_file_list = glob(f"{conf_path}/*-1.restart")
32 30
            if len(restart_file_list) == 0:
33 31
                logger.warning(f"No *-1.restart file found on {conf_path}.")
......
42 40
                continue
43 41
            out_files = []
44 42
            for file in os.listdir(conf_path):
45
                with open(conf_path+"/"+file, "rb") as out_fh:
43
                if is_binary(conf_path+file):
44
                    continue
45
                with open(conf_path+file, "rb") as out_fh:
46 46
                    tail_out_str = tail(out_fh)
47 47
                if tail_out_str.count("PROGRAM STOPPED IN") == 1:
48 48
                    out_files.append(file)

Formats disponibles : Unified diff