From 327f100a64ee1f0222d700238ff9752ec5c6d0aa Mon Sep 17 00:00:00 2001 From: Oleg Peil Date: Mon, 24 Aug 2015 19:34:48 +0200 Subject: [PATCH] Fixed the name of function 'generate_plo()' The function 'generate_ortho_plos()' is renamed to 'generate_plo()', which fixes the partially faulty merge. --- python/converters/vasp/python/main.py | 4 ++-- python/converters/vasp/python/plotools.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/python/converters/vasp/python/main.py b/python/converters/vasp/python/main.py index 62c3adf9..665fdbc3 100644 --- a/python/converters/vasp/python/main.py +++ b/python/converters/vasp/python/main.py @@ -3,7 +3,7 @@ import sys import vaspio from inpconf import ConfigParameters from elstruct import ElectronicStructure -from plotools import generate_ortho_plos, output_as_text +from plotools import generate_plo, output_as_text if __name__ == '__main__': narg = len(sys.argv) @@ -23,5 +23,5 @@ if __name__ == '__main__': pars.parse_input() vasp_data = vaspio.VaspData(vasp_dir) el_struct = ElectronicStructure(vasp_data) - pshells, pgroups = generate_ortho_plos(pars, el_struct) + pshells, pgroups = generate_plo(pars, el_struct) output_as_text(pars, el_struct, pshells, pgroups) diff --git a/python/converters/vasp/python/plotools.py b/python/converters/vasp/python/plotools.py index bf87fd33..3a3d4cff 100644 --- a/python/converters/vasp/python/plotools.py +++ b/python/converters/vasp/python/plotools.py @@ -431,8 +431,6 @@ def kpoints_output(basename, el_struct): pass - - ################################################################################ # # ctrl_output