modified: config/default_configs/default_config.yml

modified: config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist.yml modified: examples/Manifest.toml modified: src/prognostic_equations/implicit/implicit_tendency.jl modified: src/utils/abbreviations.jl
CliMA · Dec 17, 2024 · 779fe9a · 779fe9a
1 parent 89047eb
commit 779fe9a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -206,10 +206,10 @@ viscous_sponge:
   help: "Viscous sponge [`true`, `false` (default)]"
   value: false
 tracer_upwinding:
-  help: "Tracer upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`]"
+  help: "Tracer upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`, `vanleer_limiter`]"
   value: none
 energy_upwinding:
-  help: "Energy upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`]"
+  help: "Energy upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`, `vanleer_limiter`]"
   value: none
 orographic_gravity_wave:
   help: "Orographic drag on horizontal mean flow [`nothing` (default), `gfdl_restart`, `raw_topo`]"

diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist.yml
@@ -5,6 +5,8 @@ initial_condition: "MoistBaroclinicWave"
 dt: "450secs"
 t_end: "10days"
 moist: "equil"
+tracer_upwinding: vanleer_limiter
+energy_upwinding: vanleer_limiter
 diagnostics:
   - short_name: [pfull, wa, va, rv, hus, ke]
     period: 1days
diff --git a/examples/Manifest.toml b/examples/Manifest.toml
@@ -1,6 +1,6 @@
 # This file is machine-generated - editing it directly is not advised
 
-julia_version = "1.10.7"
+julia_version = "1.10.4"
 manifest_format = "2.0"
 project_hash = "13bc74579bbfd1b4bab2e5d6cddd05f9a01dba06"
 
@@ -353,7 +353,9 @@ weakdeps = ["CUDA", "MPI"]
 
 [[deps.ClimaCore]]
 deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "Unrolled"]
-git-tree-sha1 = "7632911d7b09fb3e067984626b07b3eb1113e55e"
+git-tree-sha1 = "a5ec4373072c912adc7e5c6f6a570268adf7a8bf"
+repo-rev = "as/limiter-template"
+repo-url = "https://github.com/CliMA/ClimaCore.jl.git"
 uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
 version = "0.14.20"
 weakdeps = ["CUDA", "Krylov"]
@@ -2654,7 +2656,7 @@ version = "0.15.2+0"
 [[deps.libblastrampoline_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
-version = "5.11.0+0"
+version = "5.8.0+1"
 
 [[deps.libfdk_aac_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]

diff --git a/src/prognostic_equations/implicit/implicit_tendency.jl b/src/prognostic_equations/implicit/implicit_tendency.jl
@@ -73,6 +73,17 @@ vertical_transport!(
     ::Val{:first_order},
     ᶜdivᵥ,
 ) = @. ᶜρχₜ += -coeff * (ᶜdivᵥ(ᶠwinterp(ᶜJ, ᶜρ) * ᶠupwind1(ᶠu³, ᶜχ)))
+vertical_transport!(
+    coeff,
+    ᶜρχₜ,
+    ᶜJ,
+    ᶜρ,
+    ᶠu³,
+    ᶜχ,
+    dt,
+    ::Val{:vanleer_limiter},
+    ᶜdivᵥ,
+) = @. ᶜρχₜ += -coeff * (ᶜdivᵥ(ᶠwinterp(ᶜJ, ᶜρ) * ᶠlin_vanleer(ᶠu³, ᶜχ, dt)))
 vertical_transport!(
     coeff,
     ᶜρχₜ,

diff --git a/src/utils/abbreviations.jl b/src/utils/abbreviations.jl
@@ -85,6 +85,11 @@ const ᶠfct_zalesak = Operators.FCTZalesak(
     bottom = Operators.FirstOrderOneSided(),
     top = Operators.FirstOrderOneSided(),
 )
+const ᶠlin_vanleer = Operators.LinVanLeerC2F(
+    bottom = Operators.FirstOrderOneSided(),
+    top = Operators.FirstOrderOneSided(),
+    method = Operators.Mono5(),
+)
 
 const ᶜinterp_matrix = MatrixFields.operator_matrix(ᶜinterp)
 const ᶜleft_bias_matrix = MatrixFields.operator_matrix(ᶜleft_bias)