From 961215ccac9e87ee474de1b6a7bff7426c105790 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 8 Apr 2020 15:47:15 -0400 Subject: [PATCH] Adjust to nda/h5 changes in triqs pytriqs.archive -> h5 -pytriqs.archive.hdf_archive_schemes -> h5.formats --- doc/tutorials/images_scripts/NiO_local_lattice_GF.py | 2 +- doc/tutorials/images_scripts/dft_dmft_cthyb.py | 2 +- doc/tutorials/images_scripts/maxent.py | 2 +- doc/tutorials/images_scripts/nio.py | 2 +- doc/tutorials/images_scripts/nio_csc.py | 2 +- python/block_structure.py | 2 +- python/converters/hk_converter.py | 2 +- python/converters/plovasp/plotools.py | 2 +- python/converters/vasp_converter.py | 2 +- python/converters/wannier90_converter.py | 2 +- python/converters/wien2k_converter.py | 2 +- python/sumk_dft.py | 2 +- python/symmetry.py | 2 +- python/trans_basis.py | 2 +- python/update_archive.py | 2 +- test/analyse_block_structure_from_gf.py | 2 +- test/hk_convert.py | 2 +- test/plovasp/proj_group/test_one_site.py | 2 +- test/plovasp/proj_group/test_one_site_compl.py | 2 +- test/plovasp/proj_group/test_two_site.py | 2 +- test/sigma_from_file.py | 2 +- test/srvo3_Gloc.py | 2 +- test/sumkdft_basic.py | 2 +- test/w90_convert.py | 2 +- test/wien2k_convert.py | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/doc/tutorials/images_scripts/NiO_local_lattice_GF.py b/doc/tutorials/images_scripts/NiO_local_lattice_GF.py index 7e60c230..f0f15076 100644 --- a/doc/tutorials/images_scripts/NiO_local_lattice_GF.py +++ b/doc/tutorials/images_scripts/NiO_local_lattice_GF.py @@ -1,7 +1,7 @@ from itertools import * import numpy as np import pytriqs.utility.mpi as mpi -from pytriqs.archive import * +from h5 import * from pytriqs.gf import * from triqs_dft_tools.sumk_dft import * from triqs_dft_tools.sumk_dft_tools import * diff --git a/doc/tutorials/images_scripts/dft_dmft_cthyb.py b/doc/tutorials/images_scripts/dft_dmft_cthyb.py index fff68b91..0c2dada7 100644 --- a/doc/tutorials/images_scripts/dft_dmft_cthyb.py +++ b/doc/tutorials/images_scripts/dft_dmft_cthyb.py @@ -1,6 +1,6 @@ import pytriqs.utility.mpi as mpi from pytriqs.operators.util import * -from pytriqs.archive import HDFArchive +from h5 import HDFArchive from triqs_cthyb import * from pytriqs.gf import * from triqs_dft_tools.sumk_dft import * diff --git a/doc/tutorials/images_scripts/maxent.py b/doc/tutorials/images_scripts/maxent.py index 9a5d0089..f775c331 100644 --- a/doc/tutorials/images_scripts/maxent.py +++ b/doc/tutorials/images_scripts/maxent.py @@ -1,5 +1,5 @@ from pytriqs.gf import * -from pytriqs.archive import * +from h5 import * from triqs_maxent import * filename = 'nio' diff --git a/doc/tutorials/images_scripts/nio.py b/doc/tutorials/images_scripts/nio.py index f064a931..09b4f905 100644 --- a/doc/tutorials/images_scripts/nio.py +++ b/doc/tutorials/images_scripts/nio.py @@ -1,7 +1,7 @@ from itertools import * import numpy as np import pytriqs.utility.mpi as mpi -from pytriqs.archive import * +from h5 import * from pytriqs.gf import * import sys, pytriqs.version as triqs_version from triqs_dft_tools.sumk_dft import * diff --git a/doc/tutorials/images_scripts/nio_csc.py b/doc/tutorials/images_scripts/nio_csc.py index 61003480..93715bad 100644 --- a/doc/tutorials/images_scripts/nio_csc.py +++ b/doc/tutorials/images_scripts/nio_csc.py @@ -1,7 +1,7 @@ from itertools import * import numpy as np import pytriqs.utility.mpi as mpi -from pytriqs.archive import * +from h5 import * from pytriqs.gf import * import sys, pytriqs.version as triqs_version from triqs_dft_tools.sumk_dft import * diff --git a/python/block_structure.py b/python/block_structure.py index 442e190b..a17037b0 100644 --- a/python/block_structure.py +++ b/python/block_structure.py @@ -467,5 +467,5 @@ class BlockStructure(object): s+=' '+key+'\n' return s -from pytriqs.archive.hdf_archive_schemes import register_class +from h5.formats import register_class register_class(BlockStructure) diff --git a/python/converters/hk_converter.py b/python/converters/hk_converter.py index 70b3738b..b119c45d 100644 --- a/python/converters/hk_converter.py +++ b/python/converters/hk_converter.py @@ -22,7 +22,7 @@ from types import * import numpy -from pytriqs.archive import * +from h5 import * import pytriqs.utility.mpi as mpi from math import sqrt from .converter_tools import * diff --git a/python/converters/plovasp/plotools.py b/python/converters/plovasp/plotools.py index f7804dba..c2dd5389 100644 --- a/python/converters/plovasp/plotools.py +++ b/python/converters/plovasp/plotools.py @@ -153,7 +153,7 @@ def generate_plo(conf_pars, el_struct): if conf_pars.general['hk']: pgroup.calc_hk(eigvals) #testout = 'hk.out.h5' - #from pytriqs.archive import HDFArchive + #from h5 import HDFArchive #with HDFArchive(testout, 'w') as h5test: # h5test['hk'] = pgroup.hk # DEBUG output diff --git a/python/converters/vasp_converter.py b/python/converters/vasp_converter.py index a0066325..62512579 100644 --- a/python/converters/vasp_converter.py +++ b/python/converters/vasp_converter.py @@ -26,7 +26,7 @@ from types import * import numpy -from pytriqs.archive import * +from h5 import * from .converter_tools import * import os.path try: diff --git a/python/converters/wannier90_converter.py b/python/converters/wannier90_converter.py index 6410b72c..b07a0e9f 100644 --- a/python/converters/wannier90_converter.py +++ b/python/converters/wannier90_converter.py @@ -47,7 +47,7 @@ from types import * import numpy import math -from pytriqs.archive import * +from h5 import * from .converter_tools import * from itertools import product import os.path diff --git a/python/converters/wien2k_converter.py b/python/converters/wien2k_converter.py index 066a3454..173cb214 100644 --- a/python/converters/wien2k_converter.py +++ b/python/converters/wien2k_converter.py @@ -22,7 +22,7 @@ from types import * import numpy -from pytriqs.archive import * +from h5 import * from .converter_tools import * import os.path diff --git a/python/sumk_dft.py b/python/sumk_dft.py index 779e6a77..85fa8470 100644 --- a/python/sumk_dft.py +++ b/python/sumk_dft.py @@ -26,7 +26,7 @@ import pytriqs.utility.dichotomy as dichotomy from pytriqs.gf import * import pytriqs.utility.mpi as mpi from pytriqs.utility.comparison_tests import assert_arrays_are_close -from pytriqs.archive import * +from h5 import * from .symmetry import * from .block_structure import BlockStructure from itertools import product diff --git a/python/symmetry.py b/python/symmetry.py index 000edd7b..f48b8bf3 100644 --- a/python/symmetry.py +++ b/python/symmetry.py @@ -24,7 +24,7 @@ import copy import numpy from types import * from pytriqs.gf import * -from pytriqs.archive import * +from h5 import * import pytriqs.utility.mpi as mpi diff --git a/python/trans_basis.py b/python/trans_basis.py index 845f50a8..04039f32 100644 --- a/python/trans_basis.py +++ b/python/trans_basis.py @@ -1,7 +1,7 @@ from triqs_dft_tools.sumk_dft import * from triqs_dft_tools.converters import Wien2kConverter from pytriqs.gf import * -from pytriqs.archive import * +from h5 import * import pytriqs.utility.mpi as mpi import numpy import copy diff --git a/python/update_archive.py b/python/update_archive.py index 0a14bdc7..cc9db916 100644 --- a/python/update_archive.py +++ b/python/update_archive.py @@ -1,4 +1,4 @@ -from pytriqs.archive import HDFArchive +from h5 import HDFArchive import h5py import sys import numpy diff --git a/test/analyse_block_structure_from_gf.py b/test/analyse_block_structure_from_gf.py index 500636b5..304593f1 100644 --- a/test/analyse_block_structure_from_gf.py +++ b/test/analyse_block_structure_from_gf.py @@ -3,7 +3,7 @@ from triqs_dft_tools.sumk_dft import SumkDFT from scipy.linalg import expm import numpy as np from pytriqs.utility.comparison_tests import assert_gfs_are_close, assert_arrays_are_close, assert_block_gfs_are_close -from pytriqs.archive import * +from h5 import * import itertools # The full test checks all different possible combinations of conjugated diff --git a/test/hk_convert.py b/test/hk_convert.py index f4c048c7..210c63d4 100644 --- a/test/hk_convert.py +++ b/test/hk_convert.py @@ -21,7 +21,7 @@ ################################################################################ -from pytriqs.archive import * +from h5 import * from pytriqs.utility.h5diff import h5diff import pytriqs.utility.mpi as mpi diff --git a/test/plovasp/proj_group/test_one_site.py b/test/plovasp/proj_group/test_one_site.py index 7fc833e8..d7bcbae5 100644 --- a/test/plovasp/proj_group/test_one_site.py +++ b/test/plovasp/proj_group/test_one_site.py @@ -9,7 +9,7 @@ from triqs_dft_tools.converters.plovasp.elstruct import ElectronicStructure from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters from triqs_dft_tools.converters.plovasp.proj_shell import ProjectorShell from triqs_dft_tools.converters.plovasp.proj_group import ProjectorGroup -from pytriqs.archive import HDFArchive +from h5 import HDFArchive import mytest ################################################################################ diff --git a/test/plovasp/proj_group/test_one_site_compl.py b/test/plovasp/proj_group/test_one_site_compl.py index d5f3d38d..8713ebe4 100644 --- a/test/plovasp/proj_group/test_one_site_compl.py +++ b/test/plovasp/proj_group/test_one_site_compl.py @@ -9,7 +9,7 @@ from triqs_dft_tools.converters.plovasp.elstruct import ElectronicStructure from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters from triqs_dft_tools.converters.plovasp.proj_shell import ProjectorShell from triqs_dft_tools.converters.plovasp.proj_group import ProjectorGroup -from pytriqs.archive import HDFArchive +from h5 import HDFArchive import mytest ################################################################################ diff --git a/test/plovasp/proj_group/test_two_site.py b/test/plovasp/proj_group/test_two_site.py index f3959447..1e216263 100644 --- a/test/plovasp/proj_group/test_two_site.py +++ b/test/plovasp/proj_group/test_two_site.py @@ -9,7 +9,7 @@ from triqs_dft_tools.converters.plovasp.elstruct import ElectronicStructure from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters from triqs_dft_tools.converters.plovasp.proj_shell import ProjectorShell from triqs_dft_tools.converters.plovasp.proj_group import ProjectorGroup -from pytriqs.archive import HDFArchive +from h5 import HDFArchive import mytest ################################################################################ diff --git a/test/sigma_from_file.py b/test/sigma_from_file.py index c1db639a..8d5b04f4 100644 --- a/test/sigma_from_file.py +++ b/test/sigma_from_file.py @@ -19,7 +19,7 @@ # ################################################################################ -from pytriqs.archive import * +from h5 import * from pytriqs.gf import * from pytriqs.gf.tools import * from triqs_dft_tools.sumk_dft_tools import * diff --git a/test/srvo3_Gloc.py b/test/srvo3_Gloc.py index 181101c2..7a7cf8fc 100644 --- a/test/srvo3_Gloc.py +++ b/test/srvo3_Gloc.py @@ -19,7 +19,7 @@ # ################################################################################ -from pytriqs.archive import * +from h5 import * from pytriqs.gf import * from triqs_dft_tools.sumk_dft import * from triqs_dft_tools.converters.wien2k_converter import * diff --git a/test/sumkdft_basic.py b/test/sumkdft_basic.py index 7f41b816..4f99c13f 100644 --- a/test/sumkdft_basic.py +++ b/test/sumkdft_basic.py @@ -20,7 +20,7 @@ # ################################################################################ -from pytriqs.archive import * +from h5 import * from triqs_dft_tools.sumk_dft_tools import SumkDFTTools import pytriqs.utility.mpi as mpi from pytriqs.utility.comparison_tests import * diff --git a/test/w90_convert.py b/test/w90_convert.py index 5ab531e2..492c6f38 100644 --- a/test/w90_convert.py +++ b/test/w90_convert.py @@ -22,7 +22,7 @@ from triqs_dft_tools.converters import * -from pytriqs.archive import * +from h5 import * from pytriqs.utility.h5diff import h5diff import pytriqs.utility.mpi as mpi diff --git a/test/wien2k_convert.py b/test/wien2k_convert.py index 16aa26f7..b912a673 100644 --- a/test/wien2k_convert.py +++ b/test/wien2k_convert.py @@ -19,7 +19,7 @@ # ################################################################################ -from pytriqs.archive import * +from h5 import * from pytriqs.utility.comparison_tests import * from pytriqs.utility.h5diff import h5diff import pytriqs.utility.mpi as mpi