Mercurial > repos > public > sbplib_julia

changeset 2022:7f04753ead30 feature/grids/multiblock_grids

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the helper functions return parts for the multiblock grid instead of actual multiblock grids
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 12 Mar 2025 11:07:40 +0100
parents d6618d628515
children 50e7090f5a95
files test/Grids/multiblockgrids_test.jl
diffstat 1 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/test/Grids/multiblockgrids_test.jl	Wed Mar 12 10:54:47 2025 +0100
+++ b/test/Grids/multiblockgrids_test.jl	Wed Mar 12 11:07:40 2025 +0100
@@ -12,7 +12,7 @@
         (2, UpperBoundary(), 3, LowerBoundary()),
     ])
 
-    return MultiBlockGrid([g₁,g₂,g₃], C)
+    return [g₁,g₂,g₃], C
 end
 
 function multiblockgrid2d()
@@ -28,7 +28,7 @@
         (2, 2, UpperBoundary, 4, 2, LowerBoundary),
     ])
 
-    return MultiBlockGrid([g₁₁, g₁₂, g₂₁, g₂₂], C)
+    return [g₁₁, g₁₂, g₂₁, g₂₂], C
 end
 
 function multiblockgrid_matrix()
@@ -44,7 +44,7 @@
         ((2,1), 2, UpperBoundary, (2,2), 2, LowerBoundary),
     ])
 
-    return MultiBlockGrid([g₁₁ g₁₂; g₂₁ g₂₂], C)
+    return [g₁₁ g₁₂; g₂₁ g₂₂], C
 end
 
 function multiblockgrid_dict()
@@ -52,18 +52,24 @@
     g₂ = equidistant_grid(0,1,5)
 
     C = [connection(:a, UpperBoundary(), :b, LowerBoundary())]
-    MultiBlockGrid(Dict(:a=>g₁, :b=>g₂), C)
+    return Dict(:a=>g₁, :b=>g₂), C
 end
 
 @testset "MultiBlockGrid" begin
     @test MultiBlockGrid <: Grid
 
     @testset "Constructors" begin
-        @test multiblockgrid1d() isa Grid{Float64,1}
-        @test multiblockgrid1d() isa MultiBlockGrid{Float64,1}
-        @test multiblockgrid2d() isa MultiBlockGrid{SVector{2,Float64},2}
-        @test multiblockgrid_matrix() isa MultiBlockGrid{SVector{2,Float64},2}
-        @test multiblockgrid_dict() isa MultiBlockGrid{Float64,1}
+        grids, connections = multiblockgrid1d()
+        @test MultiBlockGrid(grids, connections) isa Grid{Float64,1}
+        grids, connections = multiblockgrid1d()
+        @test MultiBlockGrid(grids, connections) isa MultiBlockGrid{Float64,1}
+        grids, connections = multiblockgrid2d()
+        @test MultiBlockGrid(grids, connections) isa MultiBlockGrid{SVector{2,Float64},2}
+        grids, connections = multiblockgrid_matrix()
+        @test MultiBlockGrid(grids, connections) isa MultiBlockGrid{SVector{2,Float64},2}
+        grids, connections = multiblockgrid_dict()
+        @test MultiBlockGrid(grids, connections) isa MultiBlockGrid{Float64,1}
+    end
     end
 
     @testset "Base.getindex" begin