LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2025-01-09 12:44:03 +01:00
Code Issues Releases Wiki Activity

Fixed imports in vasp_converter

Browse Source 
Import of 'json' is fixed to conform python distributions without
'simplejson'.
Also, the full path is used for 'converter_tools' for the moment while
'vasp_converter' is not part of 'dft_tools'.
This commit is contained in:
Oleg E. Peil 2015-09-21 12:10:07 +02:00 committed by Michel Ferrero
parent 2346b43950
commit fada2af703
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/converters/vasp/python/vasp_converter.py
View File

@ -23,9 +23,12 @@
from types import * from types import *
import numpy import numpy
from pytriqs.archive import * from pytriqs.archive import *
from converter_tools import * from pytriqs.applications.dft.converters.converter_tools import *
import os.path import os.path
try:
import simplejson as json import simplejson as json
except ImportError:
import json
#from plotools import ProjectorGroup, ProjectorShell #from plotools import ProjectorGroup, ProjectorShell
class VaspConverter(ConverterTools): class VaspConverter(ConverterTools):
@ -55,7 +58,6 @@ class VaspConverter(ConverterTools):
self.bands_subgrp = bands_subgrp self.bands_subgrp = bands_subgrp
self.misc_subgrp = misc_subgrp self.misc_subgrp = misc_subgrp
self.transp_subgrp = transp_subgrp self.transp_subgrp = transp_subgrp
self.fortran_to_replace = {'D':'E'}
# Checks if h5 file is there and repacks it if wanted: # Checks if h5 file is there and repacks it if wanted:
if (os.path.exists(self.hdf_file) and repacking): if (os.path.exists(self.hdf_file) and repacking):