[sumk] avoid deprecated using_gf fallback for block analysis

Author: the-hampel

python/triqs_dft_tools/sumk_dft.py

@@ -871,8 +871,14 @@ def analyse_block_structure(self, threshold=0.00001, include_shells=None, dm=Non
         """
 
         if dm is None:
-            warn("WARNING: No density matrix given. Calculating density matrix with default parameters. This will be deprecated in future releases.")
-            dm = self.density_matrix(method='using_gf', transform_to_solver_blocks=False)
+            dm = [
+                G.density()
+                for G in self.extract_G_loc(
+                    transform_to_solver_blocks=False,
+                    with_Sigma=hasattr(self, "Sigma_imp"),
+                    with_dc=True,
+                )
+            ]
 
         assert len(dm) == self.n_corr_shells, "The number of density matrices must be equal to the number of correlated shells."
         dens_mat = [dm[self.inequiv_to_corr[ish]]

test/python/dc_test.py

@@ -24,7 +24,7 @@
 import numpy as np
 from triqs_dft_tools.sumk_dft import *
 from triqs_dft_tools.util import compute_DC_from_density
-from triqs.gf import  *
+from triqs.gfs import *
 from h5 import HDFArchive
 from triqs.operators.util import *
 import triqs.utility.mpi as mpi
@@ -104,7 +104,7 @@ def test_dc(SK_compat, SK_new, method, method_dict, dens, Uval, Jval, filename):
 
 
 icrsh = 0
-dens = SK_compat.density_matrix(transform_to_solver_blocks=True)
+dens = [G.density() for G in SK_compat.extract_G_loc(transform_to_solver_blocks=True)]
 
 with np.printoptions(precision=5):
     for key in dens[0].keys():
@@ -141,7 +141,7 @@ def test_dc(SK_compat, SK_new, method, method_dict, dens, Uval, Jval, filename):
 SK_new    = SumkDFT(hdf_file=dft_filename+'.h5',use_dft_blocks=use_blocks)
 
 icrsh = 0
-dens = SK_compat.density_matrix(transform_to_solver_blocks=True)
+dens = [G.density() for G in SK_compat.extract_G_loc(transform_to_solver_blocks=True)]
 
 with np.printoptions(precision=5):
     for key in dens[0].keys():

test/python/sumkdft_basic.py

@@ -28,7 +28,7 @@
 import numpy as np
 SK = SumkDFTTools(hdf_file = 'SrVO3.ref.h5')
 
-dm = SK.density_matrix(method = 'using_gf', transform_to_solver_blocks=False, with_Sigma=False)
+dm = [G.density() for G in SK.extract_G_loc(transform_to_solver_blocks=False, with_Sigma=False)]
 dm_pc = SK.partial_charges(with_Sigma=False, with_dc=False)
 dm_pi = SK.density_matrix_using_point_integration()