From 36c928a4b55e2b5f23c68e4c44dc0d29caceea11 Mon Sep 17 00:00:00 2001 From: "Oleg E. Peil" Date: Wed, 16 Sep 2015 11:29:05 +0200 Subject: [PATCH] Fixed the previous commit The implementation of option 'read_all' was missing in the previous commit. --- python/converters/vasp/python/vaspio.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/python/converters/vasp/python/vaspio.py b/python/converters/vasp/python/vaspio.py index 04a33c2c..1f7ab77c 100644 --- a/python/converters/vasp/python/vaspio.py +++ b/python/converters/vasp/python/vaspio.py @@ -30,15 +30,17 @@ class VaspData: self.vasp_dir = vasp_dir self.plocar = Plocar() - self.plocar.from_file(vasp_dir) self.poscar = Poscar() - self.poscar.from_file(vasp_dir) self.kpoints = Kpoints() - self.kpoints.from_file(vasp_dir) self.eigenval = Eigenval() - self.eigenval.from_file(vasp_dir) self.doscar = Doscar() - self.doscar.from_file(vasp_dir) + + if read_all: + self.plocar.from_file(vasp_dir) + self.poscar.from_file(vasp_dir) + self.kpoints.from_file(vasp_dir) + self.eigenval.from_file(vasp_dir) + self.doscar.from_file(vasp_dir) ################################################################################ ################################################################################