generic tensor product map now uses generic matrix

tristanmontoya · Sep 16, 2023 · 1e33916 · 1e33916 · tristanmontoya · Sep 16, 2023
1 parent 66b8438
commit 1e33916
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 378 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "StableSpectralElements"
 uuid = "fb992021-99c7-4c2d-a14b-5e48ac4045b2"
 authors = ["Tristan Montoya <[email protected]>"]
-version = "0.2.5"
+version = "0.2.6"
 
 [deps]
 Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"
@@ -69,4 +69,4 @@ TetGen = "1"
 TimerOutputs = "0.5"
 Triangulate = "2"
 WriteVTK = "1"
-julia = "1.8"
+julia = "1.8"
diff --git a/src/MatrixFreeOperators/MatrixFreeOperators.jl b/src/MatrixFreeOperators/MatrixFreeOperators.jl
@@ -9,10 +9,6 @@ module MatrixFreeOperators
     struct GenericMatrixAlgorithm <: AbstractOperatorAlgorithm end
     struct GenericTensorProductAlgorithm <: AbstractOperatorAlgorithm end
 
-    export TensorProductMap2D, TensorProductMap3D
-    include("tensor_product_2d.jl")
-    include("tensor_product_3d.jl")
-
     export WarpedTensorProductMap2D, WarpedTensorProductMap3D
     include("warped_product_2d.jl")
     include("warped_product_3d.jl")
@@ -64,9 +60,14 @@ module MatrixFreeOperators
         alg::GenericTensorProductAlgorithm) = vcat(
         [make_operator(block, alg) for block in map.maps]...)
     make_operator(map::LinearMaps.KroneckerMap{Float64, <:NTuple{2,LinearMap}}, 
-        ::GenericTensorProductAlgorithm) = TensorProductMap2D(map.maps...)
+        ::GenericTensorProductAlgorithm) = 
+        make_operator(map.maps[1], GenericMatrixAlgorithm()) ⊗ 
+        make_operator(map.maps[2], GenericMatrixAlgorithm())
     make_operator(map::LinearMaps.KroneckerMap{Float64, <:NTuple{3,LinearMap}},
-        ::GenericTensorProductAlgorithm) = TensorProductMap3D(map.maps...)
+        ::GenericTensorProductAlgorithm) = 
+        make_operator(map.maps[1], GenericMatrixAlgorithm()) ⊗ 
+        make_operator(map.maps[2], GenericMatrixAlgorithm()) ⊗
+        make_operator(map.maps[3], GenericMatrixAlgorithm())
 
     # count adds, muls, and muladds
     function count_ops(map::LinearMap)

diff --git a/src/MatrixFreeOperators/tensor_product_2d.jl b/src/MatrixFreeOperators/tensor_product_2d.jl