Merge branch 'develop' of github.com:atztogo/phono3py into develop

phonopy · Jul 12, 2024 · 46482ce · 46482ce
2 parents 9917a7a + ebc9147
commit 46482ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/phono3py/file_IO.py b/phono3py/file_IO.py
@@ -308,15 +308,14 @@ def read_fc3_from_hdf5(filename="fc3.hdf5", p2s_map=None):
             check_force_constants_indices(
                 fc3.shape[:2], p2s_map_in_file, p2s_map, filename
             )
-        if fc3.dtype == np.double and fc3.flags.c_contiguous:
+        if fc3.dtype == np.dtype("double") and fc3.flags.c_contiguous:
             return fc3
         else:
             msg = (
                 "%s has to be read by h5py as numpy ndarray of "
                 "dtype='double' and c_contiguous." % filename
             )
             raise TypeError(msg)
-    return None
 
 
 def write_fc2_to_hdf5(

diff --git a/phono3py/phonon/solver.py b/phono3py/phonon/solver.py
@@ -118,9 +118,9 @@ def run_phonon_solver_c(
         is_nac_q_zero = True
         _nac_q_direction = np.array(nac_q_direction, dtype="double")
 
-    assert grid_points.dtype == "int_"
+    assert grid_points.dtype == np.dtype("int_")
     assert grid_points.flags.c_contiguous
-    assert QDinv.dtype == "double"
+    assert QDinv.dtype == np.dtype("double")
     assert QDinv.flags.c_contiguous
     assert lapack_zheev_uplo in ("L", "U")