Fix bugs of BrillouinZone, ReciprocalZone and ReciprocalPath.

Quantum-Many-Body · Apr 18, 2022 · eb4af62 · eb4af62
1 parent 4430b62
commit eb4af62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Essentials/Spatials.jl b/src/Essentials/Spatials.jl
@@ -1618,7 +1618,7 @@ struct BrillouinZone{K, P<:Momentum, S<:SVector} <: ReciprocalSpace{K, P}
     end
 end
 @inline contentnames(::Type{<:BrillouinZone}) = (:reciprocals, :content)
-@inline getcontent(bz::BrillouinZone, ::Val{:content}) = (bz.momenta,)
+@inline getcontent(bz::BrillouinZone, ::Val{:content}) = bz.momenta
 
 """
     BrillouinZone(reciprocals::AbstractVector, nk::Int)
@@ -1673,7 +1673,7 @@ struct ReciprocalZone{K, S<:SVector, V<:Number} <: ReciprocalSpace{K, S}
     end
 end
 @inline contentnames(::Type{<:ReciprocalZone}) = (:content, :volume)
-@inline getcontent(rz::ReciprocalZone, ::Val{:content}) = (rz.momenta,)
+@inline getcontent(rz::ReciprocalZone, ::Val{:content}) = rz.momenta
 
 """
     ReciprocalZone(momenta::AbstractVector, volume::Number)
@@ -1736,7 +1736,7 @@ struct ReciprocalPath{K, S<:SVector} <: ReciprocalSpace{K, S}
     end
 end
 @inline contentnames(::Type{<:ReciprocalPath}) = (:content,)
-@inline getcontent(rp::ReciprocalPath, ::Val{:content}) = (rp.momenta,)
+@inline getcontent(rp::ReciprocalPath, ::Val{:content}) = rp.momenta
 
 """
     ReciprocalPath(momenta::AbstractVector)

diff --git a/test/Essentials/Spatials.jl b/test/Essentials/Spatials.jl
@@ -358,7 +358,7 @@ end
     recipls = reciprocals([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]])
     momenta = AbelianNumbers('C', [Momentum₂{9, 10}(j-1, i-1) for (i, j) in Iterators.flatten((Iterators.product(1:10, 1:9),))], collect(0:90), :indptr)
     bz = BrillouinZone(recipls, momenta)
-    @test getcontent(bz, Val(:content)) == (bz.momenta,)
+    @test getcontent(bz, Val(:content)) == bz.momenta
     @test dtype(bz) == dtype(typeof(bz)) == Float
     @test bz == BrillouinZone(Momentum₂{9, 10}, recipls)
 
@@ -376,7 +376,7 @@ end
     @test contentnames(ReciprocalZone) == (:content, :volume)
 
     rz = ReciprocalZone([[1.0]], length=10)
-    @test getcontent(rz, :content) == (rz.momenta,)
+    @test getcontent(rz, :content) == rz.momenta
     @test rz == ReciprocalZone(rz.momenta, rz.volume)
     @test rz == ReciprocalZone([[1.0]], Segment(-1//2, 1//2, 10))
     @test rz == ReciprocalZone([[1.0]], (Segment(-1//2, 1//2, 10),))
@@ -404,7 +404,7 @@ end
     s₃ = Segment((0.5, 0.5), (0.0, 0.0), 100)
 
     rp = ReciprocalPath([b₁, b₂], s₁, s₂, s₃)
-    @test getcontent(rp, :content) == (rp.momenta,)
+    @test getcontent(rp, :content) == rp.momenta
     @test rp == ReciprocalPath(rp.momenta)
     @test rp == ReciprocalPath([b₁, b₂], (s₁, s₂, s₃))