non-product upwinding

CliMA · Jul 18, 2023 · 4e59637 · 4e59637
1 parent 0e7a5f9
commit 4e59637
Show file tree

Hide file tree

Showing 23 changed files with 1,388 additions and 1,082 deletions.
diff --git a/docs/src/operators.md b/docs/src/operators.md
@@ -65,14 +65,14 @@ InterpolateC2F
 InterpolateF2C
 WeightedInterpolateC2F
 WeightedInterpolateF2C
-UpwindBiasedProductC2F
-Upwind3rdOrderBiasedProductC2F
+LeftBiased1stOrderC2F
+RightBiased1stOrderC2F
+LeftBiased3rdOrderC2F
+RightBiased3rdOrderC2F
+Upwind1stOrderC2F
+Upwind3rdOrderC2F
 FCTBorisBook
 FCTZalesak
-LeftBiasedC2F
-RightBiasedC2F
-LeftBiasedF2C
-RightBiasedF2C
 ```
 
 ### Derivative operators
@@ -91,8 +91,6 @@ CurlC2F
 
 ```@docs
 SetBoundaryOperator
-FirstOrderOneSided
-ThirdOrderOneSided
 ```
 
 ## Finite difference boundary conditions
@@ -103,6 +101,8 @@ SetValue
 SetGradient
 SetDivergence
 Extrapolate
+OneSided1stOrder
+OneSided3rdOrder
 ```
 
 ## Internal APIs

diff --git a/examples/column/bb_fct_advection.jl b/examples/column/bb_fct_advection.jl
@@ -48,12 +48,12 @@ function tendency!(yₜ, y, parameters, t)
         top = Operators.Extrapolate(),
     )
     upwind3 = Operators.Upwind3rdOrderBiasedProductC2F(
-        bottom = Operators.ThirdOrderOneSided(),
-        top = Operators.ThirdOrderOneSided(),
+        bottom = Operators.OneSided3rdOrder(),
+        top = Operators.OneSided3rdOrder(),
     )
     FCTBorisBook = Operators.FCTBorisBook(
-        bottom = Operators.FirstOrderOneSided(),
-        top = Operators.FirstOrderOneSided(),
+        bottom = Operators.OneSided1stOrder(),
+        top = Operators.OneSided1stOrder(),
     )
     @. yₜ.q =
         -divf2c(

diff --git a/examples/column/fct_advection.jl b/examples/column/fct_advection.jl
@@ -45,8 +45,8 @@ function f!(dydt, y, parameters, t)
         top = Operators.Extrapolate(),
     )
     third_order_fluxᶠ = Operators.Upwind3rdOrderBiasedProductC2F(
-        bottom = Operators.ThirdOrderOneSided(),
-        top = Operators.ThirdOrderOneSided(),
+        bottom = Operators.OneSided3rdOrder(),
+        top = Operators.OneSided3rdOrder(),
     )
     divf2c = Operators.DivergenceF2C(
         bottom = Operators.SetValue(Geometry.WVector(FT(0.0))),

diff --git a/examples/column/zalesak_fct_advection.jl b/examples/column/zalesak_fct_advection.jl
@@ -48,12 +48,12 @@ function tendency!(yₜ, y, parameters, t)
         top = Operators.Extrapolate(),
     )
     upwind3 = Operators.Upwind3rdOrderBiasedProductC2F(
-        bottom = Operators.ThirdOrderOneSided(),
-        top = Operators.ThirdOrderOneSided(),
+        bottom = Operators.OneSided3rdOrder(),
+        top = Operators.OneSided3rdOrder(),
     )
     FCTZalesak = Operators.FCTZalesak(
-        bottom = Operators.FirstOrderOneSided(),
-        top = Operators.FirstOrderOneSided(),
+        bottom = Operators.OneSided1stOrder(),
+        top = Operators.OneSided1stOrder(),
     )
     @. yₜ.q =
         -divf2c(

diff --git a/examples/hybrid/box/limiters_advection.jl b/examples/hybrid/box/limiters_advection.jl
@@ -179,8 +179,8 @@ function vertical_tendency!(yₜ, y, cache, t)
         bottom = Operators.SetValue(Geometry.Contravariant3Vector(FT(0))),
     )
     upwind3 = Operators.Upwind3rdOrderBiasedProductC2F(
-        bottom = Operators.ThirdOrderOneSided(),
-        top = Operators.ThirdOrderOneSided(),
+        bottom = Operators.OneSided3rdOrder(),
+        top = Operators.OneSided3rdOrder(),
     )
     ax12 = (Geometry.Covariant12Axis(),)
     ax3 = (Geometry.Covariant3Axis(),)

diff --git a/examples/hybrid/plane/bubble_2d_invariant_rhoe.jl b/examples/hybrid/plane/bubble_2d_invariant_rhoe.jl
@@ -172,8 +172,8 @@ function rhs_invariant!(dY, Y, _, t)
     )
     # 1.c) vertical upwinding
     third_order_upwind_c2f = Operators.Upwind3rdOrderBiasedProductC2F(
-        bottom = Operators.ThirdOrderOneSided(),
-        top = Operators.ThirdOrderOneSided(),
+        bottom = Operators.OneSided3rdOrder(),
+        top = Operators.OneSided3rdOrder(),
     )
     # we want the total u³ at the boundary to be zero: we can either constrain
     # both to be zero, or allow one to be non-zero and set the other to be its

diff --git a/examples/hybrid/plane/topo_schar_nh.jl b/examples/hybrid/plane/topo_schar_nh.jl
@@ -230,8 +230,8 @@ function rhs_invariant!(dY, Y, _, t)
 
     f_upwind_product1 = Operators.UpwindBiasedProductC2F()
     f_upwind_product3 = Operators.Upwind3rdOrderBiasedProductC2F(
-        bottom = Operators.FirstOrderOneSided(),
-        top = Operators.FirstOrderOneSided(),
+        bottom = Operators.OneSided1stOrder(),
+        top = Operators.OneSided1stOrder(),
     )
 
     dρ .= 0 .* cρ

diff --git a/examples/hybrid/sphere/deformation_flow.jl b/examples/hybrid/sphere/deformation_flow.jl
@@ -67,16 +67,16 @@ const upwind1 = Operators.UpwindBiasedProductC2F(
     top = Operators.Extrapolate(),
 )
 const upwind3 = Operators.Upwind3rdOrderBiasedProductC2F(
-    bottom = Operators.ThirdOrderOneSided(),
-    top = Operators.ThirdOrderOneSided(),
+    bottom = Operators.OneSided3rdOrder(),
+    top = Operators.OneSided3rdOrder(),
 )
 const FCTZalesak = Operators.FCTZalesak(
-    bottom = Operators.FirstOrderOneSided(),
-    top = Operators.FirstOrderOneSided(),
+    bottom = Operators.OneSided1stOrder(),
+    top = Operators.OneSided1stOrder(),
 )
 const FCTBorisBook = Operators.FCTBorisBook(
-    bottom = Operators.FirstOrderOneSided(),
-    top = Operators.FirstOrderOneSided(),
+    bottom = Operators.OneSided1stOrder(),
+    top = Operators.OneSided1stOrder(),
 )
 
 # Reference pressure and density

diff --git a/examples/hybrid/sphere/hadley_circulation.jl b/examples/hybrid/sphere/hadley_circulation.jl
@@ -94,12 +94,12 @@ function tendency!(yₜ, y, parameters, t)
         top = Operators.Extrapolate(),
     )
     upwind3 = Operators.Upwind3rdOrderBiasedProductC2F(
-        bottom = Operators.ThirdOrderOneSided(),
-        top = Operators.ThirdOrderOneSided(),
+        bottom = Operators.OneSided3rdOrder(),
+        top = Operators.OneSided3rdOrder(),
     )
     FCTZalesak = Operators.FCTZalesak(
-        bottom = Operators.FirstOrderOneSided(),
-        top = Operators.FirstOrderOneSided(),
+        bottom = Operators.OneSided1stOrder(),
+        top = Operators.OneSided1stOrder(),
     )
     hdiv = Operators.Divergence()
     hwdiv = Operators.WeakDivergence()

diff --git a/examples/hybrid/staggered_nonhydrostatic_model.jl b/examples/hybrid/staggered_nonhydrostatic_model.jl
@@ -52,8 +52,8 @@ const ᶜFC = Operators.FluxCorrectionC2C(
 )
 const ᶠupwind_product1 = Operators.UpwindBiasedProductC2F()
 const ᶠupwind_product3 = Operators.Upwind3rdOrderBiasedProductC2F(
-    bottom = Operators.ThirdOrderOneSided(),
-    top = Operators.ThirdOrderOneSided(),
+    bottom = Operators.OneSided3rdOrder(),
+    top = Operators.OneSided3rdOrder(),
 )
 
 const ᶜinterp_stencil = Operators.Operator2Stencil(ᶜinterp)

diff --git a/src/Operators/Operators.jl b/src/Operators/Operators.jl
@@ -20,7 +20,9 @@ using ..RecursiveApply
 include("common.jl")
 include("spectralelement.jl")
 include("numericalflux.jl")
-include("finitedifference.jl")
+include("finitedifference/finitedifference.jl")
+include("finitedifference/upwinding.jl")
+include("finitedifference/deprecated.jl")
 include("stencilcoefs.jl")
 include("operator2stencil.jl")
 include("pointwisestencil.jl")