Mercurial > repos > public > sbplib_julia

changeset 1786:1f42944d4a72 feature/sbp_operators/laplace_curvilinear

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix errors introduced by merge
author Jonatan Werpers <jonatan@werpers.com>
date Mon, 16 Sep 2024 11:03:37 +0200
parents 96f8cad255b4
children 602104ac0e41
files src/SbpOperators/boundaryops/boundary_restriction.jl src/SbpOperators/boundaryops/normal_derivative.jl src/SbpOperators/volumeops/inner_products/inner_product.jl src/SbpOperators/volumeops/inner_products/inverse_inner_product.jl src/SbpOperators/volumeops/laplace/laplace.jl
diffstat 5 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/SbpOperators/boundaryops/boundary_restriction.jl	Mon Sep 16 10:33:47 2024 +0200
+++ b/src/SbpOperators/boundaryops/boundary_restriction.jl	Mon Sep 16 11:03:37 2024 +0200
@@ -27,5 +27,5 @@
 end
 
 function boundary_restriction(g::MappedGrid, stencil_set::StencilSet, boundary)
-    return boundary_restriction(logicalgrid(g), stencil_set, boundary)
+    return boundary_restriction(logical_grid(g), stencil_set, boundary)
 end
--- a/src/SbpOperators/boundaryops/normal_derivative.jl	Mon Sep 16 10:33:47 2024 +0200
+++ b/src/SbpOperators/boundaryops/normal_derivative.jl	Mon Sep 16 11:03:37 2024 +0200
@@ -51,10 +51,10 @@
     # Assemble difference operator
     mapreduce(+,1:ndims(g)) do i
         if i == k
-            ∂_ξᵢ = normal_derivative(logicalgrid(g), stencil_set, boundary)
+            ∂_ξᵢ = normal_derivative(logical_grid(g), stencil_set, boundary)
         else
-            e = boundary_restriction(logicalgrid(g), stencil_set, boundary)
-            ∂_ξᵢ = σ ∘ e ∘ first_derivative(logicalgrid(g), stencil_set, i)
+            e = boundary_restriction(logical_grid(g), stencil_set, boundary)
+            ∂_ξᵢ = σ ∘ e ∘ first_derivative(logical_grid(g), stencil_set, i)
         end
 
         αᵢ = componentview(α,i)
--- a/src/SbpOperators/volumeops/inner_products/inner_product.jl	Mon Sep 16 10:33:47 2024 +0200
+++ b/src/SbpOperators/volumeops/inner_products/inner_product.jl	Mon Sep 16 11:03:37 2024 +0200
@@ -53,5 +53,5 @@
 
 function inner_product(g::MappedGrid, stencil_set)
     J = map(sqrt∘det, metric_tensor(g))
-    DiagonalTensor(J)∘inner_product(logicalgrid(g), stencil_set)
+    DiagonalTensor(J)∘inner_product(logical_grid(g), stencil_set)
 end
--- a/src/SbpOperators/volumeops/inner_products/inverse_inner_product.jl	Mon Sep 16 10:33:47 2024 +0200
+++ b/src/SbpOperators/volumeops/inner_products/inverse_inner_product.jl	Mon Sep 16 11:03:37 2024 +0200
@@ -52,5 +52,5 @@
 
 function inverse_inner_product(g::MappedGrid, stencil_set)
     J⁻¹ = map(inv∘sqrt∘det, metric_tensor(g))
-    DiagonalTensor(J⁻¹)∘inverse_inner_product(logicalgrid(g), stencil_set)
+    DiagonalTensor(J⁻¹)∘inverse_inner_product(logical_grid(g), stencil_set)
 end
--- a/src/SbpOperators/volumeops/laplace/laplace.jl	Mon Sep 16 10:33:47 2024 +0200
+++ b/src/SbpOperators/volumeops/laplace/laplace.jl	Mon Sep 16 11:03:37 2024 +0200
@@ -55,11 +55,11 @@
 laplace(g::EquidistantGrid, stencil_set) = second_derivative(g, stencil_set)
 
 function laplace(grid::MappedGrid, stencil_set)
-    J = jacobian_determinant(grid)
+    J = map(det,jacobian(grid))
     J⁻¹ = DiagonalTensor(map(inv, J))
 
     Jg = map(*, J, metric_tensor_inverse(grid))
-    lg = logicalgrid(grid)
+    lg = logical_grid(grid)
 
     return mapreduce(+, CartesianIndices(first(Jg))) do I
         i, j = I[1], I[2]