--- a/src/SbpOperators/volumeops/derivatives/first_derivative.jl	Tue Mar 07 09:21:27 2023 +0100
+++ b/src/SbpOperators/volumeops/derivatives/first_derivative.jl	Tue Mar 07 09:48:00 2023 +0100
@@ -1,48 +1,36 @@
 """
-    first_derivative(grid::EquidistantGrid, inner_stencil, closure_stencils, direction)
+    first_derivative(g::TensorGrid, stencil_set, direction)
 
 Creates the first-derivative operator `D1` as a `LazyTensor`
 
-`D1` approximates the first-derivative d/dξ on `grid` along the coordinate dimension specified by
+`D1` approximates the first-derivative d/dξ on `g` along the coordinate dimension specified by
 `direction`, using the stencil `inner_stencil` in the interior and a set of stencils `closure_stencils`
 for the points in the closure regions.
 
-On a one-dimensional `grid`, `D1` is a `VolumeOperator`. On a multi-dimensional `grid`, `D1` is the inflation of
-a `VolumeOperator`.
-
 See also: [`VolumeOperator`](@ref), [`LazyTensors.inflate`](@ref).
 """
-function first_derivative(grid::EquidistantGrid, inner_stencil, closure_stencils, direction)
-    h_inv = inverse_spacing(grid)[direction]
-
-    D₁ = VolumeOperator(restrict(grid, direction), scale(inner_stencil,h_inv), scale.(closure_stencils,h_inv), odd)
-    return LazyTensors.inflate(D₁, size(grid), direction)
+function first_derivative(g::TensorGrid, stencil_set, direction)
+    D₁ = first_derivative(g.grids[direction], stencil_set)
+    return LazyTensors.inflate(D₁, size(g), direction)
 end
 
-
-"""
-    first_derivative(grid, inner_stencil, closure_stencils)
-
-Creates a `first_derivative` operator on a 1D `grid` given `inner_stencil` and `closure_stencils`.
-"""
-first_derivative(grid::EquidistantGrid{1}, inner_stencil::Stencil, closure_stencils) = first_derivative(grid, inner_stencil, closure_stencils, 1)
-
-
 """
-    first_derivative(grid, stencil_set::StencilSet, direction)
+    first_derivative(g::EquidistantGrid, stencil_set)
 
-Creates a `first_derivative` operator on `grid` along coordinate dimension `direction` given a `stencil_set`.
+Creates a `first_derivative` operator on a `EquidistantGrid` given a `StencilSet`.
 """
-function first_derivative(grid::EquidistantGrid, stencil_set::StencilSet, direction)
+function first_derivative(g::EquidistantGrid, stencil_set::StencilSet)
     inner_stencil = parse_stencil(stencil_set["D1"]["inner_stencil"])
     closure_stencils = parse_stencil.(stencil_set["D1"]["closure_stencils"])
-    first_derivative(grid,inner_stencil,closure_stencils,direction);
+    return first_derivative(g, inner_stencil, closure_stencils);
 end
 
-
 """
-    first_derivative(grid, stencil_set)
+    first_derivative(g::EquidistantGrid, inner_stencil, closure_stencils)
 
-Creates a `first_derivative` operator on a 1D `grid` given a `stencil_set`.
+Creates a `first_derivative` operator on a `EquidistantGrid` given an `inner_stencil` and a`closure_stencils`.
 """
-first_derivative(grid::EquidistantGrid{1}, stencil_set::StencilSet) = first_derivative(grid, stencil_set, 1)
+function first_derivative(g::EquidistantGrid, inner_stencil::Stencil, closure_stencils)
+    h⁻¹ = inverse_spacing(g)
+    return VolumeOperator(g, scale(inner_stencil,h⁻¹), scale.(closure_stencils,h⁻¹), odd)
+end